diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1bf144d5cc9c96169ee13d99c638936542201e9d..74df1acd7c98139314656e70b2e074adcbb0983b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,17 +1,25 @@
{
"name": "virtual-fluids-environment",
- "extensions": [
- "mhutchie.git-graph",
- "donjayamanne.githistory",
- "twxs.cmake",
- "ms-vscode.cpptools",
- "visualstudioexptteam.vscodeintellicode",
- "xaver.clang-format",
- "notskm.clang-tidy",
- "streetsidesoftware.code-spell-checker"
- ],
+ "customizations": {
+ "vscode": {
+ "extensions": [
+ "mhutchie.git-graph",
+ "donjayamanne.githistory",
+ "twxs.cmake",
+ "ms-vscode.cpptools",
+ "visualstudioexptteam.vscodeintellicode",
+ "xaver.clang-format",
+ "notskm.clang-tidy",
+ "streetsidesoftware.code-spell-checker",
+ "llvm-vs-code-extensions.vscode-clangd",
+ "jbenden.c-cpp-flylint",
+ "ms-python.python",
+ ]
+ }
+ },
+ "containerEnv": {"TZ": "${localEnv:TZ:Europe/Berlin}"},
"runArgs": ["--gpus","all", // remove this line in case you have no gpus available
"--hostname=${localEnv:HOSTNAME}"], // HOSTNAME needs to be known by the vscode environment. It is probably necessary to add "export HOSTNAME=<hostname>" to the config file of your host machine's bash.
- "image": "git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu20_04:1.5"
+ "image": "git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu22_04:1.0"
}
diff --git a/.gitignore b/.gitignore
index d3e29c184e8e90ec5899b7b7241bd9fb34385cc9..a750e16f2b49f42e1a4fbff5092680574aefc488 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ cmake-build-debug/
run/
buildGCC
buildWSL
+pybuild/
# Python
_skbuild/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7fcb81d30f212feb33263ee7af58483ae631fd9..281644f5614054f167c577898d4b8eb4788b2076 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
###############################################################################
## VirtualFluids CI Pipeline ##
###############################################################################
-image: git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu20_04:1.5
+image: git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu22_04:1.0
stages:
- build
@@ -13,6 +13,11 @@ stages:
- deploy
- release
+workflow:
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ when: never # disable detached merge request pipelines
+ - when: always # add all jobs to normal pipeline. This can be overwritten by the rules of the jobs.
###############################################################################
## Builds ##
@@ -51,7 +56,7 @@ stages:
- cmake .. -LAH
--preset=make_all
-DBUILD_WARNINGS_AS_ERRORS=ON
- -DCMAKE_CUDA_ARCHITECTURES=60
+ -DCMAKE_CUDA_ARCHITECTURES=70
-DBUILD_VF_ALL_SAMPLES=ON
- make -j4
- ccache --show-stats
@@ -60,7 +65,7 @@ stages:
BUILD_FOLDER: "build"
###############################################################################
-gcc_9:
+gcc_12:
extends: .gnu_build_template
before_script:
@@ -68,7 +73,7 @@ gcc_9:
- export CXX=g++
###############################################################################
-clang_10:
+clang_15:
extends: .gnu_build_template
before_script:
@@ -112,29 +117,29 @@ msvc_17:
###############################################################################
## Build Python ##
###############################################################################
-gcc_9_python:
+gcc_12_python:
stage: build_python
- needs: ["gcc_9"]
+ needs: ["gcc_12"]
cache:
- key: "gcc_9-$CI_COMMIT_REF_SLUG"
+ key: "gcc_12-$CI_COMMIT_REF_SLUG"
paths:
- build
artifacts:
expire_in: 1 hrs
paths:
- - build/
- - dist/
- - _skbuild/
+ - pybuild/ # build in separate folder to avoid conflicts with c++ build
before_script:
- export CCACHE_BASEDIR=$CI_PROJECT_DIR
- export CCACHE_DIR=$CI_PROJECT_DIR/cache
script:
- - python3 setup.py bdist_wheel build_ext --build-temp=_skbuild -- -DBUILD_VF_CPU=ON -DBUILD_VF_DOUBLE_ACCURACY=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache
+ - export SKBUILD_BUILD_DIR="pybuild"
+ - export SKBUILD_CMAKE_ARGS="-DBUILD_VF_CPU=ON;-DBUILD_VF_DOUBLE_ACCURACY=ON;-DCMAKE_CXX_COMPILER_LAUNCHER=ccache;-DCMAKE_CUDA_COMPILER_LAUNCHER=ccache;-DCMAKE_C_COMPILER_LAUNCHER=ccache;-G=Ninja"
+ - pip install . -v
###############################################################################
## Container Upload ##
@@ -149,8 +154,6 @@ build_poiseuille_test_container:
rules:
- if: $REMOTE_USER && $REMOTE_HOST && $PRIVATE_KEY && $CI_PIPELINE_SOURCE == "schedule"
when: always
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- when: never
- when: manual
allow_failure: true
@@ -169,17 +172,16 @@ build_poiseuille_test_container:
###############################################################################
## Tests ##
###############################################################################
-gcc_9_unit_tests:
+gcc_12_unit_tests:
stage: test
- needs: ["gcc_9"]
+ needs: ["gcc_12"]
before_script:
- cd $CI_PROJECT_DIR/build
script:
- - ctest
- - ctest --rerun-failed --output-on-failure
+ - ctest --output-on-failure
###############################################################################
msvc_17_unit_tests:
@@ -197,25 +199,22 @@ msvc_17_unit_tests:
script:
- cd $CI_PROJECT_DIR/build
- - ctest -C Release
+ - ctest --output-on-failure -C Release
###############################################################################
-gcc_9_python_bindings_test:
+gcc_12_python_bindings_test:
stage: test
- needs: ["gcc_9_python"]
+ needs: ["gcc_12_python"]
before_script:
- - export PYTHONPATH="Python"
- - export VF_WHEEL=$(find dist/*.whl)
- - pip3 install $VF_WHEEL
- pip3 install -r Python/requirements.txt
script:
- python3 -m unittest discover -s Python -v
###############################################################################
-gcc_9_python_hpc_test:
+gcc_12_python_hpc_test:
image: python:latest
stage: test
@@ -224,8 +223,6 @@ gcc_9_python_hpc_test:
rules:
- if: $REMOTE_USER && $REMOTE_HOST && $PRIVATE_KEY && $CI_PIPELINE_SOURCE == "schedule"
when: always
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- when: never
- when: manual
allow_failure: true
@@ -254,8 +251,6 @@ build-regression-tests-ci:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: always
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- when: never
- when: manual
allow_failure: true
@@ -277,12 +272,11 @@ trigger-regression-tests:
regression_test_4gpu:
image: python:latest
stage: test
+ needs: []
rules:
- if: $REMOTE_USER && $REMOTE_HOST && $PRIVATE_KEY && $CI_PIPELINE_SOURCE == "schedule"
when: always
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- when: never
- when: manual
allow_failure: true
@@ -291,7 +285,10 @@ regression_test_4gpu:
- pip install "fieldcompare[all]"
script:
- - hpc-rocket launch --watch regression-tests/multigpu_test/rocket4GPU.yml
+ - hpc-rocket launch regression-tests/multigpu_test/rocket4GPU.yml |& tee hpcrocket4GPU.log
+ - hpc-rocket watch regression-tests/multigpu_test/rocket4GPU.yml $(python regression-tests/multigpu_test/utilities/parsejobid.py hpcrocket4GPU.log)
+ - hpc-rocket finalize regression-tests/multigpu_test/rocket4GPU.yml
+ - cat output/4GPU/slurm4GPU.out
- git clone --depth 1 --filter=blob:none --sparse https://github.com/irmb/test_data
- cd test_data
- git sparse-checkout set regression_tests/gpu/DrivenCavity_4GPU_2Levels regression_tests/gpu/SphereScaling_4GPU_2Levels
@@ -299,16 +296,23 @@ regression_test_4gpu:
- fieldcompare dir output/4GPU test_data/regression_tests/gpu/DrivenCavity_4GPU_2Levels --include-files "DrivenCavityMultiGPU*.vtu"
- fieldcompare dir output/4GPU test_data/regression_tests/gpu/SphereScaling_4GPU_2Levels --include-files "SphereScaling*.vtu"
+ after_script:
+ - hpc-rocket cancel regression-tests/multigpu_test/rocket4GPU.yml $(python regression-tests/multigpu_test/utilities/parsejobid.py hpcrocket4GPU.log)
+
+ artifacts:
+ when: always
+ paths:
+ - output/4GPU/slurm4GPU.out
+ expire_in: 1 week
###############################################################################
regression_test_8gpu:
image: python:latest
stage: test
+ needs: []
rules:
- if: $REMOTE_USER && $REMOTE_HOST && $PRIVATE_KEY && $CI_PIPELINE_SOURCE == "schedule"
when: always
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- when: never
- when: manual
allow_failure: true
@@ -317,21 +321,32 @@ regression_test_8gpu:
- pip install "fieldcompare[all]"
script:
- - hpc-rocket launch --watch regression-tests/multigpu_test/rocket8GPU.yml
+ - hpc-rocket launch regression-tests/multigpu_test/rocket8GPU.yml |& tee hpcrocket8GPU.log
+ - hpc-rocket watch regression-tests/multigpu_test/rocket8GPU.yml $(python regression-tests/multigpu_test/utilities/parsejobid.py hpcrocket8GPU.log)
+ - hpc-rocket finalize regression-tests/multigpu_test/rocket8GPU.yml
+ - cat output/8GPU/slurm8GPU.out
- git clone --depth 1 --filter=blob:none --sparse https://github.com/irmb/test_data
- cd test_data
- git sparse-checkout set regression_tests/gpu/DrivenCavity_8GPU_2Levels regression_tests/gpu/SphereScaling_8GPU_2Levels
- cd ..
- fieldcompare dir output/8GPU test_data/regression_tests/gpu/DrivenCavity_8GPU_2Levels --include-files "DrivenCavityMultiGPU*.vtu"
- fieldcompare dir output/8GPU test_data/regression_tests/gpu/SphereScaling_8GPU_2Levels --include-files "SphereScaling*.vtu"
+
+ after_script:
+ - hpc-rocket cancel regression-tests/multigpu_test/rocket8GPU.yml $(python regression-tests/multigpu_test/utilities/parsejobid.py hpcrocket8GPU.log)
+ artifacts:
+ when: always
+ paths:
+ - output/8GPU/slurm8GPU.out
+ expire_in: 1 week
###############################################################################
## Benchmark ##
###############################################################################
nvidia_test:
stage: benchmark
- image: nvidia/cuda:11.1.1-devel-ubuntu20.04
+ image: nvidia/cuda:12.1.1-devel-ubuntu22.04
needs: []
@@ -350,8 +365,6 @@ gpu_numerical_tests:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: always
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- when: never
- when: manual
allow_failure: true
@@ -387,20 +400,32 @@ gpu_numerical_tests:
- $CI_PROJECT_DIR/cache
artifacts:
- expire_in: 1 hrs
paths:
- $CI_PROJECT_DIR/numerical_tests_gpu_results.txt
###############################################################################
## Code analysis ##
###############################################################################
-clang_build_analyzer_clang_10:
+.analyze_template:
stage: analyze
- only: ["schedules"]
-
needs: []
+ tags:
+ - gpu
+ - linux
+
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE == "irmb" && $CI_COMMIT_BRANCH == "develop"'
+ when: always
+ - if: '$CI_PROJECT_NAMESPACE != "irmb"'
+ when: manual
+ allow_failure: true
+
+
+clang_build_analyzer:
+ extends: .analyze_template
+
before_script:
- export CC=clang
- export CXX=clang++
@@ -425,22 +450,19 @@ clang_build_analyzer_clang_10:
- ClangBuildAnalyzer --analyze CBA
###############################################################################
-include_what_you_use_clang_10:
- stage: analyze
-
- only: ["schedules"]
-
- needs: []
+include_what_you_use_clang_15:
+ extends: .analyze_template
before_script:
+ - apt-get update && apt-get install -y libclang-15-dev llvm-15-dev
- export CC=clang
- export CXX=clang++
- $CXX --version
- cd /tmp
- git clone https://github.com/include-what-you-use/include-what-you-use.git
- cd include-what-you-use
- - git checkout clang_10
- - cmake . -DCMAKE_PREFIX_PATH=/usr/lib/llvm-10
+ - git checkout clang_15
+ - cmake . -DCMAKE_PREFIX_PATH=/usr/lib/llvm-15
- make
- export PATH+=:$(pwd)/bin
@@ -454,24 +476,13 @@ include_what_you_use_clang_10:
- make
###############################################################################
-.analyze_template:
-
- rules: # dont create MR pipeline, run always on irmb/develop and manual in all other cases
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- when: never
- - if: '$CI_PROJECT_NAMESPACE == "irmb" && $CI_COMMIT_BRANCH == "develop"'
- when: always
- - when: manual
- allow_failure: true
-
cppcheck:
- stage: analyze
-
extends: .analyze_template
- needs: []
-
before_script:
+ - apt-get update && apt-get install -y libpcre3-dev
+ - chmod +x utilities/install-cppcheck.sh
+ - ./utilities/install-cppcheck.sh
- cppcheck --version
script:
@@ -487,17 +498,9 @@ cppcheck:
# lizard - Cyclomatic Complexity Analyzer
# Ignore warnings is manually set to 191. This job will fail when new warnings are added.
lizard:
- stage: analyze
-
extends: .analyze_template
- needs: []
-
before_script:
- - cd /tmp
- - git clone https://github.com/terryyin/lizard.git
- - cd lizard
- - python3 setup.py install
- lizard --version
script:
@@ -511,25 +514,25 @@ lizard:
###############################################################################
# code coverage
-gcov_gcc_9:
+gcov_gcc:
stage: analyze
extends: .analyze_template
- needs: []
-
before_script:
- gcovr --version
+ - export CC=/usr/bin/gcc-11
+ - export CXX=/usr/bin/g++-11
script:
- mkdir -p $CI_PROJECT_DIR/build
- cd $CI_PROJECT_DIR/build
- cmake ..
--preset=make_all
- -DCMAKE_CUDA_ARCHITECTURES=60
- -DBUILD_VF_COVERAGE=ON
+ -DCMAKE_BUILD_TYPE=PROFILE
+ -DCMAKE_CUDA_ARCHITECTURES=70
- make -j4
- - ./bin/basicsTests
+ - ctest --output-on-failure
- cd ..
- mkdir coverage
- gcovr -r $CI_PROJECT_DIR -k build -f "src" --print-summary --html coverage/coverage.html --html-details --xml coverage/coverage.xml
@@ -552,16 +555,10 @@ gcov_gcc_9:
###############################################################################
# this job also produces a compile commands json file.
clang-tidy:
- stage: analyze
-
extends: .analyze_template
- needs: []
-
- allow_failure: true
-
before_script:
- - run-clang-tidy -h
+ - run-clang-tidy-15 -h
script:
- mkdir -p $CI_PROJECT_DIR/build
@@ -571,7 +568,7 @@ clang-tidy:
-DBUILD_VF_DOUBLE_ACCURACY=ON
-DBUILD_VF_GPU=OFF
- python3 ../utilities/filterCompileCommands.py compile_commands.json
- - run-clang-tidy -quiet > clangtidy.txt
+ - run-clang-tidy-15 -quiet > clangtidy.txt
artifacts:
when: always
@@ -581,6 +578,33 @@ clang-tidy:
- build/compile_commands.json
+###############################################################################
+## Sanitizer ##
+###############################################################################
+sanitizer-address-leak-ub:
+ extends: .analyze_template
+ script:
+ - mkdir -p build && cd build
+ - cmake ..
+ --preset=make_all
+ -DCMAKE_CUDA_ARCHITECTURES=70
+ -DENABLE_SANITIZER_ADDRESS=ON
+ -DENABLE_SANITIZER_LEAK=ON
+ -DENABLE_SANITIZER_UNDEFINED_BEHAVIOR=ON
+ - make -j8
+ - ctest --output-on-failure
+
+sanitizer-memory:
+ extends: .analyze_template
+ script:
+ - mkdir -p build && cd build
+ - cmake ..
+ --preset=make_all
+ -DCMAKE_CUDA_ARCHITECTURES=70
+ -DENABLE_SANITIZER_MEMORY=ON
+ - make -j8
+ - ctest --output-on-failure
+
###############################################################################
# doxgen
pages:
@@ -629,7 +653,7 @@ pages:
vf_to_phoenix:
extends: .deploy_template
stage: deploy
- needs: ["gcc_9_python", "gcc_9_unit_tests", "gcc_9_python_bindings_test"]
+ needs: ["gcc_12_python", "gcc_12_unit_tests", "gcc_12_python_bindings_test"]
when: manual
@@ -653,7 +677,7 @@ vf_wheel_to_jupyterhub:
only: ["manual"]
- needs: ["gcc_9_python", "gcc_9_unit_tests", "gcc_9_python_bindings_test"]
+ needs: ["gcc_12_python", "gcc_12_unit_tests", "gcc_12_python_bindings_test"]
variables:
HOST: "gitlab-runner01.irmb.bau.tu-bs.de"
@@ -681,7 +705,7 @@ sonar-scanner:
variables:
SONAR_HOST_URL: "http://gitlab-runner01.irmb.bau.tu-bs.de/sonarqube/"
- needs: ["cppcheck","clang-tidy","gcov_gcc_9"]
+ needs: ["cppcheck","clang-tidy","gcov_gcc"]
before_script:
- cd /tmp
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..431c2f796787e5ddb22df5f93587eeac6362f9cf
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+ "c-cpp-flylint.flexelint.enable": false,
+ "c-cpp-flylint.flawfinder.enable": false
+}
\ No newline at end of file
diff --git a/3rdParty/cuda_samples/helper_functions.h b/3rdParty/cuda_samples/helper_functions.h
index 3fc2ea47ba7d39a4bf6a882f65b16779de6de0ac..058aee7aac750787307a385d7e27b30c381c0ced 100644
--- a/3rdParty/cuda_samples/helper_functions.h
+++ b/3rdParty/cuda_samples/helper_functions.h
@@ -48,7 +48,7 @@
#include <vector>
// includes, timer, string parsing, image helpers
-#include <helper_image.h> // helper functions for image compare, dump, data comparisons
+// #include <helper_image.h> // helper functions for image compare, dump, data comparisons
#include <helper_string.h> // helper functions for string parsing
#include <helper_timer.h> // helper functions for timers
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.appveyor.yml b/3rdParty/pybind11/pybind11-2.6.0/.appveyor.yml
deleted file mode 100644
index 149a8a3dc9d0076811810036fdd781722fc83203..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.appveyor.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-version: 1.0.{build}
-image:
-- Visual Studio 2015
-test: off
-skip_branch_with_pr: true
-build:
- parallel: true
-platform:
-- x86
-environment:
- matrix:
- - PYTHON: 36
- CONFIG: Debug
- - PYTHON: 27
- CONFIG: Debug
-install:
-- ps: |
- $env:CMAKE_GENERATOR = "Visual Studio 14 2015"
- if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" }
- $env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH"
- python -W ignore -m pip install --upgrade pip wheel
- python -W ignore -m pip install pytest numpy --no-warn-script-location
-- ps: |
- Start-FileDownload 'https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.zip'
- 7z x eigen-3.3.7.zip -y > $null
- $env:CMAKE_INCLUDE_PATH = "eigen-3.3.7;$env:CMAKE_INCLUDE_PATH"
-build_script:
-- cmake -G "%CMAKE_GENERATOR%" -A "%CMAKE_ARCH%"
- -DCMAKE_CXX_STANDARD=14
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DCMAKE_SUPPRESS_REGENERATION=1
- .
-- set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-- cmake --build . --config %CONFIG% --target pytest -- /m /v:m /logger:%MSBuildLogger%
-- cmake --build . --config %CONFIG% --target cpptest -- /m /v:m /logger:%MSBuildLogger%
-on_failure: if exist "tests\test_cmake_build" type tests\test_cmake_build\*.log*
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.clang-tidy b/3rdParty/pybind11/pybind11-2.6.0/.clang-tidy
deleted file mode 100644
index e29d929897bd06c6c1c3b1e4a9d54688fa245c12..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.clang-tidy
+++ /dev/null
@@ -1,13 +0,0 @@
-FormatStyle: file
-
-Checks: '
-llvm-namespace-comment,
-modernize-use-override,
-readability-container-size-empty,
-modernize-use-using,
-modernize-use-equals-default,
-modernize-use-auto,
-modernize-use-emplace,
-'
-
-HeaderFilterRegex: 'pybind11/.*h'
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.cmake-format.yaml b/3rdParty/pybind11/pybind11-2.6.0/.cmake-format.yaml
deleted file mode 100644
index a2a69f3f897da990a4255b593dc3fcdf4b89a764..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.cmake-format.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-parse:
- additional_commands:
- pybind11_add_module:
- flags:
- - THIN_LTO
- - MODULE
- - SHARED
- - NO_EXTRAS
- - EXCLUDE_FROM_ALL
- - SYSTEM
-
-format:
- line_width: 99
- tab_size: 2
-
- # If an argument group contains more than this many sub-groups
- # (parg or kwarg groups) then force it to a vertical layout.
- max_subgroups_hwrap: 2
-
- # If a positional argument group contains more than this many
- # arguments, then force it to a vertical layout.
- max_pargs_hwrap: 6
-
- # If a cmdline positional group consumes more than this many
- # lines without nesting, then invalidate the layout (and nest)
- max_rows_cmdline: 2
- separate_ctrl_name_with_space: false
- separate_fn_name_with_space: false
- dangle_parens: false
-
- # If the trailing parenthesis must be 'dangled' on its on
- # 'line, then align it to this reference: `prefix`: the start'
- # 'of the statement, `prefix-indent`: the start of the'
- # 'statement, plus one indentation level, `child`: align to'
- # the column of the arguments
- dangle_align: prefix
- # If the statement spelling length (including space and
- # parenthesis) is smaller than this amount, then force reject
- # nested layouts.
- min_prefix_chars: 4
-
- # If the statement spelling length (including space and
- # parenthesis) is larger than the tab width by more than this
- # amount, then force reject un-nested layouts.
- max_prefix_chars: 10
-
- # If a candidate layout is wrapped horizontally but it exceeds
- # this many lines, then reject the layout.
- max_lines_hwrap: 2
-
- line_ending: unix
-
- # Format command names consistently as 'lower' or 'upper' case
- command_case: canonical
-
- # Format keywords consistently as 'lower' or 'upper' case
- # unchanged is valid too
- keyword_case: 'upper'
-
- # A list of command names which should always be wrapped
- always_wrap: []
-
- # If true, the argument lists which are known to be sortable
- # will be sorted lexicographically
- enable_sort: true
-
- # If true, the parsers may infer whether or not an argument
- # list is sortable (without annotation).
- autosort: false
-
-# Causes a few issues - can be solved later, possibly.
-markup:
- enable_markup: false
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/CONTRIBUTING.md b/3rdParty/pybind11/pybind11-2.6.0/.github/CONTRIBUTING.md
deleted file mode 100644
index 4ced21baaaa859cc21a83a5f90c69951dbf09419..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,319 +0,0 @@
-Thank you for your interest in this project! Please refer to the following
-sections on how to contribute code and bug reports.
-
-### Reporting bugs
-
-Before submitting a question or bug report, please take a moment of your time
-and ensure that your issue isn't already discussed in the project documentation
-provided at [pybind11.readthedocs.org][] or in the [issue tracker][]. You can
-also check [gitter][] to see if it came up before.
-
-Assuming that you have identified a previously unknown problem or an important
-question, it's essential that you submit a self-contained and minimal piece of
-code that reproduces the problem. In other words: no external dependencies,
-isolate the function(s) that cause breakage, submit matched and complete C++
-and Python snippets that can be easily compiled and run in isolation; or
-ideally make a small PR with a failing test case that can be used as a starting
-point.
-
-## Pull requests
-
-Contributions are submitted, reviewed, and accepted using GitHub pull requests.
-Please refer to [this article][using pull requests] for details and adhere to
-the following rules to make the process as smooth as possible:
-
-* Make a new branch for every feature you're working on.
-* Make small and clean pull requests that are easy to review but make sure they
- do add value by themselves.
-* Add tests for any new functionality and run the test suite (`cmake --build
- build --target pytest`) to ensure that no existing features break.
-* Please run [`pre-commit`][pre-commit] to check your code matches the
- project style. (Note that `gawk` is required.) Use `pre-commit run
- --all-files` before committing (or use installed-mode, check pre-commit docs)
- to verify your code passes before pushing to save time.
-* This project has a strong focus on providing general solutions using a
- minimal amount of code, thus small pull requests are greatly preferred.
-
-### Licensing of contributions
-
-pybind11 is provided under a BSD-style license that can be found in the
-``LICENSE`` file. By using, distributing, or contributing to this project, you
-agree to the terms and conditions of this license.
-
-You are under no obligation whatsoever to provide any bug fixes, patches, or
-upgrades to the features, functionality or performance of the source code
-("Enhancements") to anyone; however, if you choose to make your Enhancements
-available either publicly, or directly to the author of this software, without
-imposing a separate written license agreement for such Enhancements, then you
-hereby grant the following license: a non-exclusive, royalty-free perpetual
-license to install, use, modify, prepare derivative works, incorporate into
-other computer software, distribute, and sublicense such enhancements or
-derivative works thereof, in binary and source code form.
-
-
-## Development of pybind11
-
-To setup an ideal development environment, run the following commands on a
-system with CMake 3.14+:
-
-```bash
-python3 -m venv venv
-source venv/bin/activate
-pip install -r tests/requirements.txt
-cmake -S . -B build -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON
-cmake --build build -j4
-```
-
-Tips:
-
-* You can use `virtualenv` (from PyPI) instead of `venv` (which is Python 3
- only).
-* You can select any name for your environment folder; if it contains "env" it
- will be ignored by git.
-* If you don’t have CMake 3.14+, just add “cmake†to the pip install command.
-* You can use `-DPYBIND11_FINDPYTHON=ON` to use FindPython on CMake 3.12+
-* In classic mode, you may need to set `-DPYTHON_EXECUTABLE=/path/to/python`.
- FindPython uses `-DPython_ROOT_DIR=/path/to` or
- `-DPython_EXECUTABLE=/path/to/python`.
-
-### Configuration options
-
-In CMake, configuration options are given with “-Dâ€. Options are stored in the
-build directory, in the `CMakeCache.txt` file, so they are remembered for each
-build directory. Two selections are special - the generator, given with `-G`,
-and the compiler, which is selected based on environment variables `CXX` and
-similar, or `-DCMAKE_CXX_COMPILER=`. Unlike the others, these cannot be changed
-after the initial run.
-
-The valid options are:
-
-* `-DCMAKE_BUILD_TYPE`: Release, Debug, MinSizeRel, RelWithDebInfo
-* `-DPYBIND11_FINDPYTHON=ON`: Use CMake 3.12+’s FindPython instead of the
- classic, deprecated, custom FindPythonLibs
-* `-DPYBIND11_NOPYTHON=ON`: Disable all Python searching (disables tests)
-* `-DBUILD_TESTING=ON`: Enable the tests
-* `-DDOWNLOAD_CATCH=ON`: Download catch to build the C++ tests
-* `-DOWNLOAD_EIGEN=ON`: Download Eigen for the NumPy tests
-* `-DPYBIND11_INSTALL=ON/OFF`: Enable the install target (on by default for the
- master project)
-* `-DUSE_PYTHON_INSTALL_DIR=ON`: Try to install into the python dir
-
-
-<details><summary>A few standard CMake tricks: (click to expand)</summary><p>
-
-* Use `cmake --build build -v` to see the commands used to build the files.
-* Use `cmake build -LH` to list the CMake options with help.
-* Use `ccmake` if available to see a curses (terminal) gui, or `cmake-gui` for
- a completely graphical interface (not present in the PyPI package).
-* Use `cmake --build build -j12` to build with 12 cores (for example).
-* Use `-G` and the name of a generator to use something different. `cmake
- --help` lists the generators available.
- - On Unix, setting `CMAKE_GENERATER=Ninja` in your environment will give
- you automatic mulithreading on all your CMake projects!
-* Open the `CMakeLists.txt` with QtCreator to generate for that IDE.
-* You can use `-DCMAKE_EXPORT_COMPILE_COMMANDS=ON` to generate the `.json` file
- that some tools expect.
-
-</p></details>
-
-
-To run the tests, you can "build" the check target:
-
-```bash
-cmake --build build --target check
-```
-
-`--target` can be spelled `-t` in CMake 3.15+. You can also run individual
-tests with these targets:
-
-* `pytest`: Python tests only
-* `cpptest`: C++ tests only
-* `test_cmake_build`: Install / subdirectory tests
-
-If you want to build just a subset of tests, use
-`-DPYBIND11_TEST_OVERRIDE="test_callbacks.cpp;test_pickling.cpp"`. If this is
-empty, all tests will be built.
-
-### Formatting
-
-All formatting is handled by pre-commit.
-
-Install with brew (macOS) or pip (any OS):
-
-```bash
-# Any OS
-python3 -m pip install pre-commit
-
-# OR macOS with homebrew:
-brew install pre-commit
-```
-
-Then, you can run it on the items you've added to your staging area, or all
-files:
-
-```bash
-pre-commit run
-# OR
-pre-commit run --all-files
-```
-
-And, if you want to always use it, you can install it as a git hook (hence the
-name, pre-commit):
-
-```bash
-pre-commit install
-```
-
-### Clang-Tidy
-
-To run Clang tidy, the following recipe should work. Files will be modified in
-place, so you can use git to monitor the changes.
-
-```bash
-docker run --rm -v $PWD:/pybind11 -it silkeh/clang:10
-apt-get update && apt-get install python3-dev python3-pytest
-cmake -S pybind11/ -B build -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);-fix"
-cmake --build build
-```
-
-### Include what you use
-
-To run include what you use, install (`brew install include-what-you-use` on
-macOS), then run:
-
-```bash
-cmake -S . -B build-iwyu -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE=$(which include-what-you-use)
-cmake --build build
-```
-
-The report is sent to stderr; you can pip it into a file if you wish.
-
-### Build recipes
-
-This builds with the Intel compiler (assuming it is in your path, along with a
-recent CMake and Python 3):
-
-```bash
-python3 -m venv venv
-. venv/bin/activate
-pip install pytest
-cmake -S . -B build-intel -DCMAKE_CXX_COMPILER=$(which icpc) -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON -DPYBIND11_WERROR=ON
-```
-
-This will test the PGI compilers:
-
-```bash
-docker run --rm -it -v $PWD:/pybind11 nvcr.io/hpc/pgi-compilers:ce
-apt-get update && apt-get install -y python3-dev python3-pip python3-pytest
-wget -qO- "https://cmake.org/files/v3.18/cmake-3.18.2-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local
-cmake -S pybind11/ -B build
-cmake --build build
-```
-
-### Explanation of the SDist/wheel building design
-
-> These details below are _only_ for packaging the Python sources from git. The
-> SDists and wheels created do not have any extra requirements at all and are
-> completely normal.
-
-The main objective of the packaging system is to create SDists (Python's source
-distribution packages) and wheels (Python's binary distribution packages) that
-include everything that is needed to work with pybind11, and which can be
-installed without any additional dependencies. This is more complex than it
-appears: in order to support CMake as a first class language even when using
-the PyPI package, they must include the _generated_ CMake files (so as not to
-require CMake when installing the `pybind11` package itself). They should also
-provide the option to install to the "standard" location
-(`<ENVROOT>/include/pybind11` and `<ENVROOT>/share/cmake/pybind11`) so they are
-easy to find with CMake, but this can cause problems if you are not an
-environment or using ``pyproject.toml`` requirements. This was solved by having
-two packages; the "nice" pybind11 package that stores the includes and CMake
-files inside the package, that you get access to via functions in the package,
-and a `pybind11-global` package that can be included via `pybind11[global]` if
-you want the more invasive but discoverable file locations.
-
-If you want to install or package the GitHub source, it is best to have Pip 10
-or newer on Windows, macOS, or Linux (manylinux1 compatible, includes most
-distributions). You can then build the SDists, or run any procedure that makes
-SDists internally, like making wheels or installing.
-
-
-```bash
-# Editable development install example
-python3 -m pip install -e .
-```
-
-Since Pip itself does not have an `sdist` command (it does have `wheel` and
-`install`), you may want to use the upcoming `build` package:
-
-```bash
-python3 -m pip install build
-
-# Normal package
-python3 -m build -s .
-
-# Global extra
-PYBIND11_GLOBAL_SDIST=1 python3 -m build -s .
-```
-
-If you want to use the classic "direct" usage of `python setup.py`, you will
-need CMake 3.15+ and either `make` or `ninja` preinstalled (possibly via `pip
-install cmake ninja`), since directly running Python on `setup.py` cannot pick
-up and install `pyproject.toml` requirements. As long as you have those two
-things, though, everything works the way you would expect:
-
-```bash
-# Normal package
-python3 setup.py sdist
-
-# Global extra
-PYBIND11_GLOBAL_SDIST=1 python3 setup.py sdist
-```
-
-A detailed explanation of the build procedure design for developers wanting to
-work on or maintain the packaging system is as follows:
-
-#### 1. Building from the source directory
-
-When you invoke any `setup.py` command from the source directory, including
-`pip wheel .` and `pip install .`, you will activate a full source build. This
-is made of the following steps:
-
-1. If the tool is PEP 518 compliant, like Pip 10+, it will create a temporary
- virtual environment and install the build requirements (mostly CMake) into
- it. (if you are not on Windows, macOS, or a manylinux compliant system, you
- can disable this with `--no-build-isolation` as long as you have CMake 3.15+
- installed)
-2. The environment variable `PYBIND11_GLOBAL_SDIST` is checked - if it is set
- and truthy, this will be make the accessory `pybind11-global` package,
- instead of the normal `pybind11` package. This package is used for
- installing the files directly to your environment root directory, using
- `pybind11[global]`.
-2. `setup.py` reads the version from `pybind11/_version.py` and verifies it
- matches `includes/pybind11/detail/common.h`.
-3. CMake is run with `-DCMAKE_INSTALL_PREIFX=pybind11`. Since the CMake install
- procedure uses only relative paths and is identical on all platforms, these
- files are valid as long as they stay in the correct relative position to the
- includes. `pybind11/share/cmake/pybind11` has the CMake files, and
- `pybind11/include` has the includes. The build directory is discarded.
-4. Simpler files are placed in the SDist: `tools/setup_*.py.in`,
- `tools/pyproject.toml` (`main` or `global`)
-5. The package is created by running the setup function in the
- `tools/setup_*.py`. `setup_main.py` fills in Python packages, and
- `setup_global.py` fills in only the data/header slots.
-6. A context manager cleans up the temporary CMake install directory (even if
- an error is thrown).
-
-### 2. Building from SDist
-
-Since the SDist has the rendered template files in `tools` along with the
-includes and CMake files in the correct locations, the builds are completely
-trivial and simple. No extra requirements are required. You can even use Pip 9
-if you really want to.
-
-
-[pre-commit]: https://pre-commit.com
-[pybind11.readthedocs.org]: http://pybind11.readthedocs.org/en/latest
-[issue tracker]: https://github.com/pybind/pybind11/issues
-[gitter]: https://gitter.im/pybind/Lobby
-[using pull requests]: https://help.github.com/articles/using-pull-requests
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/bug-report.md b/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index ae36ea65083643dfc6f252249141b94c7ecb65e7..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: Bug Report
-about: File an issue about a bug
-title: "[BUG] "
----
-
-
-Make sure you've completed the following steps before submitting your issue -- thank you!
-
-1. Make sure you've read the [documentation][]. Your issue may be addressed there.
-2. Search the [issue tracker][] to verify that this hasn't already been reported. +1 or comment there if it has.
-3. Consider asking first in the [Gitter chat room][].
-4. Include a self-contained and minimal piece of code that reproduces the problem. If that's not possible, try to make the description as clear as possible.
- a. If possible, make a PR with a new, failing test to give us a starting point to work on!
-
-[documentation]: https://pybind11.readthedocs.io
-[issue tracker]: https://github.com/pybind/pybind11/issues
-[Gitter chat room]: https://gitter.im/pybind/Lobby
-
-*After reading, remove this checklist and the template text in parentheses below.*
-
-## Issue description
-
-(Provide a short description, state the expected behavior and what actually happens.)
-
-## Reproducible example code
-
-(The code should be minimal, have no external dependencies, isolate the function(s) that cause breakage. Submit matched and complete C++ and Python snippets that can be easily compiled and run to diagnose the issue.)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/config.yml b/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 20e743136f3f2efea7deadf3e08c5b104c22a7f3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
- - name: Gitter room
- url: https://gitter.im/pybind/Lobby
- about: A room for discussing pybind11 with an active community
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/feature-request.md b/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index 5f6ec81ec972b13e38520ef2e37d85022c2642c9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Feature Request
-about: File an issue about adding a feature
-title: "[FEAT] "
----
-
-
-Make sure you've completed the following steps before submitting your issue -- thank you!
-
-1. Check if your feature has already been mentioned / rejected / planned in other issues.
-2. If those resources didn't help, consider asking in the [Gitter chat room][] to see if this is interesting / useful to a larger audience and possible to implement reasonably,
-4. If you have a useful feature that passes the previous items (or not suitable for chat), please fill in the details below.
-
-[Gitter chat room]: https://gitter.im/pybind/Lobby
-
-*After reading, remove this checklist.*
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/question.md b/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index b199b6ee8ad446994aed54f67b0d1c22049d53c1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Question
-about: File an issue about unexplained behavior
-title: "[QUESTION] "
----
-
-If you have a question, please check the following first:
-
-1. Check if your question has already been answered in the [FAQ][] section.
-2. Make sure you've read the [documentation][]. Your issue may be addressed there.
-3. If those resources didn't help and you only have a short question (not a bug report), consider asking in the [Gitter chat room][]
-4. Search the [issue tracker][], including the closed issues, to see if your question has already been asked/answered. +1 or comment if it has been asked but has no answer.
-5. If you have a more complex question which is not answered in the previous items (or not suitable for chat), please fill in the details below.
-6. Include a self-contained and minimal piece of code that illustrates your question. If that's not possible, try to make the description as clear as possible.
-
-[FAQ]: http://pybind11.readthedocs.io/en/latest/faq.html
-[documentation]: https://pybind11.readthedocs.io
-[issue tracker]: https://github.com/pybind/pybind11/issues
-[Gitter chat room]: https://gitter.im/pybind/Lobby
-
-*After reading, remove this checklist.*
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/dependabot.yml b/3rdParty/pybind11/pybind11-2.6.0/.github/dependabot.yml
deleted file mode 100644
index c1eac3c4436d5bda5dc88546ac66c34291853eff..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/dependabot.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: 2
-updates:
- # Maintain dependencies for GitHub Actions
- - package-ecosystem: "github-actions"
- directory: "/"
- schedule:
- interval: "daily"
- ignore:
- # Offical actions have moving tags like v1
- # that are used, so they don't need updates here
- - dependency-name: "actions/*"
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/labeler.yml b/3rdParty/pybind11/pybind11-2.6.0/.github/labeler.yml
deleted file mode 100644
index abb0d05aaa3f1ce86f027249b47ce2bc5f7f2e7b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/labeler.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-docs:
-- any:
- - 'docs/**/*.rst'
- - '!docs/changelog.rst'
- - '!docs/upgrade.rst'
-
-ci:
-- '.github/workflows/*.yml'
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/labeler_merged.yml b/3rdParty/pybind11/pybind11-2.6.0/.github/labeler_merged.yml
deleted file mode 100644
index 2374ad42e4597965da5a0aecb2afeb213da10445..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/labeler_merged.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-needs changelog:
-- all:
- - '!docs/changelog.rst'
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/pull_request_template.md b/3rdParty/pybind11/pybind11-2.6.0/.github/pull_request_template.md
deleted file mode 100644
index 5570f6f28b406011d210d8cc8f94d3754b503c05..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/pull_request_template.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Description
-
-<!-- Include relevant issues or PRs here, describe what changed and why -->
-
-
-## Suggested changelog entry:
-
-<!-- fill in the below block with the expected RestructuredText entry (delete if no entry needed) -->
-
-```rst
-
-```
-
-<!-- If the upgrade guide needs updating, note that here too -->
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/ci.yml b/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/ci.yml
deleted file mode 100644
index a5789df391b2f04a9899b58fdaa343d93acf1f53..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/ci.yml
+++ /dev/null
@@ -1,660 +0,0 @@
-name: CI
-
-on:
- workflow_dispatch:
- pull_request:
- push:
- branches:
- - master
- - stable
- - v*
-
-jobs:
- # This is the "main" test suite, which tests a large number of different
- # versions of default compilers and Python versions in GitHub Actions.
- standard:
- strategy:
- fail-fast: false
- matrix:
- runs-on: [ubuntu-latest, windows-latest, macos-latest]
- python:
- - 2.7
- - 3.5
- - 3.8
- - 3.9
- - pypy2
- - pypy3
-
- # Items in here will either be added to the build matrix (if not
- # present), or add new keys to an existing matrix element if all the
- # existing keys match.
- #
- # We support three optional keys: args (both build), args1 (first
- # build), and args2 (second build).
- include:
- # Just add a key
- - runs-on: ubuntu-latest
- python: 3.6
- args: >
- -DPYBIND11_FINDPYTHON=ON
- - runs-on: windows-latest
- python: 3.6
- args: >
- -DPYBIND11_FINDPYTHON=ON
- - runs-on: ubuntu-latest
- python: 3.8
- args: >
- -DPYBIND11_FINDPYTHON=ON
-
- # These items will be removed from the build matrix, keys must match.
- exclude:
- # Currently 32bit only, and we build 64bit
- - runs-on: windows-latest
- python: pypy2
- - runs-on: windows-latest
- python: pypy3
-
- name: "ðŸ ${{ matrix.python }} • ${{ matrix.runs-on }} • x64 ${{ matrix.args }}"
- runs-on: ${{ matrix.runs-on }}
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Setup Python ${{ matrix.python }}
- uses: actions/setup-python@v2
- with:
- python-version: ${{ matrix.python }}
-
- - name: Setup Boost (Windows / Linux latest)
- shell: bash
- run: echo "BOOST_ROOT=$BOOST_ROOT_1_72_0" >> $GITHUB_ENV
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.4
-
- - name: Cache wheels
- if: runner.os == 'macOS'
- uses: actions/cache@v2
- with:
- # This path is specific to macOS - we really only need it for PyPy NumPy wheels
- # See https://github.com/actions/cache/blob/master/examples.md#python---pip
- # for ways to do this more generally
- path: ~/Library/Caches/pip
- # Look to see if there is a cache hit for the corresponding requirements file
- key: ${{ runner.os }}-pip-${{ matrix.python }}-x64-${{ hashFiles('tests/requirements.txt') }}
-
- - name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
-
- - name: Setup annotations on Linux
- if: runner.os == 'Linux'
- run: python -m pip install pytest-github-actions-annotate-failures
-
- # First build - C++11 mode and inplace
- - name: Configure C++11 ${{ matrix.args }}
- run: >
- cmake -S . -B .
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=11
- ${{ matrix.args }}
-
- - name: Build C++11
- run: cmake --build . -j 2
-
- - name: Python tests C++11
- run: cmake --build . --target pytest -j 2
-
- - name: C++11 tests
- # TODO: Figure out how to load the DLL on Python 3.8+
- if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9))"
- run: cmake --build . --target cpptest -j 2
-
- - name: Interface test C++11
- run: cmake --build . --target test_cmake_build
-
- - name: Clean directory
- run: git clean -fdx
-
- # Second build - C++17 mode and in a build directory
- - name: Configure ${{ matrix.args2 }}
- run: >
- cmake -S . -B build2
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=17
- ${{ matrix.args }}
- ${{ matrix.args2 }}
-
- - name: Build
- run: cmake --build build2 -j 2
-
- - name: Python tests
- run: cmake --build build2 --target pytest
-
- - name: C++ tests
- # TODO: Figure out how to load the DLL on Python 3.8+
- if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9))"
- run: cmake --build build2 --target cpptest
-
- - name: Interface test
- run: cmake --build build2 --target test_cmake_build
-
- # Eventually Microsoft might have an action for setting up
- # MSVC, but for now, this action works:
- - name: Prepare compiler environment for Windows ðŸ 2.7
- if: matrix.python == 2.7 && runner.os == 'Windows'
- uses: ilammy/msvc-dev-cmd@v1
- with:
- arch: x64
-
- # This makes two environment variables available in the following step(s)
- - name: Set Windows ðŸ 2.7 environment variables
- if: matrix.python == 2.7 && runner.os == 'Windows'
- shell: bash
- run: |
- echo "DISTUTILS_USE_SDK=1" >> $GITHUB_ENV
- echo "MSSdk=1" >> $GITHUB_ENV
-
- # This makes sure the setup_helpers module can build packages using
- # setuptools
- - name: Setuptools helpers test
- run: pytest tests/extra_setuptools
-
-
- # Testing on clang using the excellent silkeh clang docker images
- clang:
- runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- clang:
- - 3.6
- - 3.7
- - 3.9
- - 7
- - dev
- std:
- - 11
- include:
- - clang: 5
- std: 14
- - clang: 10
- std: 20
- - clang: 10
- std: 17
-
- name: "ðŸ 3 • Clang ${{ matrix.clang }} • C++${{ matrix.std }} • x64"
- container: "silkeh/clang:${{ matrix.clang }}"
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Add wget and python3
- run: apt-get update && apt-get install -y python3-dev python3-numpy python3-pytest libeigen3-dev
-
- - name: Configure
- shell: bash
- run: >
- cmake -S . -B build
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DCMAKE_CXX_STANDARD=${{ matrix.std }}
- -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-
- - name: Build
- run: cmake --build build -j 2
-
- - name: Python tests
- run: cmake --build build --target pytest
-
- - name: C++ tests
- run: cmake --build build --target cpptest
-
- - name: Interface test
- run: cmake --build build --target test_cmake_build
-
-
- # Testing NVCC; forces sources to behave like .cu files
- cuda:
- runs-on: ubuntu-latest
- name: "ðŸ 3.8 • CUDA 11 • Ubuntu 20.04"
- container: nvidia/cuda:11.0-devel-ubuntu20.04
-
- steps:
- - uses: actions/checkout@v2
-
- # tzdata will try to ask for the timezone, so set the DEBIAN_FRONTEND
- - name: Install ðŸ 3
- run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
-
- - name: Configure
- run: cmake -S . -B build -DPYBIND11_CUDA_TESTS=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
-
- - name: Build
- run: cmake --build build -j2 --verbose
-
- - name: Python tests
- run: cmake --build build --target pytest
-
-
- # Testing CentOS 8 + PGI compilers
- centos-nvhpc8:
- runs-on: ubuntu-latest
- name: "ðŸ 3 • CentOS8 / PGI 20.7 • x64"
- container: centos:8
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Add Python 3 and a few requirements
- run: yum update -y && yum install -y git python3-devel python3-numpy python3-pytest make environment-modules
-
- - name: Install CMake with pip
- run: |
- python3 -m pip install --upgrade pip
- python3 -m pip install cmake --prefer-binary
-
- - name: Install NVidia HPC SDK
- run: yum -y install https://developer.download.nvidia.com/hpc-sdk/nvhpc-20-7-20.7-1.x86_64.rpm https://developer.download.nvidia.com/hpc-sdk/nvhpc-2020-20.7-1.x86_64.rpm
-
- - name: Configure
- shell: bash
- run: |
- source /etc/profile.d/modules.sh
- module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.7
- cmake -S . -B build -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-
- - name: Build
- run: cmake --build build -j 2 --verbose
-
- - name: Python tests
- run: cmake --build build --target pytest
-
- - name: C++ tests
- run: cmake --build build --target cpptest
-
- - name: Interface test
- run: cmake --build build --target test_cmake_build
-
-
- # Testing on CentOS 7 + PGI compilers, which seems to require more workarounds
- centos-nvhpc7:
- runs-on: ubuntu-latest
- name: "ðŸ 3 • CentOS7 / PGI 20.9 • x64"
- container: centos:7
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Add Python 3 and a few requirements
- run: yum update -y && yum install -y epel-release && yum install -y git python3-devel make environment-modules cmake3
-
- - name: Install NVidia HPC SDK
- run: yum -y install https://developer.download.nvidia.com/hpc-sdk/20.9/nvhpc-20-9-20.9-1.x86_64.rpm https://developer.download.nvidia.com/hpc-sdk/20.9/nvhpc-2020-20.9-1.x86_64.rpm
-
- # On CentOS 7, we have to filter a few tests (compiler internal error)
- # and allow deeper templete recursion (not needed on CentOS 8 with a newer
- # standard library). On some systems, you many need further workarounds:
- # https://github.com/pybind/pybind11/pull/2475
- - name: Configure
- shell: bash
- run: |
- source /etc/profile.d/modules.sh
- module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.9
- cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
- -DCMAKE_CXX_STANDARD=11 \
- -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
- -DCMAKE_CXX_FLAGS="-Wc,--pending_instantiations=0" \
- -DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
-
- # Building before installing Pip should produce a warning but not an error
- - name: Build
- run: cmake3 --build build -j 2 --verbose
-
- - name: Install CMake with pip
- run: |
- python3 -m pip install --upgrade pip
- python3 -m pip install pytest
-
- - name: Python tests
- run: cmake3 --build build --target pytest
-
- - name: C++ tests
- run: cmake3 --build build --target cpptest
-
- - name: Interface test
- run: cmake3 --build build --target test_cmake_build
-
- # Testing on GCC using the GCC docker images (only recent images supported)
- gcc:
- runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- gcc:
- - 7
- - latest
- std:
- - 11
- include:
- - gcc: 10
- std: 20
-
- name: "ðŸ 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64"
- container: "gcc:${{ matrix.gcc }}"
-
- steps:
- - uses: actions/checkout@v1
-
- - name: Add Python 3
- run: apt-get update; apt-get install -y python3-dev python3-numpy python3-pytest python3-pip libeigen3-dev
-
- - name: Update pip
- run: python3 -m pip install --upgrade pip
-
- - name: Setup CMake 3.18
- uses: jwlawson/actions-setup-cmake@v1.4
- with:
- cmake-version: 3.18
-
- - name: Configure
- shell: bash
- run: >
- cmake -S . -B build
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DCMAKE_CXX_STANDARD=${{ matrix.std }}
- -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-
- - name: Build
- run: cmake --build build -j 2
-
- - name: Python tests
- run: cmake --build build --target pytest
-
- - name: C++ tests
- run: cmake --build build --target cpptest
-
- - name: Interface test
- run: cmake --build build --target test_cmake_build
-
-
- # Testing on CentOS (manylinux uses a centos base, and this is an easy way
- # to get GCC 4.8, which is the manylinux1 compiler).
- centos:
- runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- centos:
- - 7 # GCC 4.8
- - 8
-
- name: "ðŸ 3 • CentOS ${{ matrix.centos }} • x64"
- container: "centos:${{ matrix.centos }}"
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Add Python 3
- run: yum update -y && yum install -y python3-devel gcc-c++ make git
-
- - name: Update pip
- run: python3 -m pip install --upgrade pip
-
- - name: Install dependencies
- run: python3 -m pip install cmake -r tests/requirements.txt --prefer-binary
-
- - name: Configure
- shell: bash
- run: >
- cmake -S . -B build
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=11
- -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-
- - name: Build
- run: cmake --build build -j 2
-
- - name: Python tests
- run: cmake --build build --target pytest
-
- - name: C++ tests
- run: cmake --build build --target cpptest
-
- - name: Interface test
- run: cmake --build build --target test_cmake_build
-
-
- # This tests an "install" with the CMake tools
- install-classic:
- name: "ðŸ 3.5 • Debian • x86 • Install"
- runs-on: ubuntu-latest
- container: i386/debian:stretch
-
- steps:
- - uses: actions/checkout@v1
-
- - name: Install requirements
- run: |
- apt-get update
- apt-get install -y git make cmake g++ libeigen3-dev python3-dev python3-pip
- pip3 install "pytest==3.1.*"
-
- - name: Configure for install
- run: >
- cmake .
- -DPYBIND11_INSTALL=1 -DPYBIND11_TEST=0
- -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-
- - name: Make and install
- run: make install
-
- - name: Copy tests to new directory
- run: cp -a tests /pybind11-tests
-
- - name: Make a new test directory
- run: mkdir /build-tests
-
- - name: Configure tests
- run: >
- cmake ../pybind11-tests
- -DDOWNLOAD_CATCH=ON
- -DPYBIND11_WERROR=ON
- -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- working-directory: /build-tests
-
- - name: Run tests
- run: make pytest -j 2
- working-directory: /build-tests
-
-
- # This verifies that the documentation is not horribly broken, and does a
- # basic sanity check on the SDist.
- doxygen:
- name: "Documentation build test"
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
-
- - uses: actions/setup-python@v2
-
- - name: Install Doxygen
- run: sudo apt-get install -y doxygen librsvg2-bin # Changed to rsvg-convert in 20.04
-
- - name: Install docs & setup requirements
- run: python3 -m pip install -r docs/requirements.txt
-
- - name: Build docs
- run: python3 -m sphinx -W -b html docs docs/.build
-
- - name: Make SDist
- run: python3 setup.py sdist
-
- - run: git status --ignored
-
- - name: Check local include dir
- run: >
- ls pybind11;
- python3 -c "import pybind11, pathlib; assert (a := pybind11.get_include()) == (b := str(pathlib.Path('include').resolve())), f'{a} != {b}'"
-
- - name: Compare Dists (headers only)
- working-directory: include
- run: |
- python3 -m pip install --user -U ../dist/*
- installed=$(python3 -c "import pybind11; print(pybind11.get_include() + '/pybind11')")
- diff -rq $installed ./pybind11
-
- win32:
- strategy:
- fail-fast: false
- matrix:
- python:
- - 3.5
- - 3.8
- - 3.9
- - pypy3
- # TODO: fix hang on pypy2
-
- include:
- - python: 3.9
- args: -DCMAKE_CXX_STANDARD=20 -DDOWNLOAD_EIGEN=OFF
- - python: 3.8
- args: -DCMAKE_CXX_STANDARD=17
-
- name: "ðŸ ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}"
- runs-on: windows-latest
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Setup Python ${{ matrix.python }}
- uses: actions/setup-python@v2
- with:
- python-version: ${{ matrix.python }}
- architecture: x86
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.4
-
- - name: Prepare MSVC
- uses: ilammy/msvc-dev-cmd@v1
- with:
- arch: x86
-
- - name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
-
- # First build - C++11 mode and inplace
- - name: Configure ${{ matrix.args }}
- run: >
- cmake -S . -B build
- -G "Visual Studio 16 2019" -A Win32
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- ${{ matrix.args }}
- - name: Build C++11
- run: cmake --build build -j 2
-
- - name: Run tests
- run: cmake --build build -t pytest
-
- win32-msvc2015:
- name: "ðŸ ${{ matrix.python }} • MSVC 2015 • x64"
- runs-on: windows-latest
- strategy:
- fail-fast: false
- matrix:
- python:
- - 2.7
- - 3.6
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Setup ðŸ ${{ matrix.python }}
- uses: actions/setup-python@v2
- with:
- python-version: ${{ matrix.python }}
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.4
-
- - name: Prepare MSVC
- uses: ilammy/msvc-dev-cmd@v1
- with:
- toolset: 14.0
-
- - name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
-
- # First build - C++11 mode and inplace
- - name: Configure
- run: >
- cmake -S . -B build
- -G "Visual Studio 14 2015" -A x64
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
-
- - name: Build C++14
- run: cmake --build build -j 2
-
- - name: Run all checks
- run: cmake --build build -t check
-
-
- win32-msvc2017:
- name: "ðŸ ${{ matrix.python }} • MSVC 2017 • x64"
- runs-on: windows-2016
- strategy:
- fail-fast: false
- matrix:
- python:
- - 3.7
- std:
- - 14
-
- include:
- - python: 2.7
- std: 17
- args: >
- -DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR"
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Setup ðŸ ${{ matrix.python }}
- uses: actions/setup-python@v2
- with:
- python-version: ${{ matrix.python }}
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.4
-
- - name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
-
- # First build - C++11 mode and inplace
- - name: Configure
- run: >
- cmake -S . -B build
- -G "Visual Studio 15 2017" -A x64
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=${{ matrix.std }}
- ${{ matrix.args }}
-
- - name: Build ${{ matrix.std }}
- run: cmake --build build -j 2
-
- - name: Run all checks
- run: cmake --build build -t check
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/configure.yml b/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/configure.yml
deleted file mode 100644
index 23f60229f3da31b3e52d228299ad47fbd7c6f8ec..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/configure.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-name: Config
-
-on:
- workflow_dispatch:
- pull_request:
- push:
- branches:
- - master
- - stable
- - v*
-
-jobs:
- # This tests various versions of CMake in various combinations, to make sure
- # the configure step passes.
- cmake:
- strategy:
- fail-fast: false
- matrix:
- runs-on: [ubuntu-latest, macos-latest, windows-latest]
- arch: [x64]
- cmake: [3.18]
-
- include:
- - runs-on: ubuntu-latest
- arch: x64
- cmake: 3.4
-
- - runs-on: macos-latest
- arch: x64
- cmake: 3.7
-
- - runs-on: windows-2016
- arch: x86
- cmake: 3.8
-
- - runs-on: windows-2016
- arch: x86
- cmake: 3.18
-
- name: ðŸ 3.7 • CMake ${{ matrix.cmake }} • ${{ matrix.runs-on }}
- runs-on: ${{ matrix.runs-on }}
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Setup Python 3.7
- uses: actions/setup-python@v2
- with:
- python-version: 3.7
- architecture: ${{ matrix.arch }}
-
- - name: Prepare env
- run: python -m pip install -r tests/requirements.txt
-
- # An action for adding a specific version of CMake:
- # https://github.com/jwlawson/actions-setup-cmake
- - name: Setup CMake ${{ matrix.cmake }}
- uses: jwlawson/actions-setup-cmake@v1.3
- with:
- cmake-version: ${{ matrix.cmake }}
-
- # These steps use a directory with a space in it intentionally
- - name: Make build directories
- run: mkdir "build dir"
-
- - name: Configure
- working-directory: build dir
- shell: bash
- run: >
- cmake ..
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
-
- # Only build and test if this was manually triggered in the GitHub UI
- - name: Build
- working-directory: build dir
- if: github.event_name == 'workflow_dispatch'
- run: cmake --build . --config Release
-
- - name: Test
- working-directory: build dir
- if: github.event_name == 'workflow_dispatch'
- run: cmake --build . --config Release --target check
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/format.yml b/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/format.yml
deleted file mode 100644
index 708a8eef1d21ee17789bca7eed7e6af8d3e7dce9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/format.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# This is a format job. Pre-commit has a first-party GitHub action, so we use
-# that: https://github.com/pre-commit/action
-
-name: Format
-
-on:
- workflow_dispatch:
- pull_request:
- push:
- branches:
- - master
- - stable
- - "v*"
-
-jobs:
- pre-commit:
- name: Format
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- - uses: pre-commit/action@v2.0.0
- with:
- # Slow hooks are marked with manual - slow is okay here, run them too
- extra_args: --hook-stage manual --all-files
-
- clang-tidy:
- name: Clang-Tidy
- runs-on: ubuntu-latest
- container: silkeh/clang:10
- steps:
- - uses: actions/checkout@v2
-
- - name: Install requirements
- run: apt-get update && apt-get install -y python3-dev python3-pytest
-
- - name: Configure
- run: cmake -S . -B build -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);--warnings-as-errors=*"
-
- - name: Build
- run: cmake --build build -j 2
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/labeler.yml b/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/labeler.yml
deleted file mode 100644
index a9ae729c34519848b8aa3a7e6d720a801473f393..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/labeler.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Labeler
-on:
- pull_request_target:
-
-jobs:
- label:
- name: Labeler
- runs-on: ubuntu-latest
- steps:
-
- - uses: actions/labeler@main
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- sync-labels: true
-
- - uses: actions/labeler@main
- if: "github.event.action == 'closed' && github.event.pull_request.merged == true"
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- configuration-path: .github/labeler_merged.yml
- sync-labels: true
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/pip.yml b/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/pip.yml
deleted file mode 100644
index 4414a12ee467d53de3e32e262770d973d8acbac3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.github/workflows/pip.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-name: Pip
-
-on:
- workflow_dispatch:
- pull_request:
- push:
- branches:
- - master
- - stable
- - v*
- release:
- types:
- - published
-
-jobs:
- # This builds the sdists and wheels and makes sure the files are exactly as
- # expected. Using Windows and Python 2.7, since that is often the most
- # challenging matrix element.
- test-packaging:
- name: ðŸ 2.7 • 📦 tests • windows-latest
- runs-on: windows-latest
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Setup ðŸ 2.7
- uses: actions/setup-python@v2
- with:
- python-version: 2.7
-
- - name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
-
- - name: Python Packaging tests
- run: pytest tests/extra_python_package/
-
-
- # This runs the packaging tests and also builds and saves the packages as
- # artifacts.
- packaging:
- name: ðŸ 3.8 • 📦 & 📦 tests • ubuntu-latest
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Setup ðŸ 3.8
- uses: actions/setup-python@v2
- with:
- python-version: 3.8
-
- - name: Prepare env
- run: python -m pip install -r tests/requirements.txt build twine --prefer-binary
-
- - name: Python Packaging tests
- run: pytest tests/extra_python_package/
-
- - name: Build SDist and wheels
- run: |
- python -m build
- PYBIND11_GLOBAL_SDIST=1 python -m build
-
- - name: Check metadata
- run: twine check dist/*
-
- - name: Save standard package
- uses: actions/upload-artifact@v2
- with:
- name: standard
- path: dist/pybind11-*
-
- - name: Save global package
- uses: actions/upload-artifact@v2
- with:
- name: global
- path: dist/pybind11_global-*
-
-
-
- # When a GitHub release is made, upload the artifacts to PyPI
- upload:
- name: Upload to PyPI
- runs-on: ubuntu-latest
- if: github.event_name == 'release' && github.event.action == 'published'
- needs: [packaging]
-
- steps:
- - uses: actions/setup-python@v2
-
- # Downloads all to directories matching the artifact names
- - uses: actions/download-artifact@v2
-
- - name: Publish standard package
- uses: pypa/gh-action-pypi-publish@v1.4.1
- with:
- password: ${{ secrets.pypi_password }}
- packages_dir: standard/
-
- - name: Publish global package
- uses: pypa/gh-action-pypi-publish@v1.4.1
- with:
- password: ${{ secrets.pypi_password_global }}
- packages_dir: global/
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.gitignore b/3rdParty/pybind11/pybind11-2.6.0/.gitignore
deleted file mode 100644
index 3f36b89e0cb8b1c18539ba2bfe5bd286f1403b97..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.gitignore
+++ /dev/null
@@ -1,43 +0,0 @@
-CMakeCache.txt
-CMakeFiles
-Makefile
-cmake_install.cmake
-cmake_uninstall.cmake
-.DS_Store
-*.so
-*.pyd
-*.dll
-*.sln
-*.sdf
-*.opensdf
-*.vcxproj
-*.vcxproj.user
-*.filters
-example.dir
-Win32
-x64
-Release
-Debug
-.vs
-CTestTestfile.cmake
-Testing
-autogen
-MANIFEST
-/.ninja_*
-/*.ninja
-/docs/.build
-*.py[co]
-*.egg-info
-*~
-.*.swp
-.DS_Store
-/dist
-/*build*
-.cache/
-sosize-*.txt
-pybind11Config*.cmake
-pybind11Targets.cmake
-/*env*
-/.vscode
-/pybind11/include/*
-/pybind11/share/*
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.pre-commit-config.yaml b/3rdParty/pybind11/pybind11-2.6.0/.pre-commit-config.yaml
deleted file mode 100644
index cf519b475f2e5e65a40b5fb245e4ad1958dcb5a3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.pre-commit-config.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-# To use:
-#
-# pre-commit run -a
-#
-# Or:
-#
-# pre-commit install # (runs every time you commit in git)
-#
-# To update this file:
-#
-# pre-commit autoupdate
-#
-# See https://github.com/pre-commit/pre-commit
-
-repos:
-# Standard hooks
-- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v3.2.0
- hooks:
- - id: check-added-large-files
- - id: check-case-conflict
- - id: check-merge-conflict
- - id: check-symlinks
- - id: check-yaml
- - id: debug-statements
- - id: end-of-file-fixer
- - id: mixed-line-ending
- - id: requirements-txt-fixer
- - id: trailing-whitespace
- - id: fix-encoding-pragma
-
-# Black, the code formatter, natively supports pre-commit
-- repo: https://github.com/psf/black
- rev: 20.8b1
- hooks:
- - id: black
- # By default, this ignores pyi files, though black supports them
- types: [text]
- files: \.pyi?$
-
-# Changes tabs to spaces
-- repo: https://github.com/Lucas-C/pre-commit-hooks
- rev: v1.1.9
- hooks:
- - id: remove-tabs
-
-# Flake8 also supports pre-commit natively (same author)
-- repo: https://gitlab.com/pycqa/flake8
- rev: 3.8.3
- hooks:
- - id: flake8
- additional_dependencies: [flake8-bugbear, pep8-naming]
- exclude: ^(docs/.*|tools/.*)$
-
-# CMake formatting
-- repo: https://github.com/cheshirekow/cmake-format-precommit
- rev: v0.6.13
- hooks:
- - id: cmake-format
- additional_dependencies: [pyyaml]
- types: [file]
- files: (\.cmake|CMakeLists.txt)(.in)?$
-
-# Check static types with mypy
-- repo: https://github.com/pre-commit/mirrors-mypy
- rev: v0.790
- hooks:
- - id: mypy
- # The default Python type ignores .pyi files, so let's rerun if detected
- types: [text]
- files: ^pybind11.*\.pyi?$
- # Running per-file misbehaves a bit, so just run on all files, it's fast
- pass_filenames: false
-
-# Checks the manifest for missing files (native support)
-- repo: https://github.com/mgedmin/check-manifest
- rev: "0.43"
- hooks:
- - id: check-manifest
- # This is a slow hook, so only run this if --hook-stage manual is passed
- stages: [manual]
- additional_dependencies: [cmake, ninja]
-
-# The original pybind11 checks for a few C++ style items
-- repo: local
- hooks:
- - id: disallow-caps
- name: Disallow improper capitalization
- language: pygrep
- entry: PyBind|Numpy|Cmake
- exclude: .pre-commit-config.yaml
-
-- repo: local
- hooks:
- - id: check-style
- name: Classic check-style
- language: system
- types:
- - c++
- entry: ./tools/check-style.sh
diff --git a/3rdParty/pybind11/pybind11-2.6.0/.readthedocs.yml b/3rdParty/pybind11/pybind11-2.6.0/.readthedocs.yml
deleted file mode 100644
index c9c61617ca9b13a3e31d33226c52ba9529872a0d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/.readthedocs.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-python:
- version: 3
-requirements_file: docs/requirements.txt
diff --git a/3rdParty/pybind11/pybind11-2.6.0/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/CMakeLists.txt
deleted file mode 100644
index 99cdd2205510c930b1ed1ffde01d359483dcc1ec..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/CMakeLists.txt
+++ /dev/null
@@ -1,266 +0,0 @@
-# CMakeLists.txt -- Build system for the pybind11 modules
-#
-# Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
-#
-# All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-cmake_minimum_required(VERSION 3.4)
-
-# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
-# some versions of VS that have a patched CMake 3.11. This forces us to emulate
-# the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.18)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.18)
-endif()
-
-# Extract project version from source
-file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/include/pybind11/detail/common.h"
- pybind11_version_defines REGEX "#define PYBIND11_VERSION_(MAJOR|MINOR|PATCH) ")
-
-foreach(ver ${pybind11_version_defines})
- if(ver MATCHES [[#define PYBIND11_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$]])
- set(PYBIND11_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}")
- endif()
-endforeach()
-
-if(PYBIND11_VERSION_PATCH MATCHES [[\.([a-zA-Z0-9]+)$]])
- set(pybind11_VERSION_TYPE "${CMAKE_MATCH_1}")
-endif()
-string(REGEX MATCH "^[0-9]+" PYBIND11_VERSION_PATCH "${PYBIND11_VERSION_PATCH}")
-
-project(
- pybind11
- LANGUAGES CXX
- VERSION "${PYBIND11_VERSION_MAJOR}.${PYBIND11_VERSION_MINOR}.${PYBIND11_VERSION_PATCH}")
-
-# Standard includes
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
-include(CMakeDependentOption)
-
-if(NOT pybind11_FIND_QUIETLY)
- message(STATUS "pybind11 v${pybind11_VERSION} ${pybind11_VERSION_TYPE}")
-endif()
-
-# Check if pybind11 is being used directly or via add_subdirectory
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
- ### Warn if not an out-of-source builds
- if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
- set(lines
- "You are building in-place. If that is not what you intended to "
- "do, you can clean the source directory with:\n"
- "rm -r CMakeCache.txt CMakeFiles/ cmake_uninstall.cmake pybind11Config.cmake "
- "pybind11ConfigVersion.cmake tests/CMakeFiles/\n")
- message(AUTHOR_WARNING ${lines})
- endif()
-
- set(PYBIND11_MASTER_PROJECT ON)
-
- if(OSX AND CMAKE_VERSION VERSION_LESS 3.7)
- # Bug in macOS CMake < 3.7 is unable to download catch
- message(WARNING "CMAKE 3.7+ needed on macOS to download catch, and newer HIGHLY recommended")
- elseif(WINDOWS AND CMAKE_VERSION VERSION_LESS 3.8)
- # Only tested with 3.8+ in CI.
- message(WARNING "CMAKE 3.8+ tested on Windows, previous versions untested")
- endif()
-
- message(STATUS "CMake ${CMAKE_VERSION}")
-
- if(CMAKE_CXX_STANDARD)
- set(CMAKE_CXX_EXTENSIONS OFF)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- endif()
-else()
- set(PYBIND11_MASTER_PROJECT OFF)
- set(pybind11_system SYSTEM)
-endif()
-
-# Options
-option(PYBIND11_INSTALL "Install pybind11 header files?" ${PYBIND11_MASTER_PROJECT})
-option(PYBIND11_TEST "Build pybind11 test suite?" ${PYBIND11_MASTER_PROJECT})
-option(PYBIND11_NOPYTHON "Disable search for Python" OFF)
-
-cmake_dependent_option(
- USE_PYTHON_INCLUDE_DIR
- "Install pybind11 headers in Python include directory instead of default installation prefix"
- OFF "PYBIND11_INSTALL" OFF)
-
-cmake_dependent_option(PYBIND11_FINDPYTHON "Force new FindPython" OFF
- "NOT CMAKE_VERSION VERSION_LESS 3.12" OFF)
-
-# NB: when adding a header don't forget to also add it to setup.py
-set(PYBIND11_HEADERS
- include/pybind11/detail/class.h
- include/pybind11/detail/common.h
- include/pybind11/detail/descr.h
- include/pybind11/detail/init.h
- include/pybind11/detail/internals.h
- include/pybind11/detail/typeid.h
- include/pybind11/attr.h
- include/pybind11/buffer_info.h
- include/pybind11/cast.h
- include/pybind11/chrono.h
- include/pybind11/common.h
- include/pybind11/complex.h
- include/pybind11/options.h
- include/pybind11/eigen.h
- include/pybind11/embed.h
- include/pybind11/eval.h
- include/pybind11/iostream.h
- include/pybind11/functional.h
- include/pybind11/numpy.h
- include/pybind11/operators.h
- include/pybind11/pybind11.h
- include/pybind11/pytypes.h
- include/pybind11/stl.h
- include/pybind11/stl_bind.h)
-
-# Compare with grep and warn if mismatched
-if(PYBIND11_MASTER_PROJECT AND NOT CMAKE_VERSION VERSION_LESS 3.12)
- file(
- GLOB_RECURSE _pybind11_header_check
- LIST_DIRECTORIES false
- RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
- CONFIGURE_DEPENDS "include/pybind11/*.h")
- set(_pybind11_here_only ${PYBIND11_HEADERS})
- set(_pybind11_disk_only ${_pybind11_header_check})
- list(REMOVE_ITEM _pybind11_here_only ${_pybind11_header_check})
- list(REMOVE_ITEM _pybind11_disk_only ${PYBIND11_HEADERS})
- if(_pybind11_here_only)
- message(AUTHOR_WARNING "PYBIND11_HEADERS has extra files:" ${_pybind11_here_only})
- endif()
- if(_pybind11_disk_only)
- message(AUTHOR_WARNING "PYBIND11_HEADERS is missing files:" ${_pybind11_disk_only})
- endif()
-endif()
-
-# CMake 3.12 added list(TRANSFORM <list> PREPEND
-# But we can't use it yet
-string(REPLACE "include/" "${CMAKE_CURRENT_SOURCE_DIR}/include/" PYBIND11_HEADERS
- "${PYBIND11_HEADERS}")
-
-# Cache variables so pybind11_add_module can be used in parent projects
-set(PYBIND11_INCLUDE_DIR
- "${CMAKE_CURRENT_LIST_DIR}/include"
- CACHE INTERNAL "")
-
-# Note: when creating targets, you cannot use if statements at configure time -
-# you need generator expressions, because those will be placed in the target file.
-# You can also place ifs *in* the Config.in, but not here.
-
-# This section builds targets, but does *not* touch Python
-
-# Build the headers-only target (no Python included):
-# (long name used here to keep this from clashing in subdirectory mode)
-add_library(pybind11_headers INTERFACE)
-add_library(pybind11::pybind11_headers ALIAS pybind11_headers) # to match exported target
-add_library(pybind11::headers ALIAS pybind11_headers) # easier to use/remember
-
-include("${CMAKE_CURRENT_SOURCE_DIR}/tools/pybind11Common.cmake")
-
-# Relative directory setting
-if(USE_PYTHON_INCLUDE_DIR AND DEFINED Python_INCLUDE_DIRS)
- file(RELATIVE_PATH CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX} ${Python_INCLUDE_DIRS})
-elseif(USE_PYTHON_INCLUDE_DIR AND DEFINED PYTHON_INCLUDE_DIR)
- file(RELATIVE_PATH CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX} ${PYTHON_INCLUDE_DIRS})
-endif()
-
-# Fill in headers target
-target_include_directories(
- pybind11_headers ${pybind11_system} INTERFACE $<BUILD_INTERFACE:${PYBIND11_INCLUDE_DIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-
-target_compile_features(pybind11_headers INTERFACE cxx_inheriting_constructors cxx_user_literals
- cxx_right_angle_brackets)
-
-if(PYBIND11_INSTALL)
- install(DIRECTORY ${PYBIND11_INCLUDE_DIR}/pybind11 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- set(PYBIND11_CMAKECONFIG_INSTALL_DIR
- "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}"
- CACHE STRING "install path for pybind11Config.cmake")
-
- configure_package_config_file(
- tools/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
- INSTALL_DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
-
- if(CMAKE_VERSION VERSION_LESS 3.14)
- # Remove CMAKE_SIZEOF_VOID_P from ConfigVersion.cmake since the library does
- # not depend on architecture specific settings or libraries.
- set(_PYBIND11_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
- unset(CMAKE_SIZEOF_VOID_P)
-
- write_basic_package_version_file(
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- VERSION ${PROJECT_VERSION}
- COMPATIBILITY AnyNewerVersion)
-
- set(CMAKE_SIZEOF_VOID_P ${_PYBIND11_CMAKE_SIZEOF_VOID_P})
- else()
- # CMake 3.14+ natively supports header-only libraries
- write_basic_package_version_file(
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- VERSION ${PROJECT_VERSION}
- COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT)
- endif()
-
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- tools/FindPythonLibsNew.cmake
- tools/pybind11Common.cmake
- tools/pybind11Tools.cmake
- tools/pybind11NewTools.cmake
- DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
-
- if(NOT PYBIND11_EXPORT_NAME)
- set(PYBIND11_EXPORT_NAME "${PROJECT_NAME}Targets")
- endif()
-
- install(TARGETS pybind11_headers EXPORT "${PYBIND11_EXPORT_NAME}")
-
- install(
- EXPORT "${PYBIND11_EXPORT_NAME}"
- NAMESPACE "pybind11::"
- DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
-
- # Uninstall target
- if(PYBIND11_MASTER_PROJECT)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake_uninstall.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
-
- add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
- ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
- endif()
-endif()
-
-# BUILD_TESTING takes priority, but only if this is the master project
-if(PYBIND11_MASTER_PROJECT AND DEFINED BUILD_TESTING)
- if(BUILD_TESTING)
- if(_pybind11_nopython)
- message(FATAL_ERROR "Cannot activate tests in NOPYTHON mode")
- else()
- add_subdirectory(tests)
- endif()
- endif()
-else()
- if(PYBIND11_TEST)
- if(_pybind11_nopython)
- message(FATAL_ERROR "Cannot activate tests in NOPYTHON mode")
- else()
- add_subdirectory(tests)
- endif()
- endif()
-endif()
-
-# Better symmetry with find_package(pybind11 CONFIG) mode.
-if(NOT PYBIND11_MASTER_PROJECT)
- set(pybind11_FOUND
- TRUE
- CACHE INTERNAL "true if pybind11 and all required components found on the system")
- set(pybind11_INCLUDE_DIR
- "${PYBIND11_INCLUDE_DIR}"
- CACHE INTERNAL "Directory where pybind11 headers are located")
-endif()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/LICENSE b/3rdParty/pybind11/pybind11-2.6.0/LICENSE
deleted file mode 100644
index e466b0dfda14f3a7c8ece512937eb99c8b7b6d68..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>, All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Please also refer to the file .github/CONTRIBUTING.md, which clarifies licensing of
-external contributions to this project including patches, pull requests, etc.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/MANIFEST.in b/3rdParty/pybind11/pybind11-2.6.0/MANIFEST.in
deleted file mode 100644
index aed183e874749089ab5d89ab43523bdde8a9a34c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/MANIFEST.in
+++ /dev/null
@@ -1,6 +0,0 @@
-recursive-include pybind11/include/pybind11 *.h
-recursive-include pybind11 *.py
-recursive-include pybind11 py.typed
-recursive-include pybind11 *.pyi
-include pybind11/share/cmake/pybind11/*.cmake
-include LICENSE README.rst pyproject.toml setup.py setup.cfg
diff --git a/3rdParty/pybind11/pybind11-2.6.0/README.rst b/3rdParty/pybind11/pybind11-2.6.0/README.rst
deleted file mode 100644
index 1474cb95af4f0f840a92f063d84e5568a4e0f3f4..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/README.rst
+++ /dev/null
@@ -1,175 +0,0 @@
-.. figure:: https://github.com/pybind/pybind11/raw/master/docs/pybind11-logo.png
- :alt: pybind11 logo
-
-**pybind11 — Seamless operability between C++11 and Python**
-
-|Latest Documentation Status| |Stable Documentation Status| |Gitter chat| |CI| |Build status|
-
-.. warning::
-
- Combining older versions of pybind11 (< 2.6.0) with the brand-new Python
- 3.9.0 will trigger undefined behavior that typically manifests as crashes
- during interpreter shutdown (but could also destroy your data. **You have been
- warned.**)
-
- We recommend that you wait for Python 3.9.1 slated for release in December,
- which will include a `fix <https://github.com/python/cpython/pull/22670>`_
- that resolves this problem. In the meantime, please update to the latest
- version of pybind11 (2.6.0 or newer), which includes a temporary workaround
- specifically when Python 3.9.0 is detected at runtime.
-
-**pybind11** is a lightweight header-only library that exposes C++ types
-in Python and vice versa, mainly to create Python bindings of existing
-C++ code. Its goals and syntax are similar to the excellent
-`Boost.Python <http://www.boost.org/doc/libs/1_58_0/libs/python/doc/>`_
-library by David Abrahams: to minimize boilerplate code in traditional
-extension modules by inferring type information using compile-time
-introspection.
-
-The main issue with Boost.Python—and the reason for creating such a
-similar project—is Boost. Boost is an enormously large and complex suite
-of utility libraries that works with almost every C++ compiler in
-existence. This compatibility has its cost: arcane template tricks and
-workarounds are necessary to support the oldest and buggiest of compiler
-specimens. Now that C++11-compatible compilers are widely available,
-this heavy machinery has become an excessively large and unnecessary
-dependency.
-
-Think of this library as a tiny self-contained version of Boost.Python
-with everything stripped away that isn’t relevant for binding
-generation. Without comments, the core header files only require ~4K
-lines of code and depend on Python (2.7 or 3.5+, or PyPy) and the C++
-standard library. This compact implementation was possible thanks to
-some of the new C++11 language features (specifically: tuples, lambda
-functions and variadic templates). Since its creation, this library has
-grown beyond Boost.Python in many ways, leading to dramatically simpler
-binding code in many common situations.
-
-Tutorial and reference documentation is provided at
-`pybind11.readthedocs.io <https://pybind11.readthedocs.io/en/latest>`_.
-A PDF version of the manual is available
-`here <https://pybind11.readthedocs.io/_/downloads/en/latest/pdf/>`_.
-And the source code is always available at
-`github.com/pybind/pybind11 <https://github.com/pybind/pybind11>`_.
-
-
-Core features
--------------
-
-
-pybind11 can map the following core C++ features to Python:
-
-- Functions accepting and returning custom data structures per value,
- reference, or pointer
-- Instance methods and static methods
-- Overloaded functions
-- Instance attributes and static attributes
-- Arbitrary exception types
-- Enumerations
-- Callbacks
-- Iterators and ranges
-- Custom operators
-- Single and multiple inheritance
-- STL data structures
-- Smart pointers with reference counting like ``std::shared_ptr``
-- Internal references with correct reference counting
-- C++ classes with virtual (and pure virtual) methods can be extended
- in Python
-
-Goodies
--------
-
-In addition to the core functionality, pybind11 provides some extra
-goodies:
-
-- Python 2.7, 3.5+, and PyPy/PyPy3 7.3 are supported with an
- implementation-agnostic interface.
-
-- It is possible to bind C++11 lambda functions with captured
- variables. The lambda capture data is stored inside the resulting
- Python function object.
-
-- pybind11 uses C++11 move constructors and move assignment operators
- whenever possible to efficiently transfer custom data types.
-
-- It’s easy to expose the internal storage of custom data types through
- Pythons’ buffer protocols. This is handy e.g. for fast conversion
- between C++ matrix classes like Eigen and NumPy without expensive
- copy operations.
-
-- pybind11 can automatically vectorize functions so that they are
- transparently applied to all entries of one or more NumPy array
- arguments.
-
-- Python’s slice-based access and assignment operations can be
- supported with just a few lines of code.
-
-- Everything is contained in just a few header files; there is no need
- to link against any additional libraries.
-
-- Binaries are generally smaller by a factor of at least 2 compared to
- equivalent bindings generated by Boost.Python. A recent pybind11
- conversion of PyRosetta, an enormous Boost.Python binding project,
- `reported <http://graylab.jhu.edu/RosettaCon2016/PyRosetta-4.pdf>`_
- a binary size reduction of **5.4x** and compile time reduction by
- **5.8x**.
-
-- Function signatures are precomputed at compile time (using
- ``constexpr``), leading to smaller binaries.
-
-- With little extra effort, C++ types can be pickled and unpickled
- similar to regular Python objects.
-
-Supported compilers
--------------------
-
-1. Clang/LLVM 3.3 or newer (for Apple Xcode’s clang, this is 5.0.0 or
- newer)
-2. GCC 4.8 or newer
-3. Microsoft Visual Studio 2015 Update 3 or newer
-4. Intel C++ compiler 18 or newer
- (`possible issue <https://github.com/pybind/pybind11/pull/2573>`_ on 20.2)
-5. Cygwin/GCC (tested on 2.5.1)
-6. NVCC (CUDA 11.0 tested)
-7. NVIDIA PGI (20.7 and 20.9 tested)
-
-About
------
-
-This project was created by `Wenzel
-Jakob <http://rgl.epfl.ch/people/wjakob>`_. Significant features and/or
-improvements to the code were contributed by Jonas Adler, Lori A. Burns,
-Sylvain Corlay, Eric Cousineau, Ralf Grosse-Kunstleve, Trent Houliston, Axel
-Huebl, @hulucc, Yannick Jadoul, Sergey Lyskov Johan Mabille, Tomasz MiÄ…sko,
-Dean Moldovan, Ben Pritchard, Jason Rhinelander, Boris Schäling, Pim
-Schellart, Henry Schreiner, Ivan Smirnov, Boris Staletic, and Patrick Stewart.
-
-We thank Google for a generous financial contribution to the continuous
-integration infrastructure used by this project.
-
-
-Contributing
-~~~~~~~~~~~~
-
-See the `contributing
-guide <https://github.com/pybind/pybind11/blob/master/.github/CONTRIBUTING.md>`_
-for information on building and contributing to pybind11.
-
-License
-~~~~~~~
-
-pybind11 is provided under a BSD-style license that can be found in the
-`LICENSE <https://github.com/pybind/pybind11/blob/master/LICENSE>`_
-file. By using, distributing, or contributing to this project, you agree
-to the terms and conditions of this license.
-
-.. |Latest Documentation Status| image:: https://readthedocs.org/projects/pybind11/badge?version=latest
- :target: http://pybind11.readthedocs.org/en/latest
-.. |Stable Documentation Status| image:: https://img.shields.io/badge/docs-stable-blue
- :target: http://pybind11.readthedocs.org/en/stable
-.. |Gitter chat| image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
- :target: https://gitter.im/pybind/Lobby
-.. |CI| image:: https://github.com/pybind/pybind11/workflows/CI/badge.svg
- :target: https://github.com/pybind/pybind11/actions
-.. |Build status| image:: https://ci.appveyor.com/api/projects/status/riaj54pn4h08xy40?svg=true
- :target: https://ci.appveyor.com/project/wjakob/pybind11
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/Doxyfile b/3rdParty/pybind11/pybind11-2.6.0/docs/Doxyfile
deleted file mode 100644
index c8562952ef426d3fc13485a7fa98b32f0bc97b75..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/Doxyfile
+++ /dev/null
@@ -1,23 +0,0 @@
-PROJECT_NAME = pybind11
-INPUT = ../include/pybind11/
-RECURSIVE = YES
-
-GENERATE_HTML = NO
-GENERATE_LATEX = NO
-GENERATE_XML = YES
-XML_OUTPUT = .build/doxygenxml
-XML_PROGRAMLISTING = YES
-
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = YES
-EXPAND_AS_DEFINED = PYBIND11_RUNTIME_EXCEPTION
-
-ALIASES = "rst=\verbatim embed:rst"
-ALIASES += "endrst=\endverbatim"
-
-QUIET = YES
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = NO
-PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \
- PY_MAJOR_VERSION=3 \
- PYBIND11_NOINLINE
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/_static/theme_overrides.css b/3rdParty/pybind11/pybind11-2.6.0/docs/_static/theme_overrides.css
deleted file mode 100644
index 1071809fa0fecf7c28d3356f37363266e9128b81..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/_static/theme_overrides.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.wy-table-responsive table td,
-.wy-table-responsive table th {
- white-space: initial !important;
-}
-.rst-content table.docutils td {
- vertical-align: top !important;
-}
-div[class^='highlight'] pre {
- white-space: pre;
- white-space: pre-wrap;
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/chrono.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/chrono.rst
deleted file mode 100644
index fbd46057aa392c86ae3747c2b21768367205ea49..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/chrono.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-Chrono
-======
-
-When including the additional header file :file:`pybind11/chrono.h` conversions
-from C++11 chrono datatypes to python datetime objects are automatically enabled.
-This header also enables conversions of python floats (often from sources such
-as ``time.monotonic()``, ``time.perf_counter()`` and ``time.process_time()``)
-into durations.
-
-An overview of clocks in C++11
-------------------------------
-
-A point of confusion when using these conversions is the differences between
-clocks provided in C++11. There are three clock types defined by the C++11
-standard and users can define their own if needed. Each of these clocks have
-different properties and when converting to and from python will give different
-results.
-
-The first clock defined by the standard is ``std::chrono::system_clock``. This
-clock measures the current date and time. However, this clock changes with to
-updates to the operating system time. For example, if your time is synchronised
-with a time server this clock will change. This makes this clock a poor choice
-for timing purposes but good for measuring the wall time.
-
-The second clock defined in the standard is ``std::chrono::steady_clock``.
-This clock ticks at a steady rate and is never adjusted. This makes it excellent
-for timing purposes, however the value in this clock does not correspond to the
-current date and time. Often this clock will be the amount of time your system
-has been on, although it does not have to be. This clock will never be the same
-clock as the system clock as the system clock can change but steady clocks
-cannot.
-
-The third clock defined in the standard is ``std::chrono::high_resolution_clock``.
-This clock is the clock that has the highest resolution out of the clocks in the
-system. It is normally a typedef to either the system clock or the steady clock
-but can be its own independent clock. This is important as when using these
-conversions as the types you get in python for this clock might be different
-depending on the system.
-If it is a typedef of the system clock, python will get datetime objects, but if
-it is a different clock they will be timedelta objects.
-
-Provided conversions
---------------------
-
-.. rubric:: C++ to Python
-
-- ``std::chrono::system_clock::time_point`` → ``datetime.datetime``
- System clock times are converted to python datetime instances. They are
- in the local timezone, but do not have any timezone information attached
- to them (they are naive datetime objects).
-
-- ``std::chrono::duration`` → ``datetime.timedelta``
- Durations are converted to timedeltas, any precision in the duration
- greater than microseconds is lost by rounding towards zero.
-
-- ``std::chrono::[other_clocks]::time_point`` → ``datetime.timedelta``
- Any clock time that is not the system clock is converted to a time delta.
- This timedelta measures the time from the clocks epoch to now.
-
-.. rubric:: Python to C++
-
-- ``datetime.datetime`` or ``datetime.date`` or ``datetime.time`` → ``std::chrono::system_clock::time_point``
- Date/time objects are converted into system clock timepoints. Any
- timezone information is ignored and the type is treated as a naive
- object.
-
-- ``datetime.timedelta`` → ``std::chrono::duration``
- Time delta are converted into durations with microsecond precision.
-
-- ``datetime.timedelta`` → ``std::chrono::[other_clocks]::time_point``
- Time deltas that are converted into clock timepoints are treated as
- the amount of time from the start of the clocks epoch.
-
-- ``float`` → ``std::chrono::duration``
- Floats that are passed to C++ as durations be interpreted as a number of
- seconds. These will be converted to the duration using ``duration_cast``
- from the float.
-
-- ``float`` → ``std::chrono::[other_clocks]::time_point``
- Floats that are passed to C++ as time points will be interpreted as the
- number of seconds from the start of the clocks epoch.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/custom.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/custom.rst
deleted file mode 100644
index a779444c24a2fc6ee0d928b766a14dce8d7aec14..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/custom.rst
+++ /dev/null
@@ -1,91 +0,0 @@
-Custom type casters
-===================
-
-In very rare cases, applications may require custom type casters that cannot be
-expressed using the abstractions provided by pybind11, thus requiring raw
-Python C API calls. This is fairly advanced usage and should only be pursued by
-experts who are familiar with the intricacies of Python reference counting.
-
-The following snippets demonstrate how this works for a very simple ``inty``
-type that that should be convertible from Python types that provide a
-``__int__(self)`` method.
-
-.. code-block:: cpp
-
- struct inty { long long_value; };
-
- void print(inty s) {
- std::cout << s.long_value << std::endl;
- }
-
-The following Python snippet demonstrates the intended usage from the Python side:
-
-.. code-block:: python
-
- class A:
- def __int__(self):
- return 123
-
- from example import print
- print(A())
-
-To register the necessary conversion routines, it is necessary to add an
-instantiation of the ``pybind11::detail::type_caster<T>`` template.
-Although this is an implementation detail, adding an instantiation of this
-type is explicitly allowed.
-
-.. code-block:: cpp
-
- namespace pybind11 { namespace detail {
- template <> struct type_caster<inty> {
- public:
- /**
- * This macro establishes the name 'inty' in
- * function signatures and declares a local variable
- * 'value' of type inty
- */
- PYBIND11_TYPE_CASTER(inty, _("inty"));
-
- /**
- * Conversion part 1 (Python->C++): convert a PyObject into a inty
- * instance or return false upon failure. The second argument
- * indicates whether implicit conversions should be applied.
- */
- bool load(handle src, bool) {
- /* Extract PyObject from handle */
- PyObject *source = src.ptr();
- /* Try converting into a Python integer value */
- PyObject *tmp = PyNumber_Long(source);
- if (!tmp)
- return false;
- /* Now try to convert into a C++ int */
- value.long_value = PyLong_AsLong(tmp);
- Py_DECREF(tmp);
- /* Ensure return code was OK (to avoid out-of-range errors etc) */
- return !(value.long_value == -1 && !PyErr_Occurred());
- }
-
- /**
- * Conversion part 2 (C++ -> Python): convert an inty instance into
- * a Python object. The second and third arguments are used to
- * indicate the return value policy and parent object (for
- * ``return_value_policy::reference_internal``) and are generally
- * ignored by implicit casters.
- */
- static handle cast(inty src, return_value_policy /* policy */, handle /* parent */) {
- return PyLong_FromLong(src.long_value);
- }
- };
- }} // namespace pybind11::detail
-
-.. note::
-
- A ``type_caster<T>`` defined with ``PYBIND11_TYPE_CASTER(T, ...)`` requires
- that ``T`` is default-constructible (``value`` is first default constructed
- and then ``load()`` assigns to it).
-
-.. warning::
-
- When using custom type casters, it's important to declare them consistently
- in every compilation unit of the Python extension module. Otherwise,
- undefined behavior can ensue.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/eigen.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/eigen.rst
deleted file mode 100644
index e01472d5aeaccc5c59a187f5ca9bf00eaf4fddba..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/eigen.rst
+++ /dev/null
@@ -1,310 +0,0 @@
-Eigen
-#####
-
-`Eigen <http://eigen.tuxfamily.org>`_ is C++ header-based library for dense and
-sparse linear algebra. Due to its popularity and widespread adoption, pybind11
-provides transparent conversion and limited mapping support between Eigen and
-Scientific Python linear algebra data types.
-
-To enable the built-in Eigen support you must include the optional header file
-:file:`pybind11/eigen.h`.
-
-Pass-by-value
-=============
-
-When binding a function with ordinary Eigen dense object arguments (for
-example, ``Eigen::MatrixXd``), pybind11 will accept any input value that is
-already (or convertible to) a ``numpy.ndarray`` with dimensions compatible with
-the Eigen type, copy its values into a temporary Eigen variable of the
-appropriate type, then call the function with this temporary variable.
-
-Sparse matrices are similarly copied to or from
-``scipy.sparse.csr_matrix``/``scipy.sparse.csc_matrix`` objects.
-
-Pass-by-reference
-=================
-
-One major limitation of the above is that every data conversion implicitly
-involves a copy, which can be both expensive (for large matrices) and disallows
-binding functions that change their (Matrix) arguments. Pybind11 allows you to
-work around this by using Eigen's ``Eigen::Ref<MatrixType>`` class much as you
-would when writing a function taking a generic type in Eigen itself (subject to
-some limitations discussed below).
-
-When calling a bound function accepting a ``Eigen::Ref<const MatrixType>``
-type, pybind11 will attempt to avoid copying by using an ``Eigen::Map`` object
-that maps into the source ``numpy.ndarray`` data: this requires both that the
-data types are the same (e.g. ``dtype='float64'`` and ``MatrixType::Scalar`` is
-``double``); and that the storage is layout compatible. The latter limitation
-is discussed in detail in the section below, and requires careful
-consideration: by default, numpy matrices and Eigen matrices are *not* storage
-compatible.
-
-If the numpy matrix cannot be used as is (either because its types differ, e.g.
-passing an array of integers to an Eigen parameter requiring doubles, or
-because the storage is incompatible), pybind11 makes a temporary copy and
-passes the copy instead.
-
-When a bound function parameter is instead ``Eigen::Ref<MatrixType>`` (note the
-lack of ``const``), pybind11 will only allow the function to be called if it
-can be mapped *and* if the numpy array is writeable (that is
-``a.flags.writeable`` is true). Any access (including modification) made to
-the passed variable will be transparently carried out directly on the
-``numpy.ndarray``.
-
-This means you can can write code such as the following and have it work as
-expected:
-
-.. code-block:: cpp
-
- void scale_by_2(Eigen::Ref<Eigen::VectorXd> v) {
- v *= 2;
- }
-
-Note, however, that you will likely run into limitations due to numpy and
-Eigen's difference default storage order for data; see the below section on
-:ref:`storage_orders` for details on how to bind code that won't run into such
-limitations.
-
-.. note::
-
- Passing by reference is not supported for sparse types.
-
-Returning values to Python
-==========================
-
-When returning an ordinary dense Eigen matrix type to numpy (e.g.
-``Eigen::MatrixXd`` or ``Eigen::RowVectorXf``) pybind11 keeps the matrix and
-returns a numpy array that directly references the Eigen matrix: no copy of the
-data is performed. The numpy array will have ``array.flags.owndata`` set to
-``False`` to indicate that it does not own the data, and the lifetime of the
-stored Eigen matrix will be tied to the returned ``array``.
-
-If you bind a function with a non-reference, ``const`` return type (e.g.
-``const Eigen::MatrixXd``), the same thing happens except that pybind11 also
-sets the numpy array's ``writeable`` flag to false.
-
-If you return an lvalue reference or pointer, the usual pybind11 rules apply,
-as dictated by the binding function's return value policy (see the
-documentation on :ref:`return_value_policies` for full details). That means,
-without an explicit return value policy, lvalue references will be copied and
-pointers will be managed by pybind11. In order to avoid copying, you should
-explicitly specify an appropriate return value policy, as in the following
-example:
-
-.. code-block:: cpp
-
- class MyClass {
- Eigen::MatrixXd big_mat = Eigen::MatrixXd::Zero(10000, 10000);
- public:
- Eigen::MatrixXd &getMatrix() { return big_mat; }
- const Eigen::MatrixXd &viewMatrix() { return big_mat; }
- };
-
- // Later, in binding code:
- py::class_<MyClass>(m, "MyClass")
- .def(py::init<>())
- .def("copy_matrix", &MyClass::getMatrix) // Makes a copy!
- .def("get_matrix", &MyClass::getMatrix, py::return_value_policy::reference_internal)
- .def("view_matrix", &MyClass::viewMatrix, py::return_value_policy::reference_internal)
- ;
-
-.. code-block:: python
-
- a = MyClass()
- m = a.get_matrix() # flags.writeable = True, flags.owndata = False
- v = a.view_matrix() # flags.writeable = False, flags.owndata = False
- c = a.copy_matrix() # flags.writeable = True, flags.owndata = True
- # m[5,6] and v[5,6] refer to the same element, c[5,6] does not.
-
-Note in this example that ``py::return_value_policy::reference_internal`` is
-used to tie the life of the MyClass object to the life of the returned arrays.
-
-You may also return an ``Eigen::Ref``, ``Eigen::Map`` or other map-like Eigen
-object (for example, the return value of ``matrix.block()`` and related
-methods) that map into a dense Eigen type. When doing so, the default
-behaviour of pybind11 is to simply reference the returned data: you must take
-care to ensure that this data remains valid! You may ask pybind11 to
-explicitly *copy* such a return value by using the
-``py::return_value_policy::copy`` policy when binding the function. You may
-also use ``py::return_value_policy::reference_internal`` or a
-``py::keep_alive`` to ensure the data stays valid as long as the returned numpy
-array does.
-
-When returning such a reference of map, pybind11 additionally respects the
-readonly-status of the returned value, marking the numpy array as non-writeable
-if the reference or map was itself read-only.
-
-.. note::
-
- Sparse types are always copied when returned.
-
-.. _storage_orders:
-
-Storage orders
-==============
-
-Passing arguments via ``Eigen::Ref`` has some limitations that you must be
-aware of in order to effectively pass matrices by reference. First and
-foremost is that the default ``Eigen::Ref<MatrixType>`` class requires
-contiguous storage along columns (for column-major types, the default in Eigen)
-or rows if ``MatrixType`` is specifically an ``Eigen::RowMajor`` storage type.
-The former, Eigen's default, is incompatible with ``numpy``'s default row-major
-storage, and so you will not be able to pass numpy arrays to Eigen by reference
-without making one of two changes.
-
-(Note that this does not apply to vectors (or column or row matrices): for such
-types the "row-major" and "column-major" distinction is meaningless).
-
-The first approach is to change the use of ``Eigen::Ref<MatrixType>`` to the
-more general ``Eigen::Ref<MatrixType, 0, Eigen::Stride<Eigen::Dynamic,
-Eigen::Dynamic>>`` (or similar type with a fully dynamic stride type in the
-third template argument). Since this is a rather cumbersome type, pybind11
-provides a ``py::EigenDRef<MatrixType>`` type alias for your convenience (along
-with EigenDMap for the equivalent Map, and EigenDStride for just the stride
-type).
-
-This type allows Eigen to map into any arbitrary storage order. This is not
-the default in Eigen for performance reasons: contiguous storage allows
-vectorization that cannot be done when storage is not known to be contiguous at
-compile time. The default ``Eigen::Ref`` stride type allows non-contiguous
-storage along the outer dimension (that is, the rows of a column-major matrix
-or columns of a row-major matrix), but not along the inner dimension.
-
-This type, however, has the added benefit of also being able to map numpy array
-slices. For example, the following (contrived) example uses Eigen with a numpy
-slice to multiply by 2 all coefficients that are both on even rows (0, 2, 4,
-...) and in columns 2, 5, or 8:
-
-.. code-block:: cpp
-
- m.def("scale", [](py::EigenDRef<Eigen::MatrixXd> m, double c) { m *= c; });
-
-.. code-block:: python
-
- # a = np.array(...)
- scale_by_2(myarray[0::2, 2:9:3])
-
-The second approach to avoid copying is more intrusive: rearranging the
-underlying data types to not run into the non-contiguous storage problem in the
-first place. In particular, that means using matrices with ``Eigen::RowMajor``
-storage, where appropriate, such as:
-
-.. code-block:: cpp
-
- using RowMatrixXd = Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>;
- // Use RowMatrixXd instead of MatrixXd
-
-Now bound functions accepting ``Eigen::Ref<RowMatrixXd>`` arguments will be
-callable with numpy's (default) arrays without involving a copying.
-
-You can, alternatively, change the storage order that numpy arrays use by
-adding the ``order='F'`` option when creating an array:
-
-.. code-block:: python
-
- myarray = np.array(source, order='F')
-
-Such an object will be passable to a bound function accepting an
-``Eigen::Ref<MatrixXd>`` (or similar column-major Eigen type).
-
-One major caveat with this approach, however, is that it is not entirely as
-easy as simply flipping all Eigen or numpy usage from one to the other: some
-operations may alter the storage order of a numpy array. For example, ``a2 =
-array.transpose()`` results in ``a2`` being a view of ``array`` that references
-the same data, but in the opposite storage order!
-
-While this approach allows fully optimized vectorized calculations in Eigen, it
-cannot be used with array slices, unlike the first approach.
-
-When *returning* a matrix to Python (either a regular matrix, a reference via
-``Eigen::Ref<>``, or a map/block into a matrix), no special storage
-consideration is required: the created numpy array will have the required
-stride that allows numpy to properly interpret the array, whatever its storage
-order.
-
-Failing rather than copying
-===========================
-
-The default behaviour when binding ``Eigen::Ref<const MatrixType>`` Eigen
-references is to copy matrix values when passed a numpy array that does not
-conform to the element type of ``MatrixType`` or does not have a compatible
-stride layout. If you want to explicitly avoid copying in such a case, you
-should bind arguments using the ``py::arg().noconvert()`` annotation (as
-described in the :ref:`nonconverting_arguments` documentation).
-
-The following example shows an example of arguments that don't allow data
-copying to take place:
-
-.. code-block:: cpp
-
- // The method and function to be bound:
- class MyClass {
- // ...
- double some_method(const Eigen::Ref<const MatrixXd> &matrix) { /* ... */ }
- };
- float some_function(const Eigen::Ref<const MatrixXf> &big,
- const Eigen::Ref<const MatrixXf> &small) {
- // ...
- }
-
- // The associated binding code:
- using namespace pybind11::literals; // for "arg"_a
- py::class_<MyClass>(m, "MyClass")
- // ... other class definitions
- .def("some_method", &MyClass::some_method, py::arg().noconvert());
-
- m.def("some_function", &some_function,
- "big"_a.noconvert(), // <- Don't allow copying for this arg
- "small"_a // <- This one can be copied if needed
- );
-
-With the above binding code, attempting to call the the ``some_method(m)``
-method on a ``MyClass`` object, or attempting to call ``some_function(m, m2)``
-will raise a ``RuntimeError`` rather than making a temporary copy of the array.
-It will, however, allow the ``m2`` argument to be copied into a temporary if
-necessary.
-
-Note that explicitly specifying ``.noconvert()`` is not required for *mutable*
-Eigen references (e.g. ``Eigen::Ref<MatrixXd>`` without ``const`` on the
-``MatrixXd``): mutable references will never be called with a temporary copy.
-
-Vectors versus column/row matrices
-==================================
-
-Eigen and numpy have fundamentally different notions of a vector. In Eigen, a
-vector is simply a matrix with the number of columns or rows set to 1 at
-compile time (for a column vector or row vector, respectively). NumPy, in
-contrast, has comparable 2-dimensional 1xN and Nx1 arrays, but *also* has
-1-dimensional arrays of size N.
-
-When passing a 2-dimensional 1xN or Nx1 array to Eigen, the Eigen type must
-have matching dimensions: That is, you cannot pass a 2-dimensional Nx1 numpy
-array to an Eigen value expecting a row vector, or a 1xN numpy array as a
-column vector argument.
-
-On the other hand, pybind11 allows you to pass 1-dimensional arrays of length N
-as Eigen parameters. If the Eigen type can hold a column vector of length N it
-will be passed as such a column vector. If not, but the Eigen type constraints
-will accept a row vector, it will be passed as a row vector. (The column
-vector takes precedence when both are supported, for example, when passing a
-1D numpy array to a MatrixXd argument). Note that the type need not be
-explicitly a vector: it is permitted to pass a 1D numpy array of size 5 to an
-Eigen ``Matrix<double, Dynamic, 5>``: you would end up with a 1x5 Eigen matrix.
-Passing the same to an ``Eigen::MatrixXd`` would result in a 5x1 Eigen matrix.
-
-When returning an Eigen vector to numpy, the conversion is ambiguous: a row
-vector of length 4 could be returned as either a 1D array of length 4, or as a
-2D array of size 1x4. When encountering such a situation, pybind11 compromises
-by considering the returned Eigen type: if it is a compile-time vector--that
-is, the type has either the number of rows or columns set to 1 at compile
-time--pybind11 converts to a 1D numpy array when returning the value. For
-instances that are a vector only at run-time (e.g. ``MatrixXd``,
-``Matrix<float, Dynamic, 4>``), pybind11 returns the vector as a 2D array to
-numpy. If this isn't want you want, you can use ``array.reshape(...)`` to get
-a view of the same data in the desired dimensions.
-
-.. seealso::
-
- The file :file:`tests/test_eigen.cpp` contains a complete example that
- shows how to pass Eigen sparse and dense data types in more detail.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/functional.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/functional.rst
deleted file mode 100644
index d9b46057598f0d182422accd088fbff9785b0b53..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/functional.rst
+++ /dev/null
@@ -1,109 +0,0 @@
-Functional
-##########
-
-The following features must be enabled by including :file:`pybind11/functional.h`.
-
-
-Callbacks and passing anonymous functions
-=========================================
-
-The C++11 standard brought lambda functions and the generic polymorphic
-function wrapper ``std::function<>`` to the C++ programming language, which
-enable powerful new ways of working with functions. Lambda functions come in
-two flavors: stateless lambda function resemble classic function pointers that
-link to an anonymous piece of code, while stateful lambda functions
-additionally depend on captured variables that are stored in an anonymous
-*lambda closure object*.
-
-Here is a simple example of a C++ function that takes an arbitrary function
-(stateful or stateless) with signature ``int -> int`` as an argument and runs
-it with the value 10.
-
-.. code-block:: cpp
-
- int func_arg(const std::function<int(int)> &f) {
- return f(10);
- }
-
-The example below is more involved: it takes a function of signature ``int -> int``
-and returns another function of the same kind. The return value is a stateful
-lambda function, which stores the value ``f`` in the capture object and adds 1 to
-its return value upon execution.
-
-.. code-block:: cpp
-
- std::function<int(int)> func_ret(const std::function<int(int)> &f) {
- return [f](int i) {
- return f(i) + 1;
- };
- }
-
-This example demonstrates using python named parameters in C++ callbacks which
-requires using ``py::cpp_function`` as a wrapper. Usage is similar to defining
-methods of classes:
-
-.. code-block:: cpp
-
- py::cpp_function func_cpp() {
- return py::cpp_function([](int i) { return i+1; },
- py::arg("number"));
- }
-
-After including the extra header file :file:`pybind11/functional.h`, it is almost
-trivial to generate binding code for all of these functions.
-
-.. code-block:: cpp
-
- #include <pybind11/functional.h>
-
- PYBIND11_MODULE(example, m) {
- m.def("func_arg", &func_arg);
- m.def("func_ret", &func_ret);
- m.def("func_cpp", &func_cpp);
- }
-
-The following interactive session shows how to call them from Python.
-
-.. code-block:: pycon
-
- $ python
- >>> import example
- >>> def square(i):
- ... return i * i
- ...
- >>> example.func_arg(square)
- 100L
- >>> square_plus_1 = example.func_ret(square)
- >>> square_plus_1(4)
- 17L
- >>> plus_1 = func_cpp()
- >>> plus_1(number=43)
- 44L
-
-.. warning::
-
- Keep in mind that passing a function from C++ to Python (or vice versa)
- will instantiate a piece of wrapper code that translates function
- invocations between the two languages. Naturally, this translation
- increases the computational cost of each function call somewhat. A
- problematic situation can arise when a function is copied back and forth
- between Python and C++ many times in a row, in which case the underlying
- wrappers will accumulate correspondingly. The resulting long sequence of
- C++ -> Python -> C++ -> ... roundtrips can significantly decrease
- performance.
-
- There is one exception: pybind11 detects case where a stateless function
- (i.e. a function pointer or a lambda function without captured variables)
- is passed as an argument to another C++ function exposed in Python. In this
- case, there is no overhead. Pybind11 will extract the underlying C++
- function pointer from the wrapped function to sidestep a potential C++ ->
- Python -> C++ roundtrip. This is demonstrated in :file:`tests/test_callbacks.cpp`.
-
-.. note::
-
- This functionality is very useful when generating bindings for callbacks in
- C++ libraries (e.g. GUI libraries, asynchronous networking libraries, etc.).
-
- The file :file:`tests/test_callbacks.cpp` contains a complete example
- that demonstrates how to work with callbacks and anonymous functions in
- more detail.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/index.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/index.rst
deleted file mode 100644
index 3ce9ea0286e9dbd5fc795e60ae77a3c9afa356b8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/index.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-.. _type-conversions:
-
-Type conversions
-################
-
-Apart from enabling cross-language function calls, a fundamental problem
-that a binding tool like pybind11 must address is to provide access to
-native Python types in C++ and vice versa. There are three fundamentally
-different ways to do this—which approach is preferable for a particular type
-depends on the situation at hand.
-
-1. Use a native C++ type everywhere. In this case, the type must be wrapped
- using pybind11-generated bindings so that Python can interact with it.
-
-2. Use a native Python type everywhere. It will need to be wrapped so that
- C++ functions can interact with it.
-
-3. Use a native C++ type on the C++ side and a native Python type on the
- Python side. pybind11 refers to this as a *type conversion*.
-
- Type conversions are the most "natural" option in the sense that native
- (non-wrapped) types are used everywhere. The main downside is that a copy
- of the data must be made on every Python ↔ C++ transition: this is
- needed since the C++ and Python versions of the same type generally won't
- have the same memory layout.
-
- pybind11 can perform many kinds of conversions automatically. An overview
- is provided in the table ":ref:`conversion_table`".
-
-The following subsections discuss the differences between these options in more
-detail. The main focus in this section is on type conversions, which represent
-the last case of the above list.
-
-.. toctree::
- :maxdepth: 1
-
- overview
- strings
- stl
- functional
- chrono
- eigen
- custom
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/overview.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/overview.rst
deleted file mode 100644
index b0e32a52f9c8bb2945e230416216c38e3c3a4a9b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/overview.rst
+++ /dev/null
@@ -1,165 +0,0 @@
-Overview
-########
-
-.. rubric:: 1. Native type in C++, wrapper in Python
-
-Exposing a custom C++ type using :class:`py::class_` was covered in detail
-in the :doc:`/classes` section. There, the underlying data structure is
-always the original C++ class while the :class:`py::class_` wrapper provides
-a Python interface. Internally, when an object like this is sent from C++ to
-Python, pybind11 will just add the outer wrapper layer over the native C++
-object. Getting it back from Python is just a matter of peeling off the
-wrapper.
-
-.. rubric:: 2. Wrapper in C++, native type in Python
-
-This is the exact opposite situation. Now, we have a type which is native to
-Python, like a ``tuple`` or a ``list``. One way to get this data into C++ is
-with the :class:`py::object` family of wrappers. These are explained in more
-detail in the :doc:`/advanced/pycpp/object` section. We'll just give a quick
-example here:
-
-.. code-block:: cpp
-
- void print_list(py::list my_list) {
- for (auto item : my_list)
- std::cout << item << " ";
- }
-
-.. code-block:: pycon
-
- >>> print_list([1, 2, 3])
- 1 2 3
-
-The Python ``list`` is not converted in any way -- it's just wrapped in a C++
-:class:`py::list` class. At its core it's still a Python object. Copying a
-:class:`py::list` will do the usual reference-counting like in Python.
-Returning the object to Python will just remove the thin wrapper.
-
-.. rubric:: 3. Converting between native C++ and Python types
-
-In the previous two cases we had a native type in one language and a wrapper in
-the other. Now, we have native types on both sides and we convert between them.
-
-.. code-block:: cpp
-
- void print_vector(const std::vector<int> &v) {
- for (auto item : v)
- std::cout << item << "\n";
- }
-
-.. code-block:: pycon
-
- >>> print_vector([1, 2, 3])
- 1 2 3
-
-In this case, pybind11 will construct a new ``std::vector<int>`` and copy each
-element from the Python ``list``. The newly constructed object will be passed
-to ``print_vector``. The same thing happens in the other direction: a new
-``list`` is made to match the value returned from C++.
-
-Lots of these conversions are supported out of the box, as shown in the table
-below. They are very convenient, but keep in mind that these conversions are
-fundamentally based on copying data. This is perfectly fine for small immutable
-types but it may become quite expensive for large data structures. This can be
-avoided by overriding the automatic conversion with a custom wrapper (i.e. the
-above-mentioned approach 1). This requires some manual effort and more details
-are available in the :ref:`opaque` section.
-
-.. _conversion_table:
-
-List of all builtin conversions
--------------------------------
-
-The following basic data types are supported out of the box (some may require
-an additional extension header to be included). To pass other data structures
-as arguments and return values, refer to the section on binding :ref:`classes`.
-
-+------------------------------------+---------------------------+-------------------------------+
-| Data type | Description | Header file |
-+====================================+===========================+===============================+
-| ``int8_t``, ``uint8_t`` | 8-bit integers | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``int16_t``, ``uint16_t`` | 16-bit integers | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``int32_t``, ``uint32_t`` | 32-bit integers | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``int64_t``, ``uint64_t`` | 64-bit integers | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``ssize_t``, ``size_t`` | Platform-dependent size | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``float``, ``double`` | Floating point types | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``bool`` | Two-state Boolean type | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``char`` | Character literal | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``char16_t`` | UTF-16 character literal | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``char32_t`` | UTF-32 character literal | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``wchar_t`` | Wide character literal | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``const char *`` | UTF-8 string literal | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``const char16_t *`` | UTF-16 string literal | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``const char32_t *`` | UTF-32 string literal | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``const wchar_t *`` | Wide string literal | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::string`` | STL dynamic UTF-8 string | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::u16string`` | STL dynamic UTF-16 string | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::u32string`` | STL dynamic UTF-32 string | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::wstring`` | STL dynamic wide string | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::string_view``, | STL C++17 string views | :file:`pybind11/pybind11.h` |
-| ``std::u16string_view``, etc. | | |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::pair<T1, T2>`` | Pair of two custom types | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::tuple<...>`` | Arbitrary tuple of types | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::reference_wrapper<...>`` | Reference type wrapper | :file:`pybind11/pybind11.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::complex<T>`` | Complex numbers | :file:`pybind11/complex.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::array<T, Size>`` | STL static array | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::vector<T>`` | STL dynamic array | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::deque<T>`` | STL double-ended queue | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::valarray<T>`` | STL value array | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::list<T>`` | STL linked list | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::map<T1, T2>`` | STL ordered map | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::unordered_map<T1, T2>`` | STL unordered map | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::set<T>`` | STL ordered set | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::unordered_set<T>`` | STL unordered set | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::optional<T>`` | STL optional type (C++17) | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::experimental::optional<T>`` | STL optional type (exp.) | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::variant<...>`` | Type-safe union (C++17) | :file:`pybind11/stl.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::function<...>`` | STL polymorphic function | :file:`pybind11/functional.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::chrono::duration<...>`` | STL time duration | :file:`pybind11/chrono.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``std::chrono::time_point<...>`` | STL date/time | :file:`pybind11/chrono.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``Eigen::Matrix<...>`` | Eigen: dense matrix | :file:`pybind11/eigen.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``Eigen::Map<...>`` | Eigen: mapped memory | :file:`pybind11/eigen.h` |
-+------------------------------------+---------------------------+-------------------------------+
-| ``Eigen::SparseMatrix<...>`` | Eigen: sparse matrix | :file:`pybind11/eigen.h` |
-+------------------------------------+---------------------------+-------------------------------+
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/stl.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/stl.rst
deleted file mode 100644
index 70fde0d2f44fc752c900bcc31b5e9b3e4c4694db..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/stl.rst
+++ /dev/null
@@ -1,240 +0,0 @@
-STL containers
-##############
-
-Automatic conversion
-====================
-
-When including the additional header file :file:`pybind11/stl.h`, conversions
-between ``std::vector<>``/``std::deque<>``/``std::list<>``/``std::array<>``/``std::valarray<>``,
-``std::set<>``/``std::unordered_set<>``, and
-``std::map<>``/``std::unordered_map<>`` and the Python ``list``, ``set`` and
-``dict`` data structures are automatically enabled. The types ``std::pair<>``
-and ``std::tuple<>`` are already supported out of the box with just the core
-:file:`pybind11/pybind11.h` header.
-
-The major downside of these implicit conversions is that containers must be
-converted (i.e. copied) on every Python->C++ and C++->Python transition, which
-can have implications on the program semantics and performance. Please read the
-next sections for more details and alternative approaches that avoid this.
-
-.. note::
-
- Arbitrary nesting of any of these types is possible.
-
-.. seealso::
-
- The file :file:`tests/test_stl.cpp` contains a complete
- example that demonstrates how to pass STL data types in more detail.
-
-.. _cpp17_container_casters:
-
-C++17 library containers
-========================
-
-The :file:`pybind11/stl.h` header also includes support for ``std::optional<>``
-and ``std::variant<>``. These require a C++17 compiler and standard library.
-In C++14 mode, ``std::experimental::optional<>`` is supported if available.
-
-Various versions of these containers also exist for C++11 (e.g. in Boost).
-pybind11 provides an easy way to specialize the ``type_caster`` for such
-types:
-
-.. code-block:: cpp
-
- // `boost::optional` as an example -- can be any `std::optional`-like container
- namespace pybind11 { namespace detail {
- template <typename T>
- struct type_caster<boost::optional<T>> : optional_caster<boost::optional<T>> {};
- }}
-
-The above should be placed in a header file and included in all translation units
-where automatic conversion is needed. Similarly, a specialization can be provided
-for custom variant types:
-
-.. code-block:: cpp
-
- // `boost::variant` as an example -- can be any `std::variant`-like container
- namespace pybind11 { namespace detail {
- template <typename... Ts>
- struct type_caster<boost::variant<Ts...>> : variant_caster<boost::variant<Ts...>> {};
-
- // Specifies the function used to visit the variant -- `apply_visitor` instead of `visit`
- template <>
- struct visit_helper<boost::variant> {
- template <typename... Args>
- static auto call(Args &&...args) -> decltype(boost::apply_visitor(args...)) {
- return boost::apply_visitor(args...);
- }
- };
- }} // namespace pybind11::detail
-
-The ``visit_helper`` specialization is not required if your ``name::variant`` provides
-a ``name::visit()`` function. For any other function name, the specialization must be
-included to tell pybind11 how to visit the variant.
-
-.. note::
-
- pybind11 only supports the modern implementation of ``boost::variant``
- which makes use of variadic templates. This requires Boost 1.56 or newer.
- Additionally, on Windows, MSVC 2017 is required because ``boost::variant``
- falls back to the old non-variadic implementation on MSVC 2015.
-
-.. _opaque:
-
-Making opaque types
-===================
-
-pybind11 heavily relies on a template matching mechanism to convert parameters
-and return values that are constructed from STL data types such as vectors,
-linked lists, hash tables, etc. This even works in a recursive manner, for
-instance to deal with lists of hash maps of pairs of elementary and custom
-types, etc.
-
-However, a fundamental limitation of this approach is that internal conversions
-between Python and C++ types involve a copy operation that prevents
-pass-by-reference semantics. What does this mean?
-
-Suppose we bind the following function
-
-.. code-block:: cpp
-
- void append_1(std::vector<int> &v) {
- v.push_back(1);
- }
-
-and call it from Python, the following happens:
-
-.. code-block:: pycon
-
- >>> v = [5, 6]
- >>> append_1(v)
- >>> print(v)
- [5, 6]
-
-As you can see, when passing STL data structures by reference, modifications
-are not propagated back the Python side. A similar situation arises when
-exposing STL data structures using the ``def_readwrite`` or ``def_readonly``
-functions:
-
-.. code-block:: cpp
-
- /* ... definition ... */
-
- class MyClass {
- std::vector<int> contents;
- };
-
- /* ... binding code ... */
-
- py::class_<MyClass>(m, "MyClass")
- .def(py::init<>())
- .def_readwrite("contents", &MyClass::contents);
-
-In this case, properties can be read and written in their entirety. However, an
-``append`` operation involving such a list type has no effect:
-
-.. code-block:: pycon
-
- >>> m = MyClass()
- >>> m.contents = [5, 6]
- >>> print(m.contents)
- [5, 6]
- >>> m.contents.append(7)
- >>> print(m.contents)
- [5, 6]
-
-Finally, the involved copy operations can be costly when dealing with very
-large lists. To deal with all of the above situations, pybind11 provides a
-macro named ``PYBIND11_MAKE_OPAQUE(T)`` that disables the template-based
-conversion machinery of types, thus rendering them *opaque*. The contents of
-opaque objects are never inspected or extracted, hence they *can* be passed by
-reference. For instance, to turn ``std::vector<int>`` into an opaque type, add
-the declaration
-
-.. code-block:: cpp
-
- PYBIND11_MAKE_OPAQUE(std::vector<int>);
-
-before any binding code (e.g. invocations to ``class_::def()``, etc.). This
-macro must be specified at the top level (and outside of any namespaces), since
-it adds a template instantiation of ``type_caster``. If your binding code consists of
-multiple compilation units, it must be present in every file (typically via a
-common header) preceding any usage of ``std::vector<int>``. Opaque types must
-also have a corresponding ``class_`` declaration to associate them with a name
-in Python, and to define a set of available operations, e.g.:
-
-.. code-block:: cpp
-
- py::class_<std::vector<int>>(m, "IntVector")
- .def(py::init<>())
- .def("clear", &std::vector<int>::clear)
- .def("pop_back", &std::vector<int>::pop_back)
- .def("__len__", [](const std::vector<int> &v) { return v.size(); })
- .def("__iter__", [](std::vector<int> &v) {
- return py::make_iterator(v.begin(), v.end());
- }, py::keep_alive<0, 1>()) /* Keep vector alive while iterator is used */
- // ....
-
-.. seealso::
-
- The file :file:`tests/test_opaque_types.cpp` contains a complete
- example that demonstrates how to create and expose opaque types using
- pybind11 in more detail.
-
-.. _stl_bind:
-
-Binding STL containers
-======================
-
-The ability to expose STL containers as native Python objects is a fairly
-common request, hence pybind11 also provides an optional header file named
-:file:`pybind11/stl_bind.h` that does exactly this. The mapped containers try
-to match the behavior of their native Python counterparts as much as possible.
-
-The following example showcases usage of :file:`pybind11/stl_bind.h`:
-
-.. code-block:: cpp
-
- // Don't forget this
- #include <pybind11/stl_bind.h>
-
- PYBIND11_MAKE_OPAQUE(std::vector<int>);
- PYBIND11_MAKE_OPAQUE(std::map<std::string, double>);
-
- // ...
-
- // later in binding code:
- py::bind_vector<std::vector<int>>(m, "VectorInt");
- py::bind_map<std::map<std::string, double>>(m, "MapStringDouble");
-
-When binding STL containers pybind11 considers the types of the container's
-elements to decide whether the container should be confined to the local module
-(via the :ref:`module_local` feature). If the container element types are
-anything other than already-bound custom types bound without
-``py::module_local()`` the container binding will have ``py::module_local()``
-applied. This includes converting types such as numeric types, strings, Eigen
-types; and types that have not yet been bound at the time of the stl container
-binding. This module-local binding is designed to avoid potential conflicts
-between module bindings (for example, from two separate modules each attempting
-to bind ``std::vector<int>`` as a python type).
-
-It is possible to override this behavior to force a definition to be either
-module-local or global. To do so, you can pass the attributes
-``py::module_local()`` (to make the binding module-local) or
-``py::module_local(false)`` (to make the binding global) into the
-``py::bind_vector`` or ``py::bind_map`` arguments:
-
-.. code-block:: cpp
-
- py::bind_vector<std::vector<int>>(m, "VectorInt", py::module_local(false));
-
-Note, however, that such a global binding would make it impossible to load this
-module at the same time as any other pybind module that also attempts to bind
-the same container type (``std::vector<int>`` in the above example).
-
-See :ref:`module_local` for more details on module-local bindings.
-
-.. seealso::
-
- The file :file:`tests/test_stl_binders.cpp` shows how to use the
- convenience STL container wrappers.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/strings.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/strings.rst
deleted file mode 100644
index e25701ecabd80142f4fd705f5419ef7c10cc6c56..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/cast/strings.rst
+++ /dev/null
@@ -1,305 +0,0 @@
-Strings, bytes and Unicode conversions
-######################################
-
-.. note::
-
- This section discusses string handling in terms of Python 3 strings. For
- Python 2.7, replace all occurrences of ``str`` with ``unicode`` and
- ``bytes`` with ``str``. Python 2.7 users may find it best to use ``from
- __future__ import unicode_literals`` to avoid unintentionally using ``str``
- instead of ``unicode``.
-
-Passing Python strings to C++
-=============================
-
-When a Python ``str`` is passed from Python to a C++ function that accepts
-``std::string`` or ``char *`` as arguments, pybind11 will encode the Python
-string to UTF-8. All Python ``str`` can be encoded in UTF-8, so this operation
-does not fail.
-
-The C++ language is encoding agnostic. It is the responsibility of the
-programmer to track encodings. It's often easiest to simply `use UTF-8
-everywhere <http://utf8everywhere.org/>`_.
-
-.. code-block:: c++
-
- m.def("utf8_test",
- [](const std::string &s) {
- cout << "utf-8 is icing on the cake.\n";
- cout << s;
- }
- );
- m.def("utf8_charptr",
- [](const char *s) {
- cout << "My favorite food is\n";
- cout << s;
- }
- );
-
-.. code-block:: python
-
- >>> utf8_test('🎂')
- utf-8 is icing on the cake.
- 🎂
-
- >>> utf8_charptr('ðŸ•')
- My favorite food is
- ðŸ•
-
-.. note::
-
- Some terminal emulators do not support UTF-8 or emoji fonts and may not
- display the example above correctly.
-
-The results are the same whether the C++ function accepts arguments by value or
-reference, and whether or not ``const`` is used.
-
-Passing bytes to C++
---------------------
-
-A Python ``bytes`` object will be passed to C++ functions that accept
-``std::string`` or ``char*`` *without* conversion. On Python 3, in order to
-make a function *only* accept ``bytes`` (and not ``str``), declare it as taking
-a ``py::bytes`` argument.
-
-
-Returning C++ strings to Python
-===============================
-
-When a C++ function returns a ``std::string`` or ``char*`` to a Python caller,
-**pybind11 will assume that the string is valid UTF-8** and will decode it to a
-native Python ``str``, using the same API as Python uses to perform
-``bytes.decode('utf-8')``. If this implicit conversion fails, pybind11 will
-raise a ``UnicodeDecodeError``.
-
-.. code-block:: c++
-
- m.def("std_string_return",
- []() {
- return std::string("This string needs to be UTF-8 encoded");
- }
- );
-
-.. code-block:: python
-
- >>> isinstance(example.std_string_return(), str)
- True
-
-
-Because UTF-8 is inclusive of pure ASCII, there is never any issue with
-returning a pure ASCII string to Python. If there is any possibility that the
-string is not pure ASCII, it is necessary to ensure the encoding is valid
-UTF-8.
-
-.. warning::
-
- Implicit conversion assumes that a returned ``char *`` is null-terminated.
- If there is no null terminator a buffer overrun will occur.
-
-Explicit conversions
---------------------
-
-If some C++ code constructs a ``std::string`` that is not a UTF-8 string, one
-can perform a explicit conversion and return a ``py::str`` object. Explicit
-conversion has the same overhead as implicit conversion.
-
-.. code-block:: c++
-
- // This uses the Python C API to convert Latin-1 to Unicode
- m.def("str_output",
- []() {
- std::string s = "Send your r\xe9sum\xe9 to Alice in HR"; // Latin-1
- py::str py_s = PyUnicode_DecodeLatin1(s.data(), s.length());
- return py_s;
- }
- );
-
-.. code-block:: python
-
- >>> str_output()
- 'Send your résumé to Alice in HR'
-
-The `Python C API
-<https://docs.python.org/3/c-api/unicode.html#built-in-codecs>`_ provides
-several built-in codecs.
-
-
-One could also use a third party encoding library such as libiconv to transcode
-to UTF-8.
-
-Return C++ strings without conversion
--------------------------------------
-
-If the data in a C++ ``std::string`` does not represent text and should be
-returned to Python as ``bytes``, then one can return the data as a
-``py::bytes`` object.
-
-.. code-block:: c++
-
- m.def("return_bytes",
- []() {
- std::string s("\xba\xd0\xba\xd0"); // Not valid UTF-8
- return py::bytes(s); // Return the data without transcoding
- }
- );
-
-.. code-block:: python
-
- >>> example.return_bytes()
- b'\xba\xd0\xba\xd0'
-
-
-Note the asymmetry: pybind11 will convert ``bytes`` to ``std::string`` without
-encoding, but cannot convert ``std::string`` back to ``bytes`` implicitly.
-
-.. code-block:: c++
-
- m.def("asymmetry",
- [](std::string s) { // Accepts str or bytes from Python
- return s; // Looks harmless, but implicitly converts to str
- }
- );
-
-.. code-block:: python
-
- >>> isinstance(example.asymmetry(b"have some bytes"), str)
- True
-
- >>> example.asymmetry(b"\xba\xd0\xba\xd0") # invalid utf-8 as bytes
- UnicodeDecodeError: 'utf-8' codec can't decode byte 0xba in position 0: invalid start byte
-
-
-Wide character strings
-======================
-
-When a Python ``str`` is passed to a C++ function expecting ``std::wstring``,
-``wchar_t*``, ``std::u16string`` or ``std::u32string``, the ``str`` will be
-encoded to UTF-16 or UTF-32 depending on how the C++ compiler implements each
-type, in the platform's native endianness. When strings of these types are
-returned, they are assumed to contain valid UTF-16 or UTF-32, and will be
-decoded to Python ``str``.
-
-.. code-block:: c++
-
- #define UNICODE
- #include <windows.h>
-
- m.def("set_window_text",
- [](HWND hwnd, std::wstring s) {
- // Call SetWindowText with null-terminated UTF-16 string
- ::SetWindowText(hwnd, s.c_str());
- }
- );
- m.def("get_window_text",
- [](HWND hwnd) {
- const int buffer_size = ::GetWindowTextLength(hwnd) + 1;
- auto buffer = std::make_unique< wchar_t[] >(buffer_size);
-
- ::GetWindowText(hwnd, buffer.data(), buffer_size);
-
- std::wstring text(buffer.get());
-
- // wstring will be converted to Python str
- return text;
- }
- );
-
-.. warning::
-
- Wide character strings may not work as described on Python 2.7 or Python
- 3.3 compiled with ``--enable-unicode=ucs2``.
-
-Strings in multibyte encodings such as Shift-JIS must transcoded to a
-UTF-8/16/32 before being returned to Python.
-
-
-Character literals
-==================
-
-C++ functions that accept character literals as input will receive the first
-character of a Python ``str`` as their input. If the string is longer than one
-Unicode character, trailing characters will be ignored.
-
-When a character literal is returned from C++ (such as a ``char`` or a
-``wchar_t``), it will be converted to a ``str`` that represents the single
-character.
-
-.. code-block:: c++
-
- m.def("pass_char", [](char c) { return c; });
- m.def("pass_wchar", [](wchar_t w) { return w; });
-
-.. code-block:: python
-
- >>> example.pass_char('A')
- 'A'
-
-While C++ will cast integers to character types (``char c = 0x65;``), pybind11
-does not convert Python integers to characters implicitly. The Python function
-``chr()`` can be used to convert integers to characters.
-
-.. code-block:: python
-
- >>> example.pass_char(0x65)
- TypeError
-
- >>> example.pass_char(chr(0x65))
- 'A'
-
-If the desire is to work with an 8-bit integer, use ``int8_t`` or ``uint8_t``
-as the argument type.
-
-Grapheme clusters
------------------
-
-A single grapheme may be represented by two or more Unicode characters. For
-example 'é' is usually represented as U+00E9 but can also be expressed as the
-combining character sequence U+0065 U+0301 (that is, the letter 'e' followed by
-a combining acute accent). The combining character will be lost if the
-two-character sequence is passed as an argument, even though it renders as a
-single grapheme.
-
-.. code-block:: python
-
- >>> example.pass_wchar('é')
- 'é'
-
- >>> combining_e_acute = 'e' + '\u0301'
-
- >>> combining_e_acute
- 'eÌ'
-
- >>> combining_e_acute == 'é'
- False
-
- >>> example.pass_wchar(combining_e_acute)
- 'e'
-
-Normalizing combining characters before passing the character literal to C++
-may resolve *some* of these issues:
-
-.. code-block:: python
-
- >>> example.pass_wchar(unicodedata.normalize('NFC', combining_e_acute))
- 'é'
-
-In some languages (Thai for example), there are `graphemes that cannot be
-expressed as a single Unicode code point
-<http://unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries>`_, so there is
-no way to capture them in a C++ character type.
-
-
-C++17 string views
-==================
-
-C++17 string views are automatically supported when compiling in C++17 mode.
-They follow the same rules for encoding and decoding as the corresponding STL
-string type (for example, a ``std::u16string_view`` argument will be passed
-UTF-16-encoded data, and a returned ``std::string_view`` will be decoded as
-UTF-8).
-
-References
-==========
-
-* `The Absolute Minimum Every Software Developer Absolutely, Positively Must Know About Unicode and Character Sets (No Excuses!) <https://www.joelonsoftware.com/2003/10/08/the-absolute-minimum-every-software-developer-absolutely-positively-must-know-about-unicode-and-character-sets-no-excuses/>`_
-* `C++ - Using STL Strings at Win32 API Boundaries <https://msdn.microsoft.com/en-ca/magazine/mt238407.aspx>`_
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/classes.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/classes.rst
deleted file mode 100644
index 49279020694704249a718d5acf3827fb806ef05a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/classes.rst
+++ /dev/null
@@ -1,1261 +0,0 @@
-Classes
-#######
-
-This section presents advanced binding code for classes and it is assumed
-that you are already familiar with the basics from :doc:`/classes`.
-
-.. _overriding_virtuals:
-
-Overriding virtual functions in Python
-======================================
-
-Suppose that a C++ class or interface has a virtual function that we'd like to
-to override from within Python (we'll focus on the class ``Animal``; ``Dog`` is
-given as a specific example of how one would do this with traditional C++
-code).
-
-.. code-block:: cpp
-
- class Animal {
- public:
- virtual ~Animal() { }
- virtual std::string go(int n_times) = 0;
- };
-
- class Dog : public Animal {
- public:
- std::string go(int n_times) override {
- std::string result;
- for (int i=0; i<n_times; ++i)
- result += "woof! ";
- return result;
- }
- };
-
-Let's also suppose that we are given a plain function which calls the
-function ``go()`` on an arbitrary ``Animal`` instance.
-
-.. code-block:: cpp
-
- std::string call_go(Animal *animal) {
- return animal->go(3);
- }
-
-Normally, the binding code for these classes would look as follows:
-
-.. code-block:: cpp
-
- PYBIND11_MODULE(example, m) {
- py::class_<Animal>(m, "Animal")
- .def("go", &Animal::go);
-
- py::class_<Dog, Animal>(m, "Dog")
- .def(py::init<>());
-
- m.def("call_go", &call_go);
- }
-
-However, these bindings are impossible to extend: ``Animal`` is not
-constructible, and we clearly require some kind of "trampoline" that
-redirects virtual calls back to Python.
-
-Defining a new type of ``Animal`` from within Python is possible but requires a
-helper class that is defined as follows:
-
-.. code-block:: cpp
-
- class PyAnimal : public Animal {
- public:
- /* Inherit the constructors */
- using Animal::Animal;
-
- /* Trampoline (need one for each virtual function) */
- std::string go(int n_times) override {
- PYBIND11_OVERRIDE_PURE(
- std::string, /* Return type */
- Animal, /* Parent class */
- go, /* Name of function in C++ (must match Python name) */
- n_times /* Argument(s) */
- );
- }
- };
-
-The macro :c:macro:`PYBIND11_OVERRIDE_PURE` should be used for pure virtual
-functions, and :c:macro:`PYBIND11_OVERRIDE` should be used for functions which have
-a default implementation. There are also two alternate macros
-:c:macro:`PYBIND11_OVERRIDE_PURE_NAME` and :c:macro:`PYBIND11_OVERRIDE_NAME` which
-take a string-valued name argument between the *Parent class* and *Name of the
-function* slots, which defines the name of function in Python. This is required
-when the C++ and Python versions of the
-function have different names, e.g. ``operator()`` vs ``__call__``.
-
-The binding code also needs a few minor adaptations (highlighted):
-
-.. code-block:: cpp
- :emphasize-lines: 2,3
-
- PYBIND11_MODULE(example, m) {
- py::class_<Animal, PyAnimal /* <--- trampoline*/>(m, "Animal")
- .def(py::init<>())
- .def("go", &Animal::go);
-
- py::class_<Dog, Animal>(m, "Dog")
- .def(py::init<>());
-
- m.def("call_go", &call_go);
- }
-
-Importantly, pybind11 is made aware of the trampoline helper class by
-specifying it as an extra template argument to :class:`class_`. (This can also
-be combined with other template arguments such as a custom holder type; the
-order of template types does not matter). Following this, we are able to
-define a constructor as usual.
-
-Bindings should be made against the actual class, not the trampoline helper class.
-
-.. code-block:: cpp
- :emphasize-lines: 3
-
- py::class_<Animal, PyAnimal /* <--- trampoline*/>(m, "Animal");
- .def(py::init<>())
- .def("go", &PyAnimal::go); /* <--- THIS IS WRONG, use &Animal::go */
-
-Note, however, that the above is sufficient for allowing python classes to
-extend ``Animal``, but not ``Dog``: see :ref:`virtual_and_inheritance` for the
-necessary steps required to providing proper overriding support for inherited
-classes.
-
-The Python session below shows how to override ``Animal::go`` and invoke it via
-a virtual method call.
-
-.. code-block:: pycon
-
- >>> from example import *
- >>> d = Dog()
- >>> call_go(d)
- u'woof! woof! woof! '
- >>> class Cat(Animal):
- ... def go(self, n_times):
- ... return "meow! " * n_times
- ...
- >>> c = Cat()
- >>> call_go(c)
- u'meow! meow! meow! '
-
-If you are defining a custom constructor in a derived Python class, you *must*
-ensure that you explicitly call the bound C++ constructor using ``__init__``,
-*regardless* of whether it is a default constructor or not. Otherwise, the
-memory for the C++ portion of the instance will be left uninitialized, which
-will generally leave the C++ instance in an invalid state and cause undefined
-behavior if the C++ instance is subsequently used.
-
-.. versionchanged:: 2.6
- The default pybind11 metaclass will throw a ``TypeError`` when it detects
- that ``__init__`` was not called by a derived class.
-
-Here is an example:
-
-.. code-block:: python
-
- class Dachshund(Dog):
- def __init__(self, name):
- Dog.__init__(self) # Without this, a TypeError is raised.
- self.name = name
- def bark(self):
- return "yap!"
-
-Note that a direct ``__init__`` constructor *should be called*, and ``super()``
-should not be used. For simple cases of linear inheritance, ``super()``
-may work, but once you begin mixing Python and C++ multiple inheritance,
-things will fall apart due to differences between Python's MRO and C++'s
-mechanisms.
-
-Please take a look at the :ref:`macro_notes` before using this feature.
-
-.. note::
-
- When the overridden type returns a reference or pointer to a type that
- pybind11 converts from Python (for example, numeric values, std::string,
- and other built-in value-converting types), there are some limitations to
- be aware of:
-
- - because in these cases there is no C++ variable to reference (the value
- is stored in the referenced Python variable), pybind11 provides one in
- the PYBIND11_OVERRIDE macros (when needed) with static storage duration.
- Note that this means that invoking the overridden method on *any*
- instance will change the referenced value stored in *all* instances of
- that type.
-
- - Attempts to modify a non-const reference will not have the desired
- effect: it will change only the static cache variable, but this change
- will not propagate to underlying Python instance, and the change will be
- replaced the next time the override is invoked.
-
-.. warning::
-
- The :c:macro:`PYBIND11_OVERRIDE` and accompanying macros used to be called
- ``PYBIND11_OVERLOAD`` up until pybind11 v2.5.0, and :func:`get_override`
- used to be called ``get_overload``. This naming was corrected and the older
- macro and function names may soon be deprecated, in order to reduce
- confusion with overloaded functions and methods and ``py::overload_cast``
- (see :ref:`classes`).
-
-.. seealso::
-
- The file :file:`tests/test_virtual_functions.cpp` contains a complete
- example that demonstrates how to override virtual functions using pybind11
- in more detail.
-
-.. _virtual_and_inheritance:
-
-Combining virtual functions and inheritance
-===========================================
-
-When combining virtual methods with inheritance, you need to be sure to provide
-an override for each method for which you want to allow overrides from derived
-python classes. For example, suppose we extend the above ``Animal``/``Dog``
-example as follows:
-
-.. code-block:: cpp
-
- class Animal {
- public:
- virtual std::string go(int n_times) = 0;
- virtual std::string name() { return "unknown"; }
- };
- class Dog : public Animal {
- public:
- std::string go(int n_times) override {
- std::string result;
- for (int i=0; i<n_times; ++i)
- result += bark() + " ";
- return result;
- }
- virtual std::string bark() { return "woof!"; }
- };
-
-then the trampoline class for ``Animal`` must, as described in the previous
-section, override ``go()`` and ``name()``, but in order to allow python code to
-inherit properly from ``Dog``, we also need a trampoline class for ``Dog`` that
-overrides both the added ``bark()`` method *and* the ``go()`` and ``name()``
-methods inherited from ``Animal`` (even though ``Dog`` doesn't directly
-override the ``name()`` method):
-
-.. code-block:: cpp
-
- class PyAnimal : public Animal {
- public:
- using Animal::Animal; // Inherit constructors
- std::string go(int n_times) override { PYBIND11_OVERRIDE_PURE(std::string, Animal, go, n_times); }
- std::string name() override { PYBIND11_OVERRIDE(std::string, Animal, name, ); }
- };
- class PyDog : public Dog {
- public:
- using Dog::Dog; // Inherit constructors
- std::string go(int n_times) override { PYBIND11_OVERRIDE(std::string, Dog, go, n_times); }
- std::string name() override { PYBIND11_OVERRIDE(std::string, Dog, name, ); }
- std::string bark() override { PYBIND11_OVERRIDE(std::string, Dog, bark, ); }
- };
-
-.. note::
-
- Note the trailing commas in the ``PYBIND11_OVERIDE`` calls to ``name()``
- and ``bark()``. These are needed to portably implement a trampoline for a
- function that does not take any arguments. For functions that take
- a nonzero number of arguments, the trailing comma must be omitted.
-
-A registered class derived from a pybind11-registered class with virtual
-methods requires a similar trampoline class, *even if* it doesn't explicitly
-declare or override any virtual methods itself:
-
-.. code-block:: cpp
-
- class Husky : public Dog {};
- class PyHusky : public Husky {
- public:
- using Husky::Husky; // Inherit constructors
- std::string go(int n_times) override { PYBIND11_OVERRIDE_PURE(std::string, Husky, go, n_times); }
- std::string name() override { PYBIND11_OVERRIDE(std::string, Husky, name, ); }
- std::string bark() override { PYBIND11_OVERRIDE(std::string, Husky, bark, ); }
- };
-
-There is, however, a technique that can be used to avoid this duplication
-(which can be especially helpful for a base class with several virtual
-methods). The technique involves using template trampoline classes, as
-follows:
-
-.. code-block:: cpp
-
- template <class AnimalBase = Animal> class PyAnimal : public AnimalBase {
- public:
- using AnimalBase::AnimalBase; // Inherit constructors
- std::string go(int n_times) override { PYBIND11_OVERRIDE_PURE(std::string, AnimalBase, go, n_times); }
- std::string name() override { PYBIND11_OVERRIDE(std::string, AnimalBase, name, ); }
- };
- template <class DogBase = Dog> class PyDog : public PyAnimal<DogBase> {
- public:
- using PyAnimal<DogBase>::PyAnimal; // Inherit constructors
- // Override PyAnimal's pure virtual go() with a non-pure one:
- std::string go(int n_times) override { PYBIND11_OVERRIDE(std::string, DogBase, go, n_times); }
- std::string bark() override { PYBIND11_OVERRIDE(std::string, DogBase, bark, ); }
- };
-
-This technique has the advantage of requiring just one trampoline method to be
-declared per virtual method and pure virtual method override. It does,
-however, require the compiler to generate at least as many methods (and
-possibly more, if both pure virtual and overridden pure virtual methods are
-exposed, as above).
-
-The classes are then registered with pybind11 using:
-
-.. code-block:: cpp
-
- py::class_<Animal, PyAnimal<>> animal(m, "Animal");
- py::class_<Dog, Animal, PyDog<>> dog(m, "Dog");
- py::class_<Husky, Dog, PyDog<Husky>> husky(m, "Husky");
- // ... add animal, dog, husky definitions
-
-Note that ``Husky`` did not require a dedicated trampoline template class at
-all, since it neither declares any new virtual methods nor provides any pure
-virtual method implementations.
-
-With either the repeated-virtuals or templated trampoline methods in place, you
-can now create a python class that inherits from ``Dog``:
-
-.. code-block:: python
-
- class ShihTzu(Dog):
- def bark(self):
- return "yip!"
-
-.. seealso::
-
- See the file :file:`tests/test_virtual_functions.cpp` for complete examples
- using both the duplication and templated trampoline approaches.
-
-.. _extended_aliases:
-
-Extended trampoline class functionality
-=======================================
-
-.. _extended_class_functionality_forced_trampoline:
-
-Forced trampoline class initialisation
---------------------------------------
-The trampoline classes described in the previous sections are, by default, only
-initialized when needed. More specifically, they are initialized when a python
-class actually inherits from a registered type (instead of merely creating an
-instance of the registered type), or when a registered constructor is only
-valid for the trampoline class but not the registered class. This is primarily
-for performance reasons: when the trampoline class is not needed for anything
-except virtual method dispatching, not initializing the trampoline class
-improves performance by avoiding needing to do a run-time check to see if the
-inheriting python instance has an overridden method.
-
-Sometimes, however, it is useful to always initialize a trampoline class as an
-intermediate class that does more than just handle virtual method dispatching.
-For example, such a class might perform extra class initialization, extra
-destruction operations, and might define new members and methods to enable a
-more python-like interface to a class.
-
-In order to tell pybind11 that it should *always* initialize the trampoline
-class when creating new instances of a type, the class constructors should be
-declared using ``py::init_alias<Args, ...>()`` instead of the usual
-``py::init<Args, ...>()``. This forces construction via the trampoline class,
-ensuring member initialization and (eventual) destruction.
-
-.. seealso::
-
- See the file :file:`tests/test_virtual_functions.cpp` for complete examples
- showing both normal and forced trampoline instantiation.
-
-Different method signatures
----------------------------
-The macro's introduced in :ref:`overriding_virtuals` cover most of the standard
-use cases when exposing C++ classes to Python. Sometimes it is hard or unwieldy
-to create a direct one-on-one mapping between the arguments and method return
-type.
-
-An example would be when the C++ signature contains output arguments using
-references (See also :ref:`faq_reference_arguments`). Another way of solving
-this is to use the method body of the trampoline class to do conversions to the
-input and return of the Python method.
-
-The main building block to do so is the :func:`get_override`, this function
-allows retrieving a method implemented in Python from within the trampoline's
-methods. Consider for example a C++ method which has the signature
-``bool myMethod(int32_t& value)``, where the return indicates whether
-something should be done with the ``value``. This can be made convenient on the
-Python side by allowing the Python function to return ``None`` or an ``int``:
-
-.. code-block:: cpp
-
- bool MyClass::myMethod(int32_t& value)
- {
- pybind11::gil_scoped_acquire gil; // Acquire the GIL while in this scope.
- // Try to look up the overridden method on the Python side.
- pybind11::function override = pybind11::get_override(this, "myMethod");
- if (override) { // method is found
- auto obj = override(value); // Call the Python function.
- if (py::isinstance<py::int_>(obj)) { // check if it returned a Python integer type
- value = obj.cast<int32_t>(); // Cast it and assign it to the value.
- return true; // Return true; value should be used.
- } else {
- return false; // Python returned none, return false.
- }
- }
- return false; // Alternatively return MyClass::myMethod(value);
- }
-
-
-.. _custom_constructors:
-
-Custom constructors
-===================
-
-The syntax for binding constructors was previously introduced, but it only
-works when a constructor of the appropriate arguments actually exists on the
-C++ side. To extend this to more general cases, pybind11 makes it possible
-to bind factory functions as constructors. For example, suppose you have a
-class like this:
-
-.. code-block:: cpp
-
- class Example {
- private:
- Example(int); // private constructor
- public:
- // Factory function:
- static Example create(int a) { return Example(a); }
- };
-
- py::class_<Example>(m, "Example")
- .def(py::init(&Example::create));
-
-While it is possible to create a straightforward binding of the static
-``create`` method, it may sometimes be preferable to expose it as a constructor
-on the Python side. This can be accomplished by calling ``.def(py::init(...))``
-with the function reference returning the new instance passed as an argument.
-It is also possible to use this approach to bind a function returning a new
-instance by raw pointer or by the holder (e.g. ``std::unique_ptr``).
-
-The following example shows the different approaches:
-
-.. code-block:: cpp
-
- class Example {
- private:
- Example(int); // private constructor
- public:
- // Factory function - returned by value:
- static Example create(int a) { return Example(a); }
-
- // These constructors are publicly callable:
- Example(double);
- Example(int, int);
- Example(std::string);
- };
-
- py::class_<Example>(m, "Example")
- // Bind the factory function as a constructor:
- .def(py::init(&Example::create))
- // Bind a lambda function returning a pointer wrapped in a holder:
- .def(py::init([](std::string arg) {
- return std::unique_ptr<Example>(new Example(arg));
- }))
- // Return a raw pointer:
- .def(py::init([](int a, int b) { return new Example(a, b); }))
- // You can mix the above with regular C++ constructor bindings as well:
- .def(py::init<double>())
- ;
-
-When the constructor is invoked from Python, pybind11 will call the factory
-function and store the resulting C++ instance in the Python instance.
-
-When combining factory functions constructors with :ref:`virtual function
-trampolines <overriding_virtuals>` there are two approaches. The first is to
-add a constructor to the alias class that takes a base value by
-rvalue-reference. If such a constructor is available, it will be used to
-construct an alias instance from the value returned by the factory function.
-The second option is to provide two factory functions to ``py::init()``: the
-first will be invoked when no alias class is required (i.e. when the class is
-being used but not inherited from in Python), and the second will be invoked
-when an alias is required.
-
-You can also specify a single factory function that always returns an alias
-instance: this will result in behaviour similar to ``py::init_alias<...>()``,
-as described in the :ref:`extended trampoline class documentation
-<extended_aliases>`.
-
-The following example shows the different factory approaches for a class with
-an alias:
-
-.. code-block:: cpp
-
- #include <pybind11/factory.h>
- class Example {
- public:
- // ...
- virtual ~Example() = default;
- };
- class PyExample : public Example {
- public:
- using Example::Example;
- PyExample(Example &&base) : Example(std::move(base)) {}
- };
- py::class_<Example, PyExample>(m, "Example")
- // Returns an Example pointer. If a PyExample is needed, the Example
- // instance will be moved via the extra constructor in PyExample, above.
- .def(py::init([]() { return new Example(); }))
- // Two callbacks:
- .def(py::init([]() { return new Example(); } /* no alias needed */,
- []() { return new PyExample(); } /* alias needed */))
- // *Always* returns an alias instance (like py::init_alias<>())
- .def(py::init([]() { return new PyExample(); }))
- ;
-
-Brace initialization
---------------------
-
-``pybind11::init<>`` internally uses C++11 brace initialization to call the
-constructor of the target class. This means that it can be used to bind
-*implicit* constructors as well:
-
-.. code-block:: cpp
-
- struct Aggregate {
- int a;
- std::string b;
- };
-
- py::class_<Aggregate>(m, "Aggregate")
- .def(py::init<int, const std::string &>());
-
-.. note::
-
- Note that brace initialization preferentially invokes constructor overloads
- taking a ``std::initializer_list``. In the rare event that this causes an
- issue, you can work around it by using ``py::init(...)`` with a lambda
- function that constructs the new object as desired.
-
-.. _classes_with_non_public_destructors:
-
-Non-public destructors
-======================
-
-If a class has a private or protected destructor (as might e.g. be the case in
-a singleton pattern), a compile error will occur when creating bindings via
-pybind11. The underlying issue is that the ``std::unique_ptr`` holder type that
-is responsible for managing the lifetime of instances will reference the
-destructor even if no deallocations ever take place. In order to expose classes
-with private or protected destructors, it is possible to override the holder
-type via a holder type argument to ``class_``. Pybind11 provides a helper class
-``py::nodelete`` that disables any destructor invocations. In this case, it is
-crucial that instances are deallocated on the C++ side to avoid memory leaks.
-
-.. code-block:: cpp
-
- /* ... definition ... */
-
- class MyClass {
- private:
- ~MyClass() { }
- };
-
- /* ... binding code ... */
-
- py::class_<MyClass, std::unique_ptr<MyClass, py::nodelete>>(m, "MyClass")
- .def(py::init<>())
-
-.. _destructors_that_call_python:
-
-Destructors that call Python
-============================
-
-If a Python function is invoked from a C++ destructor, an exception may be thrown
-of type :class:`error_already_set`. If this error is thrown out of a class destructor,
-``std::terminate()`` will be called, terminating the process. Class destructors
-must catch all exceptions of type :class:`error_already_set` to discard the Python
-exception using :func:`error_already_set::discard_as_unraisable`.
-
-Every Python function should be treated as *possibly throwing*. When a Python generator
-stops yielding items, Python will throw a ``StopIteration`` exception, which can pass
-though C++ destructors if the generator's stack frame holds the last reference to C++
-objects.
-
-For more information, see :ref:`the documentation on exceptions <unraisable_exceptions>`.
-
-.. code-block:: cpp
-
- class MyClass {
- public:
- ~MyClass() {
- try {
- py::print("Even printing is dangerous in a destructor");
- py::exec("raise ValueError('This is an unraisable exception')");
- } catch (py::error_already_set &e) {
- // error_context should be information about where/why the occurred,
- // e.g. use __func__ to get the name of the current function
- e.discard_as_unraisable(__func__);
- }
- }
- };
-
-.. note::
-
- pybind11 does not support C++ destructors marked ``noexcept(false)``.
-
-.. versionadded:: 2.6
-
-.. _implicit_conversions:
-
-Implicit conversions
-====================
-
-Suppose that instances of two types ``A`` and ``B`` are used in a project, and
-that an ``A`` can easily be converted into an instance of type ``B`` (examples of this
-could be a fixed and an arbitrary precision number type).
-
-.. code-block:: cpp
-
- py::class_<A>(m, "A")
- /// ... members ...
-
- py::class_<B>(m, "B")
- .def(py::init<A>())
- /// ... members ...
-
- m.def("func",
- [](const B &) { /* .... */ }
- );
-
-To invoke the function ``func`` using a variable ``a`` containing an ``A``
-instance, we'd have to write ``func(B(a))`` in Python. On the other hand, C++
-will automatically apply an implicit type conversion, which makes it possible
-to directly write ``func(a)``.
-
-In this situation (i.e. where ``B`` has a constructor that converts from
-``A``), the following statement enables similar implicit conversions on the
-Python side:
-
-.. code-block:: cpp
-
- py::implicitly_convertible<A, B>();
-
-.. note::
-
- Implicit conversions from ``A`` to ``B`` only work when ``B`` is a custom
- data type that is exposed to Python via pybind11.
-
- To prevent runaway recursion, implicit conversions are non-reentrant: an
- implicit conversion invoked as part of another implicit conversion of the
- same type (i.e. from ``A`` to ``B``) will fail.
-
-.. _static_properties:
-
-Static properties
-=================
-
-The section on :ref:`properties` discussed the creation of instance properties
-that are implemented in terms of C++ getters and setters.
-
-Static properties can also be created in a similar way to expose getters and
-setters of static class attributes. Note that the implicit ``self`` argument
-also exists in this case and is used to pass the Python ``type`` subclass
-instance. This parameter will often not be needed by the C++ side, and the
-following example illustrates how to instantiate a lambda getter function
-that ignores it:
-
-.. code-block:: cpp
-
- py::class_<Foo>(m, "Foo")
- .def_property_readonly_static("foo", [](py::object /* self */) { return Foo(); });
-
-Operator overloading
-====================
-
-Suppose that we're given the following ``Vector2`` class with a vector addition
-and scalar multiplication operation, all implemented using overloaded operators
-in C++.
-
-.. code-block:: cpp
-
- class Vector2 {
- public:
- Vector2(float x, float y) : x(x), y(y) { }
-
- Vector2 operator+(const Vector2 &v) const { return Vector2(x + v.x, y + v.y); }
- Vector2 operator*(float value) const { return Vector2(x * value, y * value); }
- Vector2& operator+=(const Vector2 &v) { x += v.x; y += v.y; return *this; }
- Vector2& operator*=(float v) { x *= v; y *= v; return *this; }
-
- friend Vector2 operator*(float f, const Vector2 &v) {
- return Vector2(f * v.x, f * v.y);
- }
-
- std::string toString() const {
- return "[" + std::to_string(x) + ", " + std::to_string(y) + "]";
- }
- private:
- float x, y;
- };
-
-The following snippet shows how the above operators can be conveniently exposed
-to Python.
-
-.. code-block:: cpp
-
- #include <pybind11/operators.h>
-
- PYBIND11_MODULE(example, m) {
- py::class_<Vector2>(m, "Vector2")
- .def(py::init<float, float>())
- .def(py::self + py::self)
- .def(py::self += py::self)
- .def(py::self *= float())
- .def(float() * py::self)
- .def(py::self * float())
- .def(-py::self)
- .def("__repr__", &Vector2::toString);
- }
-
-Note that a line like
-
-.. code-block:: cpp
-
- .def(py::self * float())
-
-is really just short hand notation for
-
-.. code-block:: cpp
-
- .def("__mul__", [](const Vector2 &a, float b) {
- return a * b;
- }, py::is_operator())
-
-This can be useful for exposing additional operators that don't exist on the
-C++ side, or to perform other types of customization. The ``py::is_operator``
-flag marker is needed to inform pybind11 that this is an operator, which
-returns ``NotImplemented`` when invoked with incompatible arguments rather than
-throwing a type error.
-
-.. note::
-
- To use the more convenient ``py::self`` notation, the additional
- header file :file:`pybind11/operators.h` must be included.
-
-.. seealso::
-
- The file :file:`tests/test_operator_overloading.cpp` contains a
- complete example that demonstrates how to work with overloaded operators in
- more detail.
-
-.. _pickling:
-
-Pickling support
-================
-
-Python's ``pickle`` module provides a powerful facility to serialize and
-de-serialize a Python object graph into a binary data stream. To pickle and
-unpickle C++ classes using pybind11, a ``py::pickle()`` definition must be
-provided. Suppose the class in question has the following signature:
-
-.. code-block:: cpp
-
- class Pickleable {
- public:
- Pickleable(const std::string &value) : m_value(value) { }
- const std::string &value() const { return m_value; }
-
- void setExtra(int extra) { m_extra = extra; }
- int extra() const { return m_extra; }
- private:
- std::string m_value;
- int m_extra = 0;
- };
-
-Pickling support in Python is enabled by defining the ``__setstate__`` and
-``__getstate__`` methods [#f3]_. For pybind11 classes, use ``py::pickle()``
-to bind these two functions:
-
-.. code-block:: cpp
-
- py::class_<Pickleable>(m, "Pickleable")
- .def(py::init<std::string>())
- .def("value", &Pickleable::value)
- .def("extra", &Pickleable::extra)
- .def("setExtra", &Pickleable::setExtra)
- .def(py::pickle(
- [](const Pickleable &p) { // __getstate__
- /* Return a tuple that fully encodes the state of the object */
- return py::make_tuple(p.value(), p.extra());
- },
- [](py::tuple t) { // __setstate__
- if (t.size() != 2)
- throw std::runtime_error("Invalid state!");
-
- /* Create a new C++ instance */
- Pickleable p(t[0].cast<std::string>());
-
- /* Assign any additional state */
- p.setExtra(t[1].cast<int>());
-
- return p;
- }
- ));
-
-The ``__setstate__`` part of the ``py::picke()`` definition follows the same
-rules as the single-argument version of ``py::init()``. The return type can be
-a value, pointer or holder type. See :ref:`custom_constructors` for details.
-
-An instance can now be pickled as follows:
-
-.. code-block:: python
-
- try:
- import cPickle as pickle # Use cPickle on Python 2.7
- except ImportError:
- import pickle
-
- p = Pickleable("test_value")
- p.setExtra(15)
- data = pickle.dumps(p, 2)
-
-
-.. note::
- Note that only the cPickle module is supported on Python 2.7.
-
- The second argument to ``dumps`` is also crucial: it selects the pickle
- protocol version 2, since the older version 1 is not supported. Newer
- versions are also fine—for instance, specify ``-1`` to always use the
- latest available version. Beware: failure to follow these instructions
- will cause important pybind11 memory allocation routines to be skipped
- during unpickling, which will likely lead to memory corruption and/or
- segmentation faults.
-
-.. seealso::
-
- The file :file:`tests/test_pickling.cpp` contains a complete example
- that demonstrates how to pickle and unpickle types using pybind11 in more
- detail.
-
-.. [#f3] http://docs.python.org/3/library/pickle.html#pickling-class-instances
-
-Deepcopy support
-================
-
-Python normally uses references in assignments. Sometimes a real copy is needed
-to prevent changing all copies. The ``copy`` module [#f5]_ provides these
-capabilities.
-
-On Python 3, a class with pickle support is automatically also (deep)copy
-compatible. However, performance can be improved by adding custom
-``__copy__`` and ``__deepcopy__`` methods. With Python 2.7, these custom methods
-are mandatory for (deep)copy compatibility, because pybind11 only supports
-cPickle.
-
-For simple classes (deep)copy can be enabled by using the copy constructor,
-which should look as follows:
-
-.. code-block:: cpp
-
- py::class_<Copyable>(m, "Copyable")
- .def("__copy__", [](const Copyable &self) {
- return Copyable(self);
- })
- .def("__deepcopy__", [](const Copyable &self, py::dict) {
- return Copyable(self);
- }, "memo"_a);
-
-.. note::
-
- Dynamic attributes will not be copied in this example.
-
-.. [#f5] https://docs.python.org/3/library/copy.html
-
-Multiple Inheritance
-====================
-
-pybind11 can create bindings for types that derive from multiple base types
-(aka. *multiple inheritance*). To do so, specify all bases in the template
-arguments of the ``class_`` declaration:
-
-.. code-block:: cpp
-
- py::class_<MyType, BaseType1, BaseType2, BaseType3>(m, "MyType")
- ...
-
-The base types can be specified in arbitrary order, and they can even be
-interspersed with alias types and holder types (discussed earlier in this
-document)---pybind11 will automatically find out which is which. The only
-requirement is that the first template argument is the type to be declared.
-
-It is also permitted to inherit multiply from exported C++ classes in Python,
-as well as inheriting from multiple Python and/or pybind11-exported classes.
-
-There is one caveat regarding the implementation of this feature:
-
-When only one base type is specified for a C++ type that actually has multiple
-bases, pybind11 will assume that it does not participate in multiple
-inheritance, which can lead to undefined behavior. In such cases, add the tag
-``multiple_inheritance`` to the class constructor:
-
-.. code-block:: cpp
-
- py::class_<MyType, BaseType2>(m, "MyType", py::multiple_inheritance());
-
-The tag is redundant and does not need to be specified when multiple base types
-are listed.
-
-.. _module_local:
-
-Module-local class bindings
-===========================
-
-When creating a binding for a class, pybind11 by default makes that binding
-"global" across modules. What this means is that a type defined in one module
-can be returned from any module resulting in the same Python type. For
-example, this allows the following:
-
-.. code-block:: cpp
-
- // In the module1.cpp binding code for module1:
- py::class_<Pet>(m, "Pet")
- .def(py::init<std::string>())
- .def_readonly("name", &Pet::name);
-
-.. code-block:: cpp
-
- // In the module2.cpp binding code for module2:
- m.def("create_pet", [](std::string name) { return new Pet(name); });
-
-.. code-block:: pycon
-
- >>> from module1 import Pet
- >>> from module2 import create_pet
- >>> pet1 = Pet("Kitty")
- >>> pet2 = create_pet("Doggy")
- >>> pet2.name()
- 'Doggy'
-
-When writing binding code for a library, this is usually desirable: this
-allows, for example, splitting up a complex library into multiple Python
-modules.
-
-In some cases, however, this can cause conflicts. For example, suppose two
-unrelated modules make use of an external C++ library and each provide custom
-bindings for one of that library's classes. This will result in an error when
-a Python program attempts to import both modules (directly or indirectly)
-because of conflicting definitions on the external type:
-
-.. code-block:: cpp
-
- // dogs.cpp
-
- // Binding for external library class:
- py::class<pets::Pet>(m, "Pet")
- .def("name", &pets::Pet::name);
-
- // Binding for local extension class:
- py::class<Dog, pets::Pet>(m, "Dog")
- .def(py::init<std::string>());
-
-.. code-block:: cpp
-
- // cats.cpp, in a completely separate project from the above dogs.cpp.
-
- // Binding for external library class:
- py::class<pets::Pet>(m, "Pet")
- .def("get_name", &pets::Pet::name);
-
- // Binding for local extending class:
- py::class<Cat, pets::Pet>(m, "Cat")
- .def(py::init<std::string>());
-
-.. code-block:: pycon
-
- >>> import cats
- >>> import dogs
- Traceback (most recent call last):
- File "<stdin>", line 1, in <module>
- ImportError: generic_type: type "Pet" is already registered!
-
-To get around this, you can tell pybind11 to keep the external class binding
-localized to the module by passing the ``py::module_local()`` attribute into
-the ``py::class_`` constructor:
-
-.. code-block:: cpp
-
- // Pet binding in dogs.cpp:
- py::class<pets::Pet>(m, "Pet", py::module_local())
- .def("name", &pets::Pet::name);
-
-.. code-block:: cpp
-
- // Pet binding in cats.cpp:
- py::class<pets::Pet>(m, "Pet", py::module_local())
- .def("get_name", &pets::Pet::name);
-
-This makes the Python-side ``dogs.Pet`` and ``cats.Pet`` into distinct classes,
-avoiding the conflict and allowing both modules to be loaded. C++ code in the
-``dogs`` module that casts or returns a ``Pet`` instance will result in a
-``dogs.Pet`` Python instance, while C++ code in the ``cats`` module will result
-in a ``cats.Pet`` Python instance.
-
-This does come with two caveats, however: First, external modules cannot return
-or cast a ``Pet`` instance to Python (unless they also provide their own local
-bindings). Second, from the Python point of view they are two distinct classes.
-
-Note that the locality only applies in the C++ -> Python direction. When
-passing such a ``py::module_local`` type into a C++ function, the module-local
-classes are still considered. This means that if the following function is
-added to any module (including but not limited to the ``cats`` and ``dogs``
-modules above) it will be callable with either a ``dogs.Pet`` or ``cats.Pet``
-argument:
-
-.. code-block:: cpp
-
- m.def("pet_name", [](const pets::Pet &pet) { return pet.name(); });
-
-For example, suppose the above function is added to each of ``cats.cpp``,
-``dogs.cpp`` and ``frogs.cpp`` (where ``frogs.cpp`` is some other module that
-does *not* bind ``Pets`` at all).
-
-.. code-block:: pycon
-
- >>> import cats, dogs, frogs # No error because of the added py::module_local()
- >>> mycat, mydog = cats.Cat("Fluffy"), dogs.Dog("Rover")
- >>> (cats.pet_name(mycat), dogs.pet_name(mydog))
- ('Fluffy', 'Rover')
- >>> (cats.pet_name(mydog), dogs.pet_name(mycat), frogs.pet_name(mycat))
- ('Rover', 'Fluffy', 'Fluffy')
-
-It is possible to use ``py::module_local()`` registrations in one module even
-if another module registers the same type globally: within the module with the
-module-local definition, all C++ instances will be cast to the associated bound
-Python type. In other modules any such values are converted to the global
-Python type created elsewhere.
-
-.. note::
-
- STL bindings (as provided via the optional :file:`pybind11/stl_bind.h`
- header) apply ``py::module_local`` by default when the bound type might
- conflict with other modules; see :ref:`stl_bind` for details.
-
-.. note::
-
- The localization of the bound types is actually tied to the shared object
- or binary generated by the compiler/linker. For typical modules created
- with ``PYBIND11_MODULE()``, this distinction is not significant. It is
- possible, however, when :ref:`embedding` to embed multiple modules in the
- same binary (see :ref:`embedding_modules`). In such a case, the
- localization will apply across all embedded modules within the same binary.
-
-.. seealso::
-
- The file :file:`tests/test_local_bindings.cpp` contains additional examples
- that demonstrate how ``py::module_local()`` works.
-
-Binding protected member functions
-==================================
-
-It's normally not possible to expose ``protected`` member functions to Python:
-
-.. code-block:: cpp
-
- class A {
- protected:
- int foo() const { return 42; }
- };
-
- py::class_<A>(m, "A")
- .def("foo", &A::foo); // error: 'foo' is a protected member of 'A'
-
-On one hand, this is good because non-``public`` members aren't meant to be
-accessed from the outside. But we may want to make use of ``protected``
-functions in derived Python classes.
-
-The following pattern makes this possible:
-
-.. code-block:: cpp
-
- class A {
- protected:
- int foo() const { return 42; }
- };
-
- class Publicist : public A { // helper type for exposing protected functions
- public:
- using A::foo; // inherited with different access modifier
- };
-
- py::class_<A>(m, "A") // bind the primary class
- .def("foo", &Publicist::foo); // expose protected methods via the publicist
-
-This works because ``&Publicist::foo`` is exactly the same function as
-``&A::foo`` (same signature and address), just with a different access
-modifier. The only purpose of the ``Publicist`` helper class is to make
-the function name ``public``.
-
-If the intent is to expose ``protected`` ``virtual`` functions which can be
-overridden in Python, the publicist pattern can be combined with the previously
-described trampoline:
-
-.. code-block:: cpp
-
- class A {
- public:
- virtual ~A() = default;
-
- protected:
- virtual int foo() const { return 42; }
- };
-
- class Trampoline : public A {
- public:
- int foo() const override { PYBIND11_OVERRIDE(int, A, foo, ); }
- };
-
- class Publicist : public A {
- public:
- using A::foo;
- };
-
- py::class_<A, Trampoline>(m, "A") // <-- `Trampoline` here
- .def("foo", &Publicist::foo); // <-- `Publicist` here, not `Trampoline`!
-
-.. note::
-
- MSVC 2015 has a compiler bug (fixed in version 2017) which
- requires a more explicit function binding in the form of
- ``.def("foo", static_cast<int (A::*)() const>(&Publicist::foo));``
- where ``int (A::*)() const`` is the type of ``A::foo``.
-
-Binding final classes
-=====================
-
-Some classes may not be appropriate to inherit from. In C++11, classes can
-use the ``final`` specifier to ensure that a class cannot be inherited from.
-The ``py::is_final`` attribute can be used to ensure that Python classes
-cannot inherit from a specified type. The underlying C++ type does not need
-to be declared final.
-
-.. code-block:: cpp
-
- class IsFinal final {};
-
- py::class_<IsFinal>(m, "IsFinal", py::is_final());
-
-When you try to inherit from such a class in Python, you will now get this
-error:
-
-.. code-block:: pycon
-
- >>> class PyFinalChild(IsFinal):
- ... pass
- TypeError: type 'IsFinal' is not an acceptable base type
-
-.. note:: This attribute is currently ignored on PyPy
-
-.. versionadded:: 2.6
-
-Custom automatic downcasters
-============================
-
-As explained in :ref:`inheritance`, pybind11 comes with built-in
-understanding of the dynamic type of polymorphic objects in C++; that
-is, returning a Pet to Python produces a Python object that knows it's
-wrapping a Dog, if Pet has virtual methods and pybind11 knows about
-Dog and this Pet is in fact a Dog. Sometimes, you might want to
-provide this automatic downcasting behavior when creating bindings for
-a class hierarchy that does not use standard C++ polymorphism, such as
-LLVM [#f4]_. As long as there's some way to determine at runtime
-whether a downcast is safe, you can proceed by specializing the
-``pybind11::polymorphic_type_hook`` template:
-
-.. code-block:: cpp
-
- enum class PetKind { Cat, Dog, Zebra };
- struct Pet { // Not polymorphic: has no virtual methods
- const PetKind kind;
- int age = 0;
- protected:
- Pet(PetKind _kind) : kind(_kind) {}
- };
- struct Dog : Pet {
- Dog() : Pet(PetKind::Dog) {}
- std::string sound = "woof!";
- std::string bark() const { return sound; }
- };
-
- namespace pybind11 {
- template<> struct polymorphic_type_hook<Pet> {
- static const void *get(const Pet *src, const std::type_info*& type) {
- // note that src may be nullptr
- if (src && src->kind == PetKind::Dog) {
- type = &typeid(Dog);
- return static_cast<const Dog*>(src);
- }
- return src;
- }
- };
- } // namespace pybind11
-
-When pybind11 wants to convert a C++ pointer of type ``Base*`` to a
-Python object, it calls ``polymorphic_type_hook<Base>::get()`` to
-determine if a downcast is possible. The ``get()`` function should use
-whatever runtime information is available to determine if its ``src``
-parameter is in fact an instance of some class ``Derived`` that
-inherits from ``Base``. If it finds such a ``Derived``, it sets ``type
-= &typeid(Derived)`` and returns a pointer to the ``Derived`` object
-that contains ``src``. Otherwise, it just returns ``src``, leaving
-``type`` at its default value of nullptr. If you set ``type`` to a
-type that pybind11 doesn't know about, no downcasting will occur, and
-the original ``src`` pointer will be used with its static type
-``Base*``.
-
-It is critical that the returned pointer and ``type`` argument of
-``get()`` agree with each other: if ``type`` is set to something
-non-null, the returned pointer must point to the start of an object
-whose type is ``type``. If the hierarchy being exposed uses only
-single inheritance, a simple ``return src;`` will achieve this just
-fine, but in the general case, you must cast ``src`` to the
-appropriate derived-class pointer (e.g. using
-``static_cast<Derived>(src)``) before allowing it to be returned as a
-``void*``.
-
-.. [#f4] https://llvm.org/docs/HowToSetUpLLVMStyleRTTI.html
-
-.. note::
-
- pybind11's standard support for downcasting objects whose types
- have virtual methods is implemented using
- ``polymorphic_type_hook`` too, using the standard C++ ability to
- determine the most-derived type of a polymorphic object using
- ``typeid()`` and to cast a base pointer to that most-derived type
- (even if you don't know what it is) using ``dynamic_cast<void*>``.
-
-.. seealso::
-
- The file :file:`tests/test_tagbased_polymorphic.cpp` contains a
- more complete example, including a demonstration of how to provide
- automatic downcasting for an entire class hierarchy without
- writing one get() function for each class.
-
-Accessing the type object
-=========================
-
-You can get the type object from a C++ class that has already been registered using:
-
-.. code-block:: python
-
- py::type T_py = py::type::of<T>();
-
-You can directly use ``py::type::of(ob)`` to get the type object from any python
-object, just like ``type(ob)`` in Python.
-
-.. note::
-
- Other types, like ``py::type::of<int>()``, do not work, see :ref:`type-conversions`.
-
-.. versionadded:: 2.6
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/embedding.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/embedding.rst
deleted file mode 100644
index dfdaad2d7f08f899237d69db2749b12a3c58c438..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/embedding.rst
+++ /dev/null
@@ -1,261 +0,0 @@
-.. _embedding:
-
-Embedding the interpreter
-#########################
-
-While pybind11 is mainly focused on extending Python using C++, it's also
-possible to do the reverse: embed the Python interpreter into a C++ program.
-All of the other documentation pages still apply here, so refer to them for
-general pybind11 usage. This section will cover a few extra things required
-for embedding.
-
-Getting started
-===============
-
-A basic executable with an embedded interpreter can be created with just a few
-lines of CMake and the ``pybind11::embed`` target, as shown below. For more
-information, see :doc:`/compiling`.
-
-.. code-block:: cmake
-
- cmake_minimum_required(VERSION 3.4)
- project(example)
-
- find_package(pybind11 REQUIRED) # or `add_subdirectory(pybind11)`
-
- add_executable(example main.cpp)
- target_link_libraries(example PRIVATE pybind11::embed)
-
-The essential structure of the ``main.cpp`` file looks like this:
-
-.. code-block:: cpp
-
- #include <pybind11/embed.h> // everything needed for embedding
- namespace py = pybind11;
-
- int main() {
- py::scoped_interpreter guard{}; // start the interpreter and keep it alive
-
- py::print("Hello, World!"); // use the Python API
- }
-
-The interpreter must be initialized before using any Python API, which includes
-all the functions and classes in pybind11. The RAII guard class `scoped_interpreter`
-takes care of the interpreter lifetime. After the guard is destroyed, the interpreter
-shuts down and clears its memory. No Python functions can be called after this.
-
-Executing Python code
-=====================
-
-There are a few different ways to run Python code. One option is to use `eval`,
-`exec` or `eval_file`, as explained in :ref:`eval`. Here is a quick example in
-the context of an executable with an embedded interpreter:
-
-.. code-block:: cpp
-
- #include <pybind11/embed.h>
- namespace py = pybind11;
-
- int main() {
- py::scoped_interpreter guard{};
-
- py::exec(R"(
- kwargs = dict(name="World", number=42)
- message = "Hello, {name}! The answer is {number}".format(**kwargs)
- print(message)
- )");
- }
-
-Alternatively, similar results can be achieved using pybind11's API (see
-:doc:`/advanced/pycpp/index` for more details).
-
-.. code-block:: cpp
-
- #include <pybind11/embed.h>
- namespace py = pybind11;
- using namespace py::literals;
-
- int main() {
- py::scoped_interpreter guard{};
-
- auto kwargs = py::dict("name"_a="World", "number"_a=42);
- auto message = "Hello, {name}! The answer is {number}"_s.format(**kwargs);
- py::print(message);
- }
-
-The two approaches can also be combined:
-
-.. code-block:: cpp
-
- #include <pybind11/embed.h>
- #include <iostream>
-
- namespace py = pybind11;
- using namespace py::literals;
-
- int main() {
- py::scoped_interpreter guard{};
-
- auto locals = py::dict("name"_a="World", "number"_a=42);
- py::exec(R"(
- message = "Hello, {name}! The answer is {number}".format(**locals())
- )", py::globals(), locals);
-
- auto message = locals["message"].cast<std::string>();
- std::cout << message;
- }
-
-Importing modules
-=================
-
-Python modules can be imported using `module_::import()`:
-
-.. code-block:: cpp
-
- py::module_ sys = py::module_::import("sys");
- py::print(sys.attr("path"));
-
-For convenience, the current working directory is included in ``sys.path`` when
-embedding the interpreter. This makes it easy to import local Python files:
-
-.. code-block:: python
-
- """calc.py located in the working directory"""
-
- def add(i, j):
- return i + j
-
-
-.. code-block:: cpp
-
- py::module_ calc = py::module_::import("calc");
- py::object result = calc.attr("add")(1, 2);
- int n = result.cast<int>();
- assert(n == 3);
-
-Modules can be reloaded using `module_::reload()` if the source is modified e.g.
-by an external process. This can be useful in scenarios where the application
-imports a user defined data processing script which needs to be updated after
-changes by the user. Note that this function does not reload modules recursively.
-
-.. _embedding_modules:
-
-Adding embedded modules
-=======================
-
-Embedded binary modules can be added using the `PYBIND11_EMBEDDED_MODULE` macro.
-Note that the definition must be placed at global scope. They can be imported
-like any other module.
-
-.. code-block:: cpp
-
- #include <pybind11/embed.h>
- namespace py = pybind11;
-
- PYBIND11_EMBEDDED_MODULE(fast_calc, m) {
- // `m` is a `py::module_` which is used to bind functions and classes
- m.def("add", [](int i, int j) {
- return i + j;
- });
- }
-
- int main() {
- py::scoped_interpreter guard{};
-
- auto fast_calc = py::module_::import("fast_calc");
- auto result = fast_calc.attr("add")(1, 2).cast<int>();
- assert(result == 3);
- }
-
-Unlike extension modules where only a single binary module can be created, on
-the embedded side an unlimited number of modules can be added using multiple
-`PYBIND11_EMBEDDED_MODULE` definitions (as long as they have unique names).
-
-These modules are added to Python's list of builtins, so they can also be
-imported in pure Python files loaded by the interpreter. Everything interacts
-naturally:
-
-.. code-block:: python
-
- """py_module.py located in the working directory"""
- import cpp_module
-
- a = cpp_module.a
- b = a + 1
-
-
-.. code-block:: cpp
-
- #include <pybind11/embed.h>
- namespace py = pybind11;
-
- PYBIND11_EMBEDDED_MODULE(cpp_module, m) {
- m.attr("a") = 1;
- }
-
- int main() {
- py::scoped_interpreter guard{};
-
- auto py_module = py::module_::import("py_module");
-
- auto locals = py::dict("fmt"_a="{} + {} = {}", **py_module.attr("__dict__"));
- assert(locals["a"].cast<int>() == 1);
- assert(locals["b"].cast<int>() == 2);
-
- py::exec(R"(
- c = a + b
- message = fmt.format(a, b, c)
- )", py::globals(), locals);
-
- assert(locals["c"].cast<int>() == 3);
- assert(locals["message"].cast<std::string>() == "1 + 2 = 3");
- }
-
-
-Interpreter lifetime
-====================
-
-The Python interpreter shuts down when `scoped_interpreter` is destroyed. After
-this, creating a new instance will restart the interpreter. Alternatively, the
-`initialize_interpreter` / `finalize_interpreter` pair of functions can be used
-to directly set the state at any time.
-
-Modules created with pybind11 can be safely re-initialized after the interpreter
-has been restarted. However, this may not apply to third-party extension modules.
-The issue is that Python itself cannot completely unload extension modules and
-there are several caveats with regard to interpreter restarting. In short, not
-all memory may be freed, either due to Python reference cycles or user-created
-global data. All the details can be found in the CPython documentation.
-
-.. warning::
-
- Creating two concurrent `scoped_interpreter` guards is a fatal error. So is
- calling `initialize_interpreter` for a second time after the interpreter
- has already been initialized.
-
- Do not use the raw CPython API functions ``Py_Initialize`` and
- ``Py_Finalize`` as these do not properly handle the lifetime of
- pybind11's internal data.
-
-
-Sub-interpreter support
-=======================
-
-Creating multiple copies of `scoped_interpreter` is not possible because it
-represents the main Python interpreter. Sub-interpreters are something different
-and they do permit the existence of multiple interpreters. This is an advanced
-feature of the CPython API and should be handled with care. pybind11 does not
-currently offer a C++ interface for sub-interpreters, so refer to the CPython
-documentation for all the details regarding this feature.
-
-We'll just mention a couple of caveats the sub-interpreters support in pybind11:
-
- 1. Sub-interpreters will not receive independent copies of embedded modules.
- Instead, these are shared and modifications in one interpreter may be
- reflected in another.
-
- 2. Managing multiple threads, multiple interpreters and the GIL can be
- challenging and there are several caveats here, even within the pure
- CPython API (please refer to the Python docs for details). As for
- pybind11, keep in mind that `gil_scoped_release` and `gil_scoped_acquire`
- do not take sub-interpreters into account.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/exceptions.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/exceptions.rst
deleted file mode 100644
index 5eae556247debd41e2db54d522f3a15de0f5d68f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/exceptions.rst
+++ /dev/null
@@ -1,298 +0,0 @@
-Exceptions
-##########
-
-Built-in C++ to Python exception translation
-============================================
-
-When Python calls C++ code through pybind11, pybind11 provides a C++ exception handler
-that will trap C++ exceptions, translate them to the corresponding Python exception,
-and raise them so that Python code can handle them.
-
-pybind11 defines translations for ``std::exception`` and its standard
-subclasses, and several special exception classes that translate to specific
-Python exceptions. Note that these are not actually Python exceptions, so they
-cannot be examined using the Python C API. Instead, they are pure C++ objects
-that pybind11 will translate the corresponding Python exception when they arrive
-at its exception handler.
-
-.. tabularcolumns:: |p{0.5\textwidth}|p{0.45\textwidth}|
-
-+--------------------------------------+--------------------------------------+
-| Exception thrown by C++ | Translated to Python exception type |
-+======================================+======================================+
-| :class:`std::exception` | ``RuntimeError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`std::bad_alloc` | ``MemoryError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`std::domain_error` | ``ValueError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`std::invalid_argument` | ``ValueError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`std::length_error` | ``ValueError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`std::out_of_range` | ``IndexError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`std::range_error` | ``ValueError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`std::overflow_error` | ``OverflowError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`pybind11::stop_iteration` | ``StopIteration`` (used to implement |
-| | custom iterators) |
-+--------------------------------------+--------------------------------------+
-| :class:`pybind11::index_error` | ``IndexError`` (used to indicate out |
-| | of bounds access in ``__getitem__``, |
-| | ``__setitem__``, etc.) |
-+--------------------------------------+--------------------------------------+
-| :class:`pybind11::value_error` | ``ValueError`` (used to indicate |
-| | wrong value passed in |
-| | ``container.remove(...)``) |
-+--------------------------------------+--------------------------------------+
-| :class:`pybind11::key_error` | ``KeyError`` (used to indicate out |
-| | of bounds access in ``__getitem__``, |
-| | ``__setitem__`` in dict-like |
-| | objects, etc.) |
-+--------------------------------------+--------------------------------------+
-
-Exception translation is not bidirectional. That is, *catching* the C++
-exceptions defined above above will not trap exceptions that originate from
-Python. For that, catch :class:`pybind11::error_already_set`. See :ref:`below
-<handling_python_exceptions_cpp>` for further details.
-
-There is also a special exception :class:`cast_error` that is thrown by
-:func:`handle::call` when the input arguments cannot be converted to Python
-objects.
-
-Registering custom translators
-==============================
-
-If the default exception conversion policy described above is insufficient,
-pybind11 also provides support for registering custom exception translators.
-To register a simple exception conversion that translates a C++ exception into
-a new Python exception using the C++ exception's ``what()`` method, a helper
-function is available:
-
-.. code-block:: cpp
-
- py::register_exception<CppExp>(module, "PyExp");
-
-This call creates a Python exception class with the name ``PyExp`` in the given
-module and automatically converts any encountered exceptions of type ``CppExp``
-into Python exceptions of type ``PyExp``.
-
-It is possible to specify base class for the exception using the third
-parameter, a `handle`:
-
-.. code-block:: cpp
-
- py::register_exception<CppExp>(module, "PyExp", PyExc_RuntimeError);
-
-Then `PyExp` can be caught both as `PyExp` and `RuntimeError`.
-
-The class objects of the built-in Python exceptions are listed in the Python
-documentation on `Standard Exceptions <https://docs.python.org/3/c-api/exceptions.html#standard-exceptions>`_.
-The default base class is `PyExc_Exception`.
-
-When more advanced exception translation is needed, the function
-``py::register_exception_translator(translator)`` can be used to register
-functions that can translate arbitrary exception types (and which may include
-additional logic to do so). The function takes a stateless callable (e.g. a
-function pointer or a lambda function without captured variables) with the call
-signature ``void(std::exception_ptr)``.
-
-When a C++ exception is thrown, the registered exception translators are tried
-in reverse order of registration (i.e. the last registered translator gets the
-first shot at handling the exception).
-
-Inside the translator, ``std::rethrow_exception`` should be used within
-a try block to re-throw the exception. One or more catch clauses to catch
-the appropriate exceptions should then be used with each clause using
-``PyErr_SetString`` to set a Python exception or ``ex(string)`` to set
-the python exception to a custom exception type (see below).
-
-To declare a custom Python exception type, declare a ``py::exception`` variable
-and use this in the associated exception translator (note: it is often useful
-to make this a static declaration when using it inside a lambda expression
-without requiring capturing).
-
-The following example demonstrates this for a hypothetical exception classes
-``MyCustomException`` and ``OtherException``: the first is translated to a
-custom python exception ``MyCustomError``, while the second is translated to a
-standard python RuntimeError:
-
-.. code-block:: cpp
-
- static py::exception<MyCustomException> exc(m, "MyCustomError");
- py::register_exception_translator([](std::exception_ptr p) {
- try {
- if (p) std::rethrow_exception(p);
- } catch (const MyCustomException &e) {
- exc(e.what());
- } catch (const OtherException &e) {
- PyErr_SetString(PyExc_RuntimeError, e.what());
- }
- });
-
-Multiple exceptions can be handled by a single translator, as shown in the
-example above. If the exception is not caught by the current translator, the
-previously registered one gets a chance.
-
-If none of the registered exception translators is able to handle the
-exception, it is handled by the default converter as described in the previous
-section.
-
-.. seealso::
-
- The file :file:`tests/test_exceptions.cpp` contains examples
- of various custom exception translators and custom exception types.
-
-.. note::
-
- Call either ``PyErr_SetString`` or a custom exception's call
- operator (``exc(string)``) for every exception caught in a custom exception
- translator. Failure to do so will cause Python to crash with ``SystemError:
- error return without exception set``.
-
- Exceptions that you do not plan to handle should simply not be caught, or
- may be explicitly (re-)thrown to delegate it to the other,
- previously-declared existing exception translators.
-
-.. _handling_python_exceptions_cpp:
-
-Handling exceptions from Python in C++
-======================================
-
-When C++ calls Python functions, such as in a callback function or when
-manipulating Python objects, and Python raises an ``Exception``, pybind11
-converts the Python exception into a C++ exception of type
-:class:`pybind11::error_already_set` whose payload contains a C++ string textual
-summary and the actual Python exception. ``error_already_set`` is used to
-propagate Python exception back to Python (or possibly, handle them in C++).
-
-.. tabularcolumns:: |p{0.5\textwidth}|p{0.45\textwidth}|
-
-+--------------------------------------+--------------------------------------+
-| Exception raised in Python | Thrown as C++ exception type |
-+======================================+======================================+
-| Any Python ``Exception`` | :class:`pybind11::error_already_set` |
-+--------------------------------------+--------------------------------------+
-
-For example:
-
-.. code-block:: cpp
-
- try {
- // open("missing.txt", "r")
- auto file = py::module_::import("io").attr("open")("missing.txt", "r");
- auto text = file.attr("read")();
- file.attr("close")();
- } catch (py::error_already_set &e) {
- if (e.matches(PyExc_FileNotFoundError)) {
- py::print("missing.txt not found");
- } else if (e.match(PyExc_PermissionError)) {
- py::print("missing.txt found but not accessible");
- } else {
- throw;
- }
- }
-
-Note that C++ to Python exception translation does not apply here, since that is
-a method for translating C++ exceptions to Python, not vice versa. The error raised
-from Python is always ``error_already_set``.
-
-This example illustrates this behavior:
-
-.. code-block:: cpp
-
- try {
- py::eval("raise ValueError('The Ring')");
- } catch (py::value_error &boromir) {
- // Boromir never gets the ring
- assert(false);
- } catch (py::error_already_set &frodo) {
- // Frodo gets the ring
- py::print("I will take the ring");
- }
-
- try {
- // py::value_error is a request for pybind11 to raise a Python exception
- throw py::value_error("The ball");
- } catch (py::error_already_set &cat) {
- // cat won't catch the ball since
- // py::value_error is not a Python exception
- assert(false);
- } catch (py::value_error &dog) {
- // dog will catch the ball
- py::print("Run Spot run");
- throw; // Throw it again (pybind11 will raise ValueError)
- }
-
-Handling errors from the Python C API
-=====================================
-
-Where possible, use :ref:`pybind11 wrappers <wrappers>` instead of calling
-the Python C API directly. When calling the Python C API directly, in
-addition to manually managing reference counts, one must follow the pybind11
-error protocol, which is outlined here.
-
-After calling the Python C API, if Python returns an error,
-``throw py::error_already_set();``, which allows pybind11 to deal with the
-exception and pass it back to the Python interpreter. This includes calls to
-the error setting functions such as ``PyErr_SetString``.
-
-.. code-block:: cpp
-
- PyErr_SetString(PyExc_TypeError, "C API type error demo");
- throw py::error_already_set();
-
- // But it would be easier to simply...
- throw py::type_error("pybind11 wrapper type error");
-
-Alternately, to ignore the error, call `PyErr_Clear
-<https://docs.python.org/3/c-api/exceptions.html#c.PyErr_Clear>`_.
-
-Any Python error must be thrown or cleared, or Python/pybind11 will be left in
-an invalid state.
-
-.. _unraisable_exceptions:
-
-Handling unraisable exceptions
-==============================
-
-If a Python function invoked from a C++ destructor or any function marked
-``noexcept(true)`` (collectively, "noexcept functions") throws an exception, there
-is no way to propagate the exception, as such functions may not throw.
-Should they throw or fail to catch any exceptions in their call graph,
-the C++ runtime calls ``std::terminate()`` to abort immediately.
-
-Similarly, Python exceptions raised in a class's ``__del__`` method do not
-propagate, but are logged by Python as an unraisable error. In Python 3.8+, a
-`system hook is triggered
-<https://docs.python.org/3/library/sys.html#sys.unraisablehook>`_
-and an auditing event is logged.
-
-Any noexcept function should have a try-catch block that traps
-class:`error_already_set` (or any other exception that can occur). Note that
-pybind11 wrappers around Python exceptions such as
-:class:`pybind11::value_error` are *not* Python exceptions; they are C++
-exceptions that pybind11 catches and converts to Python exceptions. Noexcept
-functions cannot propagate these exceptions either. A useful approach is to
-convert them to Python exceptions and then ``discard_as_unraisable`` as shown
-below.
-
-.. code-block:: cpp
-
- void nonthrowing_func() noexcept(true) {
- try {
- // ...
- } catch (py::error_already_set &eas) {
- // Discard the Python error using Python APIs, using the C++ magic
- // variable __func__. Python already knows the type and value and of the
- // exception object.
- eas.discard_as_unraisable(__func__);
- } catch (const std::exception &e) {
- // Log and discard C++ exceptions.
- third_party::log(e);
- }
- }
-
-.. versionadded:: 2.6
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/functions.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/functions.rst
deleted file mode 100644
index ebdff9c93d4a437ac9c09946ee025eeac349262b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/functions.rst
+++ /dev/null
@@ -1,561 +0,0 @@
-Functions
-#########
-
-Before proceeding with this section, make sure that you are already familiar
-with the basics of binding functions and classes, as explained in :doc:`/basics`
-and :doc:`/classes`. The following guide is applicable to both free and member
-functions, i.e. *methods* in Python.
-
-.. _return_value_policies:
-
-Return value policies
-=====================
-
-Python and C++ use fundamentally different ways of managing the memory and
-lifetime of objects managed by them. This can lead to issues when creating
-bindings for functions that return a non-trivial type. Just by looking at the
-type information, it is not clear whether Python should take charge of the
-returned value and eventually free its resources, or if this is handled on the
-C++ side. For this reason, pybind11 provides a several *return value policy*
-annotations that can be passed to the :func:`module_::def` and
-:func:`class_::def` functions. The default policy is
-:enum:`return_value_policy::automatic`.
-
-Return value policies are tricky, and it's very important to get them right.
-Just to illustrate what can go wrong, consider the following simple example:
-
-.. code-block:: cpp
-
- /* Function declaration */
- Data *get_data() { return _data; /* (pointer to a static data structure) */ }
- ...
-
- /* Binding code */
- m.def("get_data", &get_data); // <-- KABOOM, will cause crash when called from Python
-
-What's going on here? When ``get_data()`` is called from Python, the return
-value (a native C++ type) must be wrapped to turn it into a usable Python type.
-In this case, the default return value policy (:enum:`return_value_policy::automatic`)
-causes pybind11 to assume ownership of the static ``_data`` instance.
-
-When Python's garbage collector eventually deletes the Python
-wrapper, pybind11 will also attempt to delete the C++ instance (via ``operator
-delete()``) due to the implied ownership. At this point, the entire application
-will come crashing down, though errors could also be more subtle and involve
-silent data corruption.
-
-In the above example, the policy :enum:`return_value_policy::reference` should have
-been specified so that the global data instance is only *referenced* without any
-implied transfer of ownership, i.e.:
-
-.. code-block:: cpp
-
- m.def("get_data", &get_data, return_value_policy::reference);
-
-On the other hand, this is not the right policy for many other situations,
-where ignoring ownership could lead to resource leaks.
-As a developer using pybind11, it's important to be familiar with the different
-return value policies, including which situation calls for which one of them.
-The following table provides an overview of available policies:
-
-.. tabularcolumns:: |p{0.5\textwidth}|p{0.45\textwidth}|
-
-+--------------------------------------------------+----------------------------------------------------------------------------+
-| Return value policy | Description |
-+==================================================+============================================================================+
-| :enum:`return_value_policy::take_ownership` | Reference an existing object (i.e. do not create a new copy) and take |
-| | ownership. Python will call the destructor and delete operator when the |
-| | object's reference count reaches zero. Undefined behavior ensues when the |
-| | C++ side does the same, or when the data was not dynamically allocated. |
-+--------------------------------------------------+----------------------------------------------------------------------------+
-| :enum:`return_value_policy::copy` | Create a new copy of the returned object, which will be owned by Python. |
-| | This policy is comparably safe because the lifetimes of the two instances |
-| | are decoupled. |
-+--------------------------------------------------+----------------------------------------------------------------------------+
-| :enum:`return_value_policy::move` | Use ``std::move`` to move the return value contents into a new instance |
-| | that will be owned by Python. This policy is comparably safe because the |
-| | lifetimes of the two instances (move source and destination) are decoupled.|
-+--------------------------------------------------+----------------------------------------------------------------------------+
-| :enum:`return_value_policy::reference` | Reference an existing object, but do not take ownership. The C++ side is |
-| | responsible for managing the object's lifetime and deallocating it when |
-| | it is no longer used. Warning: undefined behavior will ensue when the C++ |
-| | side deletes an object that is still referenced and used by Python. |
-+--------------------------------------------------+----------------------------------------------------------------------------+
-| :enum:`return_value_policy::reference_internal` | Indicates that the lifetime of the return value is tied to the lifetime |
-| | of a parent object, namely the implicit ``this``, or ``self`` argument of |
-| | the called method or property. Internally, this policy works just like |
-| | :enum:`return_value_policy::reference` but additionally applies a |
-| | ``keep_alive<0, 1>`` *call policy* (described in the next section) that |
-| | prevents the parent object from being garbage collected as long as the |
-| | return value is referenced by Python. This is the default policy for |
-| | property getters created via ``def_property``, ``def_readwrite``, etc. |
-+--------------------------------------------------+----------------------------------------------------------------------------+
-| :enum:`return_value_policy::automatic` | **Default policy.** This policy falls back to the policy |
-| | :enum:`return_value_policy::take_ownership` when the return value is a |
-| | pointer. Otherwise, it uses :enum:`return_value_policy::move` or |
-| | :enum:`return_value_policy::copy` for rvalue and lvalue references, |
-| | respectively. See above for a description of what all of these different |
-| | policies do. |
-+--------------------------------------------------+----------------------------------------------------------------------------+
-| :enum:`return_value_policy::automatic_reference` | As above, but use policy :enum:`return_value_policy::reference` when the |
-| | return value is a pointer. This is the default conversion policy for |
-| | function arguments when calling Python functions manually from C++ code |
-| | (i.e. via handle::operator()). You probably won't need to use this. |
-+--------------------------------------------------+----------------------------------------------------------------------------+
-
-Return value policies can also be applied to properties:
-
-.. code-block:: cpp
-
- class_<MyClass>(m, "MyClass")
- .def_property("data", &MyClass::getData, &MyClass::setData,
- py::return_value_policy::copy);
-
-Technically, the code above applies the policy to both the getter and the
-setter function, however, the setter doesn't really care about *return*
-value policies which makes this a convenient terse syntax. Alternatively,
-targeted arguments can be passed through the :class:`cpp_function` constructor:
-
-.. code-block:: cpp
-
- class_<MyClass>(m, "MyClass")
- .def_property("data"
- py::cpp_function(&MyClass::getData, py::return_value_policy::copy),
- py::cpp_function(&MyClass::setData)
- );
-
-.. warning::
-
- Code with invalid return value policies might access uninitialized memory or
- free data structures multiple times, which can lead to hard-to-debug
- non-determinism and segmentation faults, hence it is worth spending the
- time to understand all the different options in the table above.
-
-.. note::
-
- One important aspect of the above policies is that they only apply to
- instances which pybind11 has *not* seen before, in which case the policy
- clarifies essential questions about the return value's lifetime and
- ownership. When pybind11 knows the instance already (as identified by its
- type and address in memory), it will return the existing Python object
- wrapper rather than creating a new copy.
-
-.. note::
-
- The next section on :ref:`call_policies` discusses *call policies* that can be
- specified *in addition* to a return value policy from the list above. Call
- policies indicate reference relationships that can involve both return values
- and parameters of functions.
-
-.. note::
-
- As an alternative to elaborate call policies and lifetime management logic,
- consider using smart pointers (see the section on :ref:`smart_pointers` for
- details). Smart pointers can tell whether an object is still referenced from
- C++ or Python, which generally eliminates the kinds of inconsistencies that
- can lead to crashes or undefined behavior. For functions returning smart
- pointers, it is not necessary to specify a return value policy.
-
-.. _call_policies:
-
-Additional call policies
-========================
-
-In addition to the above return value policies, further *call policies* can be
-specified to indicate dependencies between parameters or ensure a certain state
-for the function call.
-
-Keep alive
-----------
-
-In general, this policy is required when the C++ object is any kind of container
-and another object is being added to the container. ``keep_alive<Nurse, Patient>``
-indicates that the argument with index ``Patient`` should be kept alive at least
-until the argument with index ``Nurse`` is freed by the garbage collector. Argument
-indices start at one, while zero refers to the return value. For methods, index
-``1`` refers to the implicit ``this`` pointer, while regular arguments begin at
-index ``2``. Arbitrarily many call policies can be specified. When a ``Nurse``
-with value ``None`` is detected at runtime, the call policy does nothing.
-
-When the nurse is not a pybind11-registered type, the implementation internally
-relies on the ability to create a *weak reference* to the nurse object. When
-the nurse object is not a pybind11-registered type and does not support weak
-references, an exception will be thrown.
-
-Consider the following example: here, the binding code for a list append
-operation ties the lifetime of the newly added element to the underlying
-container:
-
-.. code-block:: cpp
-
- py::class_<List>(m, "List")
- .def("append", &List::append, py::keep_alive<1, 2>());
-
-For consistency, the argument indexing is identical for constructors. Index
-``1`` still refers to the implicit ``this`` pointer, i.e. the object which is
-being constructed. Index ``0`` refers to the return type which is presumed to
-be ``void`` when a constructor is viewed like a function. The following example
-ties the lifetime of the constructor element to the constructed object:
-
-.. code-block:: cpp
-
- py::class_<Nurse>(m, "Nurse")
- .def(py::init<Patient &>(), py::keep_alive<1, 2>());
-
-.. note::
-
- ``keep_alive`` is analogous to the ``with_custodian_and_ward`` (if Nurse,
- Patient != 0) and ``with_custodian_and_ward_postcall`` (if Nurse/Patient ==
- 0) policies from Boost.Python.
-
-Call guard
-----------
-
-The ``call_guard<T>`` policy allows any scope guard type ``T`` to be placed
-around the function call. For example, this definition:
-
-.. code-block:: cpp
-
- m.def("foo", foo, py::call_guard<T>());
-
-is equivalent to the following pseudocode:
-
-.. code-block:: cpp
-
- m.def("foo", [](args...) {
- T scope_guard;
- return foo(args...); // forwarded arguments
- });
-
-The only requirement is that ``T`` is default-constructible, but otherwise any
-scope guard will work. This is very useful in combination with `gil_scoped_release`.
-See :ref:`gil`.
-
-Multiple guards can also be specified as ``py::call_guard<T1, T2, T3...>``. The
-constructor order is left to right and destruction happens in reverse.
-
-.. seealso::
-
- The file :file:`tests/test_call_policies.cpp` contains a complete example
- that demonstrates using `keep_alive` and `call_guard` in more detail.
-
-.. _python_objects_as_args:
-
-Python objects as arguments
-===========================
-
-pybind11 exposes all major Python types using thin C++ wrapper classes. These
-wrapper classes can also be used as parameters of functions in bindings, which
-makes it possible to directly work with native Python types on the C++ side.
-For instance, the following statement iterates over a Python ``dict``:
-
-.. code-block:: cpp
-
- void print_dict(py::dict dict) {
- /* Easily interact with Python types */
- for (auto item : dict)
- std::cout << "key=" << std::string(py::str(item.first)) << ", "
- << "value=" << std::string(py::str(item.second)) << std::endl;
- }
-
-It can be exported:
-
-.. code-block:: cpp
-
- m.def("print_dict", &print_dict);
-
-And used in Python as usual:
-
-.. code-block:: pycon
-
- >>> print_dict({'foo': 123, 'bar': 'hello'})
- key=foo, value=123
- key=bar, value=hello
-
-For more information on using Python objects in C++, see :doc:`/advanced/pycpp/index`.
-
-Accepting \*args and \*\*kwargs
-===============================
-
-Python provides a useful mechanism to define functions that accept arbitrary
-numbers of arguments and keyword arguments:
-
-.. code-block:: python
-
- def generic(*args, **kwargs):
- ... # do something with args and kwargs
-
-Such functions can also be created using pybind11:
-
-.. code-block:: cpp
-
- void generic(py::args args, py::kwargs kwargs) {
- /// .. do something with args
- if (kwargs)
- /// .. do something with kwargs
- }
-
- /// Binding code
- m.def("generic", &generic);
-
-The class ``py::args`` derives from ``py::tuple`` and ``py::kwargs`` derives
-from ``py::dict``.
-
-You may also use just one or the other, and may combine these with other
-arguments as long as the ``py::args`` and ``py::kwargs`` arguments are the last
-arguments accepted by the function.
-
-Please refer to the other examples for details on how to iterate over these,
-and on how to cast their entries into C++ objects. A demonstration is also
-available in ``tests/test_kwargs_and_defaults.cpp``.
-
-.. note::
-
- When combining \*args or \*\*kwargs with :ref:`keyword_args` you should
- *not* include ``py::arg`` tags for the ``py::args`` and ``py::kwargs``
- arguments.
-
-Default arguments revisited
-===========================
-
-The section on :ref:`default_args` previously discussed basic usage of default
-arguments using pybind11. One noteworthy aspect of their implementation is that
-default arguments are converted to Python objects right at declaration time.
-Consider the following example:
-
-.. code-block:: cpp
-
- py::class_<MyClass>("MyClass")
- .def("myFunction", py::arg("arg") = SomeType(123));
-
-In this case, pybind11 must already be set up to deal with values of the type
-``SomeType`` (via a prior instantiation of ``py::class_<SomeType>``), or an
-exception will be thrown.
-
-Another aspect worth highlighting is that the "preview" of the default argument
-in the function signature is generated using the object's ``__repr__`` method.
-If not available, the signature may not be very helpful, e.g.:
-
-.. code-block:: pycon
-
- FUNCTIONS
- ...
- | myFunction(...)
- | Signature : (MyClass, arg : SomeType = <SomeType object at 0x101b7b080>) -> NoneType
- ...
-
-The first way of addressing this is by defining ``SomeType.__repr__``.
-Alternatively, it is possible to specify the human-readable preview of the
-default argument manually using the ``arg_v`` notation:
-
-.. code-block:: cpp
-
- py::class_<MyClass>("MyClass")
- .def("myFunction", py::arg_v("arg", SomeType(123), "SomeType(123)"));
-
-Sometimes it may be necessary to pass a null pointer value as a default
-argument. In this case, remember to cast it to the underlying type in question,
-like so:
-
-.. code-block:: cpp
-
- py::class_<MyClass>("MyClass")
- .def("myFunction", py::arg("arg") = static_cast<SomeType *>(nullptr));
-
-Keyword-only arguments
-======================
-
-Python 3 introduced keyword-only arguments by specifying an unnamed ``*``
-argument in a function definition:
-
-.. code-block:: python
-
- def f(a, *, b): # a can be positional or via keyword; b must be via keyword
- pass
-
- f(a=1, b=2) # good
- f(b=2, a=1) # good
- f(1, b=2) # good
- f(1, 2) # TypeError: f() takes 1 positional argument but 2 were given
-
-Pybind11 provides a ``py::kw_only`` object that allows you to implement
-the same behaviour by specifying the object between positional and keyword-only
-argument annotations when registering the function:
-
-.. code-block:: cpp
-
- m.def("f", [](int a, int b) { /* ... */ },
- py::arg("a"), py::kw_only(), py::arg("b"));
-
-Note that you currently cannot combine this with a ``py::args`` argument. This
-feature does *not* require Python 3 to work.
-
-.. versionadded:: 2.6
-
-Positional-only arguments
-=========================
-
-Python 3.8 introduced a new positional-only argument syntax, using ``/`` in the
-function definition (note that this has been a convention for CPython
-positional arguments, such as in ``pow()``, since Python 2). You can
-do the same thing in any version of Python using ``py::pos_only()``:
-
-.. code-block:: cpp
-
- m.def("f", [](int a, int b) { /* ... */ },
- py::arg("a"), py::pos_only(), py::arg("b"));
-
-You now cannot give argument ``a`` by keyword. This can be combined with
-keyword-only arguments, as well.
-
-.. versionadded:: 2.6
-
-.. _nonconverting_arguments:
-
-Non-converting arguments
-========================
-
-Certain argument types may support conversion from one type to another. Some
-examples of conversions are:
-
-* :ref:`implicit_conversions` declared using ``py::implicitly_convertible<A,B>()``
-* Calling a method accepting a double with an integer argument
-* Calling a ``std::complex<float>`` argument with a non-complex python type
- (for example, with a float). (Requires the optional ``pybind11/complex.h``
- header).
-* Calling a function taking an Eigen matrix reference with a numpy array of the
- wrong type or of an incompatible data layout. (Requires the optional
- ``pybind11/eigen.h`` header).
-
-This behaviour is sometimes undesirable: the binding code may prefer to raise
-an error rather than convert the argument. This behaviour can be obtained
-through ``py::arg`` by calling the ``.noconvert()`` method of the ``py::arg``
-object, such as:
-
-.. code-block:: cpp
-
- m.def("floats_only", [](double f) { return 0.5 * f; }, py::arg("f").noconvert());
- m.def("floats_preferred", [](double f) { return 0.5 * f; }, py::arg("f"));
-
-Attempting the call the second function (the one without ``.noconvert()``) with
-an integer will succeed, but attempting to call the ``.noconvert()`` version
-will fail with a ``TypeError``:
-
-.. code-block:: pycon
-
- >>> floats_preferred(4)
- 2.0
- >>> floats_only(4)
- Traceback (most recent call last):
- File "<stdin>", line 1, in <module>
- TypeError: floats_only(): incompatible function arguments. The following argument types are supported:
- 1. (f: float) -> float
-
- Invoked with: 4
-
-You may, of course, combine this with the :var:`_a` shorthand notation (see
-:ref:`keyword_args`) and/or :ref:`default_args`. It is also permitted to omit
-the argument name by using the ``py::arg()`` constructor without an argument
-name, i.e. by specifying ``py::arg().noconvert()``.
-
-.. note::
-
- When specifying ``py::arg`` options it is necessary to provide the same
- number of options as the bound function has arguments. Thus if you want to
- enable no-convert behaviour for just one of several arguments, you will
- need to specify a ``py::arg()`` annotation for each argument with the
- no-convert argument modified to ``py::arg().noconvert()``.
-
-.. _none_arguments:
-
-Allow/Prohibiting None arguments
-================================
-
-When a C++ type registered with :class:`py::class_` is passed as an argument to
-a function taking the instance as pointer or shared holder (e.g. ``shared_ptr``
-or a custom, copyable holder as described in :ref:`smart_pointers`), pybind
-allows ``None`` to be passed from Python which results in calling the C++
-function with ``nullptr`` (or an empty holder) for the argument.
-
-To explicitly enable or disable this behaviour, using the
-``.none`` method of the :class:`py::arg` object:
-
-.. code-block:: cpp
-
- py::class_<Dog>(m, "Dog").def(py::init<>());
- py::class_<Cat>(m, "Cat").def(py::init<>());
- m.def("bark", [](Dog *dog) -> std::string {
- if (dog) return "woof!"; /* Called with a Dog instance */
- else return "(no dog)"; /* Called with None, dog == nullptr */
- }, py::arg("dog").none(true));
- m.def("meow", [](Cat *cat) -> std::string {
- // Can't be called with None argument
- return "meow";
- }, py::arg("cat").none(false));
-
-With the above, the Python call ``bark(None)`` will return the string ``"(no
-dog)"``, while attempting to call ``meow(None)`` will raise a ``TypeError``:
-
-.. code-block:: pycon
-
- >>> from animals import Dog, Cat, bark, meow
- >>> bark(Dog())
- 'woof!'
- >>> meow(Cat())
- 'meow'
- >>> bark(None)
- '(no dog)'
- >>> meow(None)
- Traceback (most recent call last):
- File "<stdin>", line 1, in <module>
- TypeError: meow(): incompatible function arguments. The following argument types are supported:
- 1. (cat: animals.Cat) -> str
-
- Invoked with: None
-
-The default behaviour when the tag is unspecified is to allow ``None``.
-
-.. note::
-
- Even when ``.none(true)`` is specified for an argument, ``None`` will be converted to a
- ``nullptr`` *only* for custom and :ref:`opaque <opaque>` types. Pointers to built-in types
- (``double *``, ``int *``, ...) and STL types (``std::vector<T> *``, ...; if ``pybind11/stl.h``
- is included) are copied when converted to C++ (see :doc:`/advanced/cast/overview`) and will
- not allow ``None`` as argument. To pass optional argument of these copied types consider
- using ``std::optional<T>``
-
-Overload resolution order
-=========================
-
-When a function or method with multiple overloads is called from Python,
-pybind11 determines which overload to call in two passes. The first pass
-attempts to call each overload without allowing argument conversion (as if
-every argument had been specified as ``py::arg().noconvert()`` as described
-above).
-
-If no overload succeeds in the no-conversion first pass, a second pass is
-attempted in which argument conversion is allowed (except where prohibited via
-an explicit ``py::arg().noconvert()`` attribute in the function definition).
-
-If the second pass also fails a ``TypeError`` is raised.
-
-Within each pass, overloads are tried in the order they were registered with
-pybind11. If the ``py::prepend()`` tag is added to the definition, a function
-can be placed at the beginning of the overload sequence instead, allowing user
-overloads to proceed built in functions.
-
-What this means in practice is that pybind11 will prefer any overload that does
-not require conversion of arguments to an overload that does, but otherwise
-prefers earlier-defined overloads to later-defined ones.
-
-.. note::
-
- pybind11 does *not* further prioritize based on the number/pattern of
- overloaded arguments. That is, pybind11 does not prioritize a function
- requiring one conversion over one requiring three, but only prioritizes
- overloads requiring no conversion at all to overloads that require
- conversion of at least one argument.
-
-.. versionadded:: 2.6
-
- The ``py::prepend()`` tag.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/misc.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/misc.rst
deleted file mode 100644
index b3f3b2265a4fbed9fbd11ed736b6bbd72d999af7..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/misc.rst
+++ /dev/null
@@ -1,337 +0,0 @@
-Miscellaneous
-#############
-
-.. _macro_notes:
-
-General notes regarding convenience macros
-==========================================
-
-pybind11 provides a few convenience macros such as
-:func:`PYBIND11_DECLARE_HOLDER_TYPE` and ``PYBIND11_OVERRIDE_*``. Since these
-are "just" macros that are evaluated in the preprocessor (which has no concept
-of types), they *will* get confused by commas in a template argument; for
-example, consider:
-
-.. code-block:: cpp
-
- PYBIND11_OVERRIDE(MyReturnType<T1, T2>, Class<T3, T4>, func)
-
-The limitation of the C preprocessor interprets this as five arguments (with new
-arguments beginning after each comma) rather than three. To get around this,
-there are two alternatives: you can use a type alias, or you can wrap the type
-using the ``PYBIND11_TYPE`` macro:
-
-.. code-block:: cpp
-
- // Version 1: using a type alias
- using ReturnType = MyReturnType<T1, T2>;
- using ClassType = Class<T3, T4>;
- PYBIND11_OVERRIDE(ReturnType, ClassType, func);
-
- // Version 2: using the PYBIND11_TYPE macro:
- PYBIND11_OVERRIDE(PYBIND11_TYPE(MyReturnType<T1, T2>),
- PYBIND11_TYPE(Class<T3, T4>), func)
-
-The ``PYBIND11_MAKE_OPAQUE`` macro does *not* require the above workarounds.
-
-.. _gil:
-
-Global Interpreter Lock (GIL)
-=============================
-
-When calling a C++ function from Python, the GIL is always held.
-The classes :class:`gil_scoped_release` and :class:`gil_scoped_acquire` can be
-used to acquire and release the global interpreter lock in the body of a C++
-function call. In this way, long-running C++ code can be parallelized using
-multiple Python threads. Taking :ref:`overriding_virtuals` as an example, this
-could be realized as follows (important changes highlighted):
-
-.. code-block:: cpp
- :emphasize-lines: 8,9,31,32
-
- class PyAnimal : public Animal {
- public:
- /* Inherit the constructors */
- using Animal::Animal;
-
- /* Trampoline (need one for each virtual function) */
- std::string go(int n_times) {
- /* Acquire GIL before calling Python code */
- py::gil_scoped_acquire acquire;
-
- PYBIND11_OVERRIDE_PURE(
- std::string, /* Return type */
- Animal, /* Parent class */
- go, /* Name of function */
- n_times /* Argument(s) */
- );
- }
- };
-
- PYBIND11_MODULE(example, m) {
- py::class_<Animal, PyAnimal> animal(m, "Animal");
- animal
- .def(py::init<>())
- .def("go", &Animal::go);
-
- py::class_<Dog>(m, "Dog", animal)
- .def(py::init<>());
-
- m.def("call_go", [](Animal *animal) -> std::string {
- /* Release GIL before calling into (potentially long-running) C++ code */
- py::gil_scoped_release release;
- return call_go(animal);
- });
- }
-
-The ``call_go`` wrapper can also be simplified using the `call_guard` policy
-(see :ref:`call_policies`) which yields the same result:
-
-.. code-block:: cpp
-
- m.def("call_go", &call_go, py::call_guard<py::gil_scoped_release>());
-
-
-Binding sequence data types, iterators, the slicing protocol, etc.
-==================================================================
-
-Please refer to the supplemental example for details.
-
-.. seealso::
-
- The file :file:`tests/test_sequences_and_iterators.cpp` contains a
- complete example that shows how to bind a sequence data type, including
- length queries (``__len__``), iterators (``__iter__``), the slicing
- protocol and other kinds of useful operations.
-
-
-Partitioning code over multiple extension modules
-=================================================
-
-It's straightforward to split binding code over multiple extension modules,
-while referencing types that are declared elsewhere. Everything "just" works
-without any special precautions. One exception to this rule occurs when
-extending a type declared in another extension module. Recall the basic example
-from Section :ref:`inheritance`.
-
-.. code-block:: cpp
-
- py::class_<Pet> pet(m, "Pet");
- pet.def(py::init<const std::string &>())
- .def_readwrite("name", &Pet::name);
-
- py::class_<Dog>(m, "Dog", pet /* <- specify parent */)
- .def(py::init<const std::string &>())
- .def("bark", &Dog::bark);
-
-Suppose now that ``Pet`` bindings are defined in a module named ``basic``,
-whereas the ``Dog`` bindings are defined somewhere else. The challenge is of
-course that the variable ``pet`` is not available anymore though it is needed
-to indicate the inheritance relationship to the constructor of ``class_<Dog>``.
-However, it can be acquired as follows:
-
-.. code-block:: cpp
-
- py::object pet = (py::object) py::module_::import("basic").attr("Pet");
-
- py::class_<Dog>(m, "Dog", pet)
- .def(py::init<const std::string &>())
- .def("bark", &Dog::bark);
-
-Alternatively, you can specify the base class as a template parameter option to
-``class_``, which performs an automated lookup of the corresponding Python
-type. Like the above code, however, this also requires invoking the ``import``
-function once to ensure that the pybind11 binding code of the module ``basic``
-has been executed:
-
-.. code-block:: cpp
-
- py::module_::import("basic");
-
- py::class_<Dog, Pet>(m, "Dog")
- .def(py::init<const std::string &>())
- .def("bark", &Dog::bark);
-
-Naturally, both methods will fail when there are cyclic dependencies.
-
-Note that pybind11 code compiled with hidden-by-default symbol visibility (e.g.
-via the command line flag ``-fvisibility=hidden`` on GCC/Clang), which is
-required for proper pybind11 functionality, can interfere with the ability to
-access types defined in another extension module. Working around this requires
-manually exporting types that are accessed by multiple extension modules;
-pybind11 provides a macro to do just this:
-
-.. code-block:: cpp
-
- class PYBIND11_EXPORT Dog : public Animal {
- ...
- };
-
-Note also that it is possible (although would rarely be required) to share arbitrary
-C++ objects between extension modules at runtime. Internal library data is shared
-between modules using capsule machinery [#f6]_ which can be also utilized for
-storing, modifying and accessing user-defined data. Note that an extension module
-will "see" other extensions' data if and only if they were built with the same
-pybind11 version. Consider the following example:
-
-.. code-block:: cpp
-
- auto data = reinterpret_cast<MyData *>(py::get_shared_data("mydata"));
- if (!data)
- data = static_cast<MyData *>(py::set_shared_data("mydata", new MyData(42)));
-
-If the above snippet was used in several separately compiled extension modules,
-the first one to be imported would create a ``MyData`` instance and associate
-a ``"mydata"`` key with a pointer to it. Extensions that are imported later
-would be then able to access the data behind the same pointer.
-
-.. [#f6] https://docs.python.org/3/extending/extending.html#using-capsules
-
-Module Destructors
-==================
-
-pybind11 does not provide an explicit mechanism to invoke cleanup code at
-module destruction time. In rare cases where such functionality is required, it
-is possible to emulate it using Python capsules or weak references with a
-destruction callback.
-
-.. code-block:: cpp
-
- auto cleanup_callback = []() {
- // perform cleanup here -- this function is called with the GIL held
- };
-
- m.add_object("_cleanup", py::capsule(cleanup_callback));
-
-This approach has the potential downside that instances of classes exposed
-within the module may still be alive when the cleanup callback is invoked
-(whether this is acceptable will generally depend on the application).
-
-Alternatively, the capsule may also be stashed within a type object, which
-ensures that it not called before all instances of that type have been
-collected:
-
-.. code-block:: cpp
-
- auto cleanup_callback = []() { /* ... */ };
- m.attr("BaseClass").attr("_cleanup") = py::capsule(cleanup_callback);
-
-Both approaches also expose a potentially dangerous ``_cleanup`` attribute in
-Python, which may be undesirable from an API standpoint (a premature explicit
-call from Python might lead to undefined behavior). Yet another approach that
-avoids this issue involves weak reference with a cleanup callback:
-
-.. code-block:: cpp
-
- // Register a callback function that is invoked when the BaseClass object is collected
- py::cpp_function cleanup_callback(
- [](py::handle weakref) {
- // perform cleanup here -- this function is called with the GIL held
-
- weakref.dec_ref(); // release weak reference
- }
- );
-
- // Create a weak reference with a cleanup callback and initially leak it
- (void) py::weakref(m.attr("BaseClass"), cleanup_callback).release();
-
-.. note::
-
- PyPy does not garbage collect objects when the interpreter exits. An alternative
- approach (which also works on CPython) is to use the :py:mod:`atexit` module [#f7]_,
- for example:
-
- .. code-block:: cpp
-
- auto atexit = py::module_::import("atexit");
- atexit.attr("register")(py::cpp_function([]() {
- // perform cleanup here -- this function is called with the GIL held
- }));
-
- .. [#f7] https://docs.python.org/3/library/atexit.html
-
-
-Generating documentation using Sphinx
-=====================================
-
-Sphinx [#f4]_ has the ability to inspect the signatures and documentation
-strings in pybind11-based extension modules to automatically generate beautiful
-documentation in a variety formats. The python_example repository [#f5]_ contains a
-simple example repository which uses this approach.
-
-There are two potential gotchas when using this approach: first, make sure that
-the resulting strings do not contain any :kbd:`TAB` characters, which break the
-docstring parsing routines. You may want to use C++11 raw string literals,
-which are convenient for multi-line comments. Conveniently, any excess
-indentation will be automatically be removed by Sphinx. However, for this to
-work, it is important that all lines are indented consistently, i.e.:
-
-.. code-block:: cpp
-
- // ok
- m.def("foo", &foo, R"mydelimiter(
- The foo function
-
- Parameters
- ----------
- )mydelimiter");
-
- // *not ok*
- m.def("foo", &foo, R"mydelimiter(The foo function
-
- Parameters
- ----------
- )mydelimiter");
-
-By default, pybind11 automatically generates and prepends a signature to the docstring of a function
-registered with ``module_::def()`` and ``class_::def()``. Sometimes this
-behavior is not desirable, because you want to provide your own signature or remove
-the docstring completely to exclude the function from the Sphinx documentation.
-The class ``options`` allows you to selectively suppress auto-generated signatures:
-
-.. code-block:: cpp
-
- PYBIND11_MODULE(example, m) {
- py::options options;
- options.disable_function_signatures();
-
- m.def("add", [](int a, int b) { return a + b; }, "A function which adds two numbers");
- }
-
-Note that changes to the settings affect only function bindings created during the
-lifetime of the ``options`` instance. When it goes out of scope at the end of the module's init function,
-the default settings are restored to prevent unwanted side effects.
-
-.. [#f4] http://www.sphinx-doc.org
-.. [#f5] http://github.com/pybind/python_example
-
-.. _avoiding-cpp-types-in-docstrings:
-
-Avoiding C++ types in docstrings
-================================
-
-Docstrings are generated at the time of the declaration, e.g. when ``.def(...)`` is called.
-At this point parameter and return types should be known to pybind11.
-If a custom type is not exposed yet through a ``py::class_`` constructor or a custom type caster,
-its C++ type name will be used instead to generate the signature in the docstring:
-
-.. code-block:: text
-
- | __init__(...)
- | __init__(self: example.Foo, arg0: ns::Bar) -> None
- ^^^^^^^
-
-
-This limitation can be circumvented by ensuring that C++ classes are registered with pybind11
-before they are used as a parameter or return type of a function:
-
-.. code-block:: cpp
-
- PYBIND11_MODULE(example, m) {
-
- auto pyFoo = py::class_<ns::Foo>(m, "Foo");
- auto pyBar = py::class_<ns::Bar>(m, "Bar");
-
- pyFoo.def(py::init<const ns::Bar&>());
- pyBar.def(py::init<const ns::Foo&>());
- }
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/index.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/index.rst
deleted file mode 100644
index 6885bdcff1b56bbab5605873ccb1e0676864bb03..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/index.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-Python C++ interface
-####################
-
-pybind11 exposes Python types and functions using thin C++ wrappers, which
-makes it possible to conveniently call Python code from C++ without resorting
-to Python's C API.
-
-.. toctree::
- :maxdepth: 2
-
- object
- numpy
- utilities
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/numpy.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/numpy.rst
deleted file mode 100644
index 19ed10b3bfbd8a6df2300f61589b6ee7d67eb5b1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/numpy.rst
+++ /dev/null
@@ -1,436 +0,0 @@
-.. _numpy:
-
-NumPy
-#####
-
-Buffer protocol
-===============
-
-Python supports an extremely general and convenient approach for exchanging
-data between plugin libraries. Types can expose a buffer view [#f2]_, which
-provides fast direct access to the raw internal data representation. Suppose we
-want to bind the following simplistic Matrix class:
-
-.. code-block:: cpp
-
- class Matrix {
- public:
- Matrix(size_t rows, size_t cols) : m_rows(rows), m_cols(cols) {
- m_data = new float[rows*cols];
- }
- float *data() { return m_data; }
- size_t rows() const { return m_rows; }
- size_t cols() const { return m_cols; }
- private:
- size_t m_rows, m_cols;
- float *m_data;
- };
-
-The following binding code exposes the ``Matrix`` contents as a buffer object,
-making it possible to cast Matrices into NumPy arrays. It is even possible to
-completely avoid copy operations with Python expressions like
-``np.array(matrix_instance, copy = False)``.
-
-.. code-block:: cpp
-
- py::class_<Matrix>(m, "Matrix", py::buffer_protocol())
- .def_buffer([](Matrix &m) -> py::buffer_info {
- return py::buffer_info(
- m.data(), /* Pointer to buffer */
- sizeof(float), /* Size of one scalar */
- py::format_descriptor<float>::format(), /* Python struct-style format descriptor */
- 2, /* Number of dimensions */
- { m.rows(), m.cols() }, /* Buffer dimensions */
- { sizeof(float) * m.cols(), /* Strides (in bytes) for each index */
- sizeof(float) }
- );
- });
-
-Supporting the buffer protocol in a new type involves specifying the special
-``py::buffer_protocol()`` tag in the ``py::class_`` constructor and calling the
-``def_buffer()`` method with a lambda function that creates a
-``py::buffer_info`` description record on demand describing a given matrix
-instance. The contents of ``py::buffer_info`` mirror the Python buffer protocol
-specification.
-
-.. code-block:: cpp
-
- struct buffer_info {
- void *ptr;
- py::ssize_t itemsize;
- std::string format;
- py::ssize_t ndim;
- std::vector<py::ssize_t> shape;
- std::vector<py::ssize_t> strides;
- };
-
-To create a C++ function that can take a Python buffer object as an argument,
-simply use the type ``py::buffer`` as one of its arguments. Buffers can exist
-in a great variety of configurations, hence some safety checks are usually
-necessary in the function body. Below, you can see a basic example on how to
-define a custom constructor for the Eigen double precision matrix
-(``Eigen::MatrixXd``) type, which supports initialization from compatible
-buffer objects (e.g. a NumPy matrix).
-
-.. code-block:: cpp
-
- /* Bind MatrixXd (or some other Eigen type) to Python */
- typedef Eigen::MatrixXd Matrix;
-
- typedef Matrix::Scalar Scalar;
- constexpr bool rowMajor = Matrix::Flags & Eigen::RowMajorBit;
-
- py::class_<Matrix>(m, "Matrix", py::buffer_protocol())
- .def(py::init([](py::buffer b) {
- typedef Eigen::Stride<Eigen::Dynamic, Eigen::Dynamic> Strides;
-
- /* Request a buffer descriptor from Python */
- py::buffer_info info = b.request();
-
- /* Some sanity checks ... */
- if (info.format != py::format_descriptor<Scalar>::format())
- throw std::runtime_error("Incompatible format: expected a double array!");
-
- if (info.ndim != 2)
- throw std::runtime_error("Incompatible buffer dimension!");
-
- auto strides = Strides(
- info.strides[rowMajor ? 0 : 1] / (py::ssize_t)sizeof(Scalar),
- info.strides[rowMajor ? 1 : 0] / (py::ssize_t)sizeof(Scalar));
-
- auto map = Eigen::Map<Matrix, 0, Strides>(
- static_cast<Scalar *>(info.ptr), info.shape[0], info.shape[1], strides);
-
- return Matrix(map);
- }));
-
-For reference, the ``def_buffer()`` call for this Eigen data type should look
-as follows:
-
-.. code-block:: cpp
-
- .def_buffer([](Matrix &m) -> py::buffer_info {
- return py::buffer_info(
- m.data(), /* Pointer to buffer */
- sizeof(Scalar), /* Size of one scalar */
- py::format_descriptor<Scalar>::format(), /* Python struct-style format descriptor */
- 2, /* Number of dimensions */
- { m.rows(), m.cols() }, /* Buffer dimensions */
- { sizeof(Scalar) * (rowMajor ? m.cols() : 1),
- sizeof(Scalar) * (rowMajor ? 1 : m.rows()) }
- /* Strides (in bytes) for each index */
- );
- })
-
-For a much easier approach of binding Eigen types (although with some
-limitations), refer to the section on :doc:`/advanced/cast/eigen`.
-
-.. seealso::
-
- The file :file:`tests/test_buffers.cpp` contains a complete example
- that demonstrates using the buffer protocol with pybind11 in more detail.
-
-.. [#f2] http://docs.python.org/3/c-api/buffer.html
-
-Arrays
-======
-
-By exchanging ``py::buffer`` with ``py::array`` in the above snippet, we can
-restrict the function so that it only accepts NumPy arrays (rather than any
-type of Python object satisfying the buffer protocol).
-
-In many situations, we want to define a function which only accepts a NumPy
-array of a certain data type. This is possible via the ``py::array_t<T>``
-template. For instance, the following function requires the argument to be a
-NumPy array containing double precision values.
-
-.. code-block:: cpp
-
- void f(py::array_t<double> array);
-
-When it is invoked with a different type (e.g. an integer or a list of
-integers), the binding code will attempt to cast the input into a NumPy array
-of the requested type. Note that this feature requires the
-:file:`pybind11/numpy.h` header to be included.
-
-Data in NumPy arrays is not guaranteed to packed in a dense manner;
-furthermore, entries can be separated by arbitrary column and row strides.
-Sometimes, it can be useful to require a function to only accept dense arrays
-using either the C (row-major) or Fortran (column-major) ordering. This can be
-accomplished via a second template argument with values ``py::array::c_style``
-or ``py::array::f_style``.
-
-.. code-block:: cpp
-
- void f(py::array_t<double, py::array::c_style | py::array::forcecast> array);
-
-The ``py::array::forcecast`` argument is the default value of the second
-template parameter, and it ensures that non-conforming arguments are converted
-into an array satisfying the specified requirements instead of trying the next
-function overload.
-
-Structured types
-================
-
-In order for ``py::array_t`` to work with structured (record) types, we first
-need to register the memory layout of the type. This can be done via
-``PYBIND11_NUMPY_DTYPE`` macro, called in the plugin definition code, which
-expects the type followed by field names:
-
-.. code-block:: cpp
-
- struct A {
- int x;
- double y;
- };
-
- struct B {
- int z;
- A a;
- };
-
- // ...
- PYBIND11_MODULE(test, m) {
- // ...
-
- PYBIND11_NUMPY_DTYPE(A, x, y);
- PYBIND11_NUMPY_DTYPE(B, z, a);
- /* now both A and B can be used as template arguments to py::array_t */
- }
-
-The structure should consist of fundamental arithmetic types, ``std::complex``,
-previously registered substructures, and arrays of any of the above. Both C++
-arrays and ``std::array`` are supported. While there is a static assertion to
-prevent many types of unsupported structures, it is still the user's
-responsibility to use only "plain" structures that can be safely manipulated as
-raw memory without violating invariants.
-
-Vectorizing functions
-=====================
-
-Suppose we want to bind a function with the following signature to Python so
-that it can process arbitrary NumPy array arguments (vectors, matrices, general
-N-D arrays) in addition to its normal arguments:
-
-.. code-block:: cpp
-
- double my_func(int x, float y, double z);
-
-After including the ``pybind11/numpy.h`` header, this is extremely simple:
-
-.. code-block:: cpp
-
- m.def("vectorized_func", py::vectorize(my_func));
-
-Invoking the function like below causes 4 calls to be made to ``my_func`` with
-each of the array elements. The significant advantage of this compared to
-solutions like ``numpy.vectorize()`` is that the loop over the elements runs
-entirely on the C++ side and can be crunched down into a tight, optimized loop
-by the compiler. The result is returned as a NumPy array of type
-``numpy.dtype.float64``.
-
-.. code-block:: pycon
-
- >>> x = np.array([[1, 3],[5, 7]])
- >>> y = np.array([[2, 4],[6, 8]])
- >>> z = 3
- >>> result = vectorized_func(x, y, z)
-
-The scalar argument ``z`` is transparently replicated 4 times. The input
-arrays ``x`` and ``y`` are automatically converted into the right types (they
-are of type ``numpy.dtype.int64`` but need to be ``numpy.dtype.int32`` and
-``numpy.dtype.float32``, respectively).
-
-.. note::
-
- Only arithmetic, complex, and POD types passed by value or by ``const &``
- reference are vectorized; all other arguments are passed through as-is.
- Functions taking rvalue reference arguments cannot be vectorized.
-
-In cases where the computation is too complicated to be reduced to
-``vectorize``, it will be necessary to create and access the buffer contents
-manually. The following snippet contains a complete example that shows how this
-works (the code is somewhat contrived, since it could have been done more
-simply using ``vectorize``).
-
-.. code-block:: cpp
-
- #include <pybind11/pybind11.h>
- #include <pybind11/numpy.h>
-
- namespace py = pybind11;
-
- py::array_t<double> add_arrays(py::array_t<double> input1, py::array_t<double> input2) {
- py::buffer_info buf1 = input1.request(), buf2 = input2.request();
-
- if (buf1.ndim != 1 || buf2.ndim != 1)
- throw std::runtime_error("Number of dimensions must be one");
-
- if (buf1.size != buf2.size)
- throw std::runtime_error("Input shapes must match");
-
- /* No pointer is passed, so NumPy will allocate the buffer */
- auto result = py::array_t<double>(buf1.size);
-
- py::buffer_info buf3 = result.request();
-
- double *ptr1 = static_cast<double *>(buf1.ptr);
- double *ptr2 = static_cast<double *>(buf2.ptr);
- double *ptr3 = static_cast<double *>(buf3.ptr);
-
- for (size_t idx = 0; idx < buf1.shape[0]; idx++)
- ptr3[idx] = ptr1[idx] + ptr2[idx];
-
- return result;
- }
-
- PYBIND11_MODULE(test, m) {
- m.def("add_arrays", &add_arrays, "Add two NumPy arrays");
- }
-
-.. seealso::
-
- The file :file:`tests/test_numpy_vectorize.cpp` contains a complete
- example that demonstrates using :func:`vectorize` in more detail.
-
-Direct access
-=============
-
-For performance reasons, particularly when dealing with very large arrays, it
-is often desirable to directly access array elements without internal checking
-of dimensions and bounds on every access when indices are known to be already
-valid. To avoid such checks, the ``array`` class and ``array_t<T>`` template
-class offer an unchecked proxy object that can be used for this unchecked
-access through the ``unchecked<N>`` and ``mutable_unchecked<N>`` methods,
-where ``N`` gives the required dimensionality of the array:
-
-.. code-block:: cpp
-
- m.def("sum_3d", [](py::array_t<double> x) {
- auto r = x.unchecked<3>(); // x must have ndim = 3; can be non-writeable
- double sum = 0;
- for (py::ssize_t i = 0; i < r.shape(0); i++)
- for (py::ssize_t j = 0; j < r.shape(1); j++)
- for (py::ssize_t k = 0; k < r.shape(2); k++)
- sum += r(i, j, k);
- return sum;
- });
- m.def("increment_3d", [](py::array_t<double> x) {
- auto r = x.mutable_unchecked<3>(); // Will throw if ndim != 3 or flags.writeable is false
- for (py::ssize_t i = 0; i < r.shape(0); i++)
- for (py::ssize_t j = 0; j < r.shape(1); j++)
- for (py::ssize_t k = 0; k < r.shape(2); k++)
- r(i, j, k) += 1.0;
- }, py::arg().noconvert());
-
-To obtain the proxy from an ``array`` object, you must specify both the data
-type and number of dimensions as template arguments, such as ``auto r =
-myarray.mutable_unchecked<float, 2>()``.
-
-If the number of dimensions is not known at compile time, you can omit the
-dimensions template parameter (i.e. calling ``arr_t.unchecked()`` or
-``arr.unchecked<T>()``. This will give you a proxy object that works in the
-same way, but results in less optimizable code and thus a small efficiency
-loss in tight loops.
-
-Note that the returned proxy object directly references the array's data, and
-only reads its shape, strides, and writeable flag when constructed. You must
-take care to ensure that the referenced array is not destroyed or reshaped for
-the duration of the returned object, typically by limiting the scope of the
-returned instance.
-
-The returned proxy object supports some of the same methods as ``py::array`` so
-that it can be used as a drop-in replacement for some existing, index-checked
-uses of ``py::array``:
-
-- ``r.ndim()`` returns the number of dimensions
-
-- ``r.data(1, 2, ...)`` and ``r.mutable_data(1, 2, ...)``` returns a pointer to
- the ``const T`` or ``T`` data, respectively, at the given indices. The
- latter is only available to proxies obtained via ``a.mutable_unchecked()``.
-
-- ``itemsize()`` returns the size of an item in bytes, i.e. ``sizeof(T)``.
-
-- ``ndim()`` returns the number of dimensions.
-
-- ``shape(n)`` returns the size of dimension ``n``
-
-- ``size()`` returns the total number of elements (i.e. the product of the shapes).
-
-- ``nbytes()`` returns the number of bytes used by the referenced elements
- (i.e. ``itemsize()`` times ``size()``).
-
-.. seealso::
-
- The file :file:`tests/test_numpy_array.cpp` contains additional examples
- demonstrating the use of this feature.
-
-Ellipsis
-========
-
-Python 3 provides a convenient ``...`` ellipsis notation that is often used to
-slice multidimensional arrays. For instance, the following snippet extracts the
-middle dimensions of a tensor with the first and last index set to zero.
-In Python 2, the syntactic sugar ``...`` is not available, but the singleton
-``Ellipsis`` (of type ``ellipsis``) can still be used directly.
-
-.. code-block:: python
-
- a = # a NumPy array
- b = a[0, ..., 0]
-
-The function ``py::ellipsis()`` function can be used to perform the same
-operation on the C++ side:
-
-.. code-block:: cpp
-
- py::array a = /* A NumPy array */;
- py::array b = a[py::make_tuple(0, py::ellipsis(), 0)];
-
-.. versionchanged:: 2.6
- ``py::ellipsis()`` is now also avaliable in Python 2.
-
-Memory view
-===========
-
-For a case when we simply want to provide a direct accessor to C/C++ buffer
-without a concrete class object, we can return a ``memoryview`` object. Suppose
-we wish to expose a ``memoryview`` for 2x4 uint8_t array, we can do the
-following:
-
-.. code-block:: cpp
-
- const uint8_t buffer[] = {
- 0, 1, 2, 3,
- 4, 5, 6, 7
- };
- m.def("get_memoryview2d", []() {
- return py::memoryview::from_buffer(
- buffer, // buffer pointer
- { 2, 4 }, // shape (rows, cols)
- { sizeof(uint8_t) * 4, sizeof(uint8_t) } // strides in bytes
- );
- })
-
-This approach is meant for providing a ``memoryview`` for a C/C++ buffer not
-managed by Python. The user is responsible for managing the lifetime of the
-buffer. Using a ``memoryview`` created in this way after deleting the buffer in
-C++ side results in undefined behavior.
-
-We can also use ``memoryview::from_memory`` for a simple 1D contiguous buffer:
-
-.. code-block:: cpp
-
- m.def("get_memoryview1d", []() {
- return py::memoryview::from_memory(
- buffer, // buffer pointer
- sizeof(uint8_t) * 8 // buffer size
- );
- })
-
-.. note::
-
- ``memoryview::from_memory`` is not available in Python 2.
-
-.. versionchanged:: 2.6
- ``memoryview::from_memory`` added.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/object.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/object.rst
deleted file mode 100644
index 6c7525ceaf1842f73e8990aceacfae75a7bbe3b2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/object.rst
+++ /dev/null
@@ -1,251 +0,0 @@
-Python types
-############
-
-.. _wrappers:
-
-Available wrappers
-==================
-
-All major Python types are available as thin C++ wrapper classes. These
-can also be used as function parameters -- see :ref:`python_objects_as_args`.
-
-Available types include :class:`handle`, :class:`object`, :class:`bool_`,
-:class:`int_`, :class:`float_`, :class:`str`, :class:`bytes`, :class:`tuple`,
-:class:`list`, :class:`dict`, :class:`slice`, :class:`none`, :class:`capsule`,
-:class:`iterable`, :class:`iterator`, :class:`function`, :class:`buffer`,
-:class:`array`, and :class:`array_t`.
-
-.. warning::
-
- Be sure to review the :ref:`pytypes_gotchas` before using this heavily in
- your C++ API.
-
-.. _casting_back_and_forth:
-
-Casting back and forth
-======================
-
-In this kind of mixed code, it is often necessary to convert arbitrary C++
-types to Python, which can be done using :func:`py::cast`:
-
-.. code-block:: cpp
-
- MyClass *cls = ..;
- py::object obj = py::cast(cls);
-
-The reverse direction uses the following syntax:
-
-.. code-block:: cpp
-
- py::object obj = ...;
- MyClass *cls = obj.cast<MyClass *>();
-
-When conversion fails, both directions throw the exception :class:`cast_error`.
-
-.. _python_libs:
-
-Accessing Python libraries from C++
-===================================
-
-It is also possible to import objects defined in the Python standard
-library or available in the current Python environment (``sys.path``) and work
-with these in C++.
-
-This example obtains a reference to the Python ``Decimal`` class.
-
-.. code-block:: cpp
-
- // Equivalent to "from decimal import Decimal"
- py::object Decimal = py::module_::import("decimal").attr("Decimal");
-
-.. code-block:: cpp
-
- // Try to import scipy
- py::object scipy = py::module_::import("scipy");
- return scipy.attr("__version__");
-
-
-.. _calling_python_functions:
-
-Calling Python functions
-========================
-
-It is also possible to call Python classes, functions and methods
-via ``operator()``.
-
-.. code-block:: cpp
-
- // Construct a Python object of class Decimal
- py::object pi = Decimal("3.14159");
-
-.. code-block:: cpp
-
- // Use Python to make our directories
- py::object os = py::module_::import("os");
- py::object makedirs = os.attr("makedirs");
- makedirs("/tmp/path/to/somewhere");
-
-One can convert the result obtained from Python to a pure C++ version
-if a ``py::class_`` or type conversion is defined.
-
-.. code-block:: cpp
-
- py::function f = <...>;
- py::object result_py = f(1234, "hello", some_instance);
- MyClass &result = result_py.cast<MyClass>();
-
-.. _calling_python_methods:
-
-Calling Python methods
-========================
-
-To call an object's method, one can again use ``.attr`` to obtain access to the
-Python method.
-
-.. code-block:: cpp
-
- // Calculate e^Ï€ in decimal
- py::object exp_pi = pi.attr("exp")();
- py::print(py::str(exp_pi));
-
-In the example above ``pi.attr("exp")`` is a *bound method*: it will always call
-the method for that same instance of the class. Alternately one can create an
-*unbound method* via the Python class (instead of instance) and pass the ``self``
-object explicitly, followed by other arguments.
-
-.. code-block:: cpp
-
- py::object decimal_exp = Decimal.attr("exp");
-
- // Compute the e^n for n=0..4
- for (int n = 0; n < 5; n++) {
- py::print(decimal_exp(Decimal(n));
- }
-
-Keyword arguments
-=================
-
-Keyword arguments are also supported. In Python, there is the usual call syntax:
-
-.. code-block:: python
-
- def f(number, say, to):
- ... # function code
-
- f(1234, say="hello", to=some_instance) # keyword call in Python
-
-In C++, the same call can be made using:
-
-.. code-block:: cpp
-
- using namespace pybind11::literals; // to bring in the `_a` literal
- f(1234, "say"_a="hello", "to"_a=some_instance); // keyword call in C++
-
-Unpacking arguments
-===================
-
-Unpacking of ``*args`` and ``**kwargs`` is also possible and can be mixed with
-other arguments:
-
-.. code-block:: cpp
-
- // * unpacking
- py::tuple args = py::make_tuple(1234, "hello", some_instance);
- f(*args);
-
- // ** unpacking
- py::dict kwargs = py::dict("number"_a=1234, "say"_a="hello", "to"_a=some_instance);
- f(**kwargs);
-
- // mixed keywords, * and ** unpacking
- py::tuple args = py::make_tuple(1234);
- py::dict kwargs = py::dict("to"_a=some_instance);
- f(*args, "say"_a="hello", **kwargs);
-
-Generalized unpacking according to PEP448_ is also supported:
-
-.. code-block:: cpp
-
- py::dict kwargs1 = py::dict("number"_a=1234);
- py::dict kwargs2 = py::dict("to"_a=some_instance);
- f(**kwargs1, "say"_a="hello", **kwargs2);
-
-.. seealso::
-
- The file :file:`tests/test_pytypes.cpp` contains a complete
- example that demonstrates passing native Python types in more detail. The
- file :file:`tests/test_callbacks.cpp` presents a few examples of calling
- Python functions from C++, including keywords arguments and unpacking.
-
-.. _PEP448: https://www.python.org/dev/peps/pep-0448/
-
-.. _implicit_casting:
-
-Implicit casting
-================
-
-When using the C++ interface for Python types, or calling Python functions,
-objects of type :class:`object` are returned. It is possible to invoke implicit
-conversions to subclasses like :class:`dict`. The same holds for the proxy objects
-returned by ``operator[]`` or ``obj.attr()``.
-Casting to subtypes improves code readability and allows values to be passed to
-C++ functions that require a specific subtype rather than a generic :class:`object`.
-
-.. code-block:: cpp
-
- #include <pybind11/numpy.h>
- using namespace pybind11::literals;
-
- py::module_ os = py::module_::import("os");
- py::module_ path = py::module_::import("os.path"); // like 'import os.path as path'
- py::module_ np = py::module_::import("numpy"); // like 'import numpy as np'
-
- py::str curdir_abs = path.attr("abspath")(path.attr("curdir"));
- py::print(py::str("Current directory: ") + curdir_abs);
- py::dict environ = os.attr("environ");
- py::print(environ["HOME"]);
- py::array_t<float> arr = np.attr("ones")(3, "dtype"_a="float32");
- py::print(py::repr(arr + py::int_(1)));
-
-These implicit conversions are available for subclasses of :class:`object`; there
-is no need to call ``obj.cast()`` explicitly as for custom classes, see
-:ref:`casting_back_and_forth`.
-
-.. note::
- If a trivial conversion via move constructor is not possible, both implicit and
- explicit casting (calling ``obj.cast()``) will attempt a "rich" conversion.
- For instance, ``py::list env = os.attr("environ");`` will succeed and is
- equivalent to the Python code ``env = list(os.environ)`` that produces a
- list of the dict keys.
-
-.. TODO: Adapt text once PR #2349 has landed
-
-Handling exceptions
-===================
-
-Python exceptions from wrapper classes will be thrown as a ``py::error_already_set``.
-See :ref:`Handling exceptions from Python in C++
-<handling_python_exceptions_cpp>` for more information on handling exceptions
-raised when calling C++ wrapper classes.
-
-.. _pytypes_gotchas:
-
-Gotchas
-=======
-
-Default-Constructed Wrappers
-----------------------------
-
-When a wrapper type is default-constructed, it is **not** a valid Python object (i.e. it is not ``py::none()``). It is simply the same as
-``PyObject*`` null pointer. To check for this, use
-``static_cast<bool>(my_wrapper)``.
-
-Assigning py::none() to wrappers
---------------------------------
-
-You may be tempted to use types like ``py::str`` and ``py::dict`` in C++
-signatures (either pure C++, or in bound signatures), and assign them default
-values of ``py::none()``. However, in a best case scenario, it will fail fast
-because ``None`` is not convertible to that type (e.g. ``py::dict``), or in a
-worse case scenario, it will silently work but corrupt the types you want to
-work with (e.g. ``py::str(py::none())`` will yield ``"None"`` in Python).
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/utilities.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/utilities.rst
deleted file mode 100644
index c15051fb96ac0d2bfe74e027d6c127e112f04aa2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/pycpp/utilities.rst
+++ /dev/null
@@ -1,144 +0,0 @@
-Utilities
-#########
-
-Using Python's print function in C++
-====================================
-
-The usual way to write output in C++ is using ``std::cout`` while in Python one
-would use ``print``. Since these methods use different buffers, mixing them can
-lead to output order issues. To resolve this, pybind11 modules can use the
-:func:`py::print` function which writes to Python's ``sys.stdout`` for consistency.
-
-Python's ``print`` function is replicated in the C++ API including optional
-keyword arguments ``sep``, ``end``, ``file``, ``flush``. Everything works as
-expected in Python:
-
-.. code-block:: cpp
-
- py::print(1, 2.0, "three"); // 1 2.0 three
- py::print(1, 2.0, "three", "sep"_a="-"); // 1-2.0-three
-
- auto args = py::make_tuple("unpacked", true);
- py::print("->", *args, "end"_a="<-"); // -> unpacked True <-
-
-.. _ostream_redirect:
-
-Capturing standard output from ostream
-======================================
-
-Often, a library will use the streams ``std::cout`` and ``std::cerr`` to print,
-but this does not play well with Python's standard ``sys.stdout`` and ``sys.stderr``
-redirection. Replacing a library's printing with `py::print <print>` may not
-be feasible. This can be fixed using a guard around the library function that
-redirects output to the corresponding Python streams:
-
-.. code-block:: cpp
-
- #include <pybind11/iostream.h>
-
- ...
-
- // Add a scoped redirect for your noisy code
- m.def("noisy_func", []() {
- py::scoped_ostream_redirect stream(
- std::cout, // std::ostream&
- py::module_::import("sys").attr("stdout") // Python output
- );
- call_noisy_func();
- });
-
-This method respects flushes on the output streams and will flush if needed
-when the scoped guard is destroyed. This allows the output to be redirected in
-real time, such as to a Jupyter notebook. The two arguments, the C++ stream and
-the Python output, are optional, and default to standard output if not given. An
-extra type, `py::scoped_estream_redirect <scoped_estream_redirect>`, is identical
-except for defaulting to ``std::cerr`` and ``sys.stderr``; this can be useful with
-`py::call_guard`, which allows multiple items, but uses the default constructor:
-
-.. code-block:: py
-
- // Alternative: Call single function using call guard
- m.def("noisy_func", &call_noisy_function,
- py::call_guard<py::scoped_ostream_redirect,
- py::scoped_estream_redirect>());
-
-The redirection can also be done in Python with the addition of a context
-manager, using the `py::add_ostream_redirect() <add_ostream_redirect>` function:
-
-.. code-block:: cpp
-
- py::add_ostream_redirect(m, "ostream_redirect");
-
-The name in Python defaults to ``ostream_redirect`` if no name is passed. This
-creates the following context manager in Python:
-
-.. code-block:: python
-
- with ostream_redirect(stdout=True, stderr=True):
- noisy_function()
-
-It defaults to redirecting both streams, though you can use the keyword
-arguments to disable one of the streams if needed.
-
-.. note::
-
- The above methods will not redirect C-level output to file descriptors, such
- as ``fprintf``. For those cases, you'll need to redirect the file
- descriptors either directly in C or with Python's ``os.dup2`` function
- in an operating-system dependent way.
-
-.. _eval:
-
-Evaluating Python expressions from strings and files
-====================================================
-
-pybind11 provides the `eval`, `exec` and `eval_file` functions to evaluate
-Python expressions and statements. The following example illustrates how they
-can be used.
-
-.. code-block:: cpp
-
- // At beginning of file
- #include <pybind11/eval.h>
-
- ...
-
- // Evaluate in scope of main module
- py::object scope = py::module_::import("__main__").attr("__dict__");
-
- // Evaluate an isolated expression
- int result = py::eval("my_variable + 10", scope).cast<int>();
-
- // Evaluate a sequence of statements
- py::exec(
- "print('Hello')\n"
- "print('world!');",
- scope);
-
- // Evaluate the statements in an separate Python file on disk
- py::eval_file("script.py", scope);
-
-C++11 raw string literals are also supported and quite handy for this purpose.
-The only requirement is that the first statement must be on a new line following
-the raw string delimiter ``R"(``, ensuring all lines have common leading indent:
-
-.. code-block:: cpp
-
- py::exec(R"(
- x = get_answer()
- if x == 42:
- print('Hello World!')
- else:
- print('Bye!')
- )", scope
- );
-
-.. note::
-
- `eval` and `eval_file` accept a template parameter that describes how the
- string/file should be interpreted. Possible choices include ``eval_expr``
- (isolated expression), ``eval_single_statement`` (a single statement, return
- value is always ``none``), and ``eval_statements`` (sequence of statements,
- return value is always ``none``). `eval` defaults to ``eval_expr``,
- `eval_file` defaults to ``eval_statements`` and `exec` is just a shortcut
- for ``eval<eval_statements>``.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/smart_ptrs.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/smart_ptrs.rst
deleted file mode 100644
index da57748ca585a92000198a6c607a087704b1f07c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/advanced/smart_ptrs.rst
+++ /dev/null
@@ -1,173 +0,0 @@
-Smart pointers
-##############
-
-std::unique_ptr
-===============
-
-Given a class ``Example`` with Python bindings, it's possible to return
-instances wrapped in C++11 unique pointers, like so
-
-.. code-block:: cpp
-
- std::unique_ptr<Example> create_example() { return std::unique_ptr<Example>(new Example()); }
-
-.. code-block:: cpp
-
- m.def("create_example", &create_example);
-
-In other words, there is nothing special that needs to be done. While returning
-unique pointers in this way is allowed, it is *illegal* to use them as function
-arguments. For instance, the following function signature cannot be processed
-by pybind11.
-
-.. code-block:: cpp
-
- void do_something_with_example(std::unique_ptr<Example> ex) { ... }
-
-The above signature would imply that Python needs to give up ownership of an
-object that is passed to this function, which is generally not possible (for
-instance, the object might be referenced elsewhere).
-
-std::shared_ptr
-===============
-
-The binding generator for classes, :class:`class_`, can be passed a template
-type that denotes a special *holder* type that is used to manage references to
-the object. If no such holder type template argument is given, the default for
-a type named ``Type`` is ``std::unique_ptr<Type>``, which means that the object
-is deallocated when Python's reference count goes to zero.
-
-It is possible to switch to other types of reference counting wrappers or smart
-pointers, which is useful in codebases that rely on them. For instance, the
-following snippet causes ``std::shared_ptr`` to be used instead.
-
-.. code-block:: cpp
-
- py::class_<Example, std::shared_ptr<Example> /* <- holder type */> obj(m, "Example");
-
-Note that any particular class can only be associated with a single holder type.
-
-One potential stumbling block when using holder types is that they need to be
-applied consistently. Can you guess what's broken about the following binding
-code?
-
-.. code-block:: cpp
-
- class Child { };
-
- class Parent {
- public:
- Parent() : child(std::make_shared<Child>()) { }
- Child *get_child() { return child.get(); } /* Hint: ** DON'T DO THIS ** */
- private:
- std::shared_ptr<Child> child;
- };
-
- PYBIND11_MODULE(example, m) {
- py::class_<Child, std::shared_ptr<Child>>(m, "Child");
-
- py::class_<Parent, std::shared_ptr<Parent>>(m, "Parent")
- .def(py::init<>())
- .def("get_child", &Parent::get_child);
- }
-
-The following Python code will cause undefined behavior (and likely a
-segmentation fault).
-
-.. code-block:: python
-
- from example import Parent
- print(Parent().get_child())
-
-The problem is that ``Parent::get_child()`` returns a pointer to an instance of
-``Child``, but the fact that this instance is already managed by
-``std::shared_ptr<...>`` is lost when passing raw pointers. In this case,
-pybind11 will create a second independent ``std::shared_ptr<...>`` that also
-claims ownership of the pointer. In the end, the object will be freed **twice**
-since these shared pointers have no way of knowing about each other.
-
-There are two ways to resolve this issue:
-
-1. For types that are managed by a smart pointer class, never use raw pointers
- in function arguments or return values. In other words: always consistently
- wrap pointers into their designated holder types (such as
- ``std::shared_ptr<...>``). In this case, the signature of ``get_child()``
- should be modified as follows:
-
-.. code-block:: cpp
-
- std::shared_ptr<Child> get_child() { return child; }
-
-2. Adjust the definition of ``Child`` by specifying
- ``std::enable_shared_from_this<T>`` (see cppreference_ for details) as a
- base class. This adds a small bit of information to ``Child`` that allows
- pybind11 to realize that there is already an existing
- ``std::shared_ptr<...>`` and communicate with it. In this case, the
- declaration of ``Child`` should look as follows:
-
-.. _cppreference: http://en.cppreference.com/w/cpp/memory/enable_shared_from_this
-
-.. code-block:: cpp
-
- class Child : public std::enable_shared_from_this<Child> { };
-
-.. _smart_pointers:
-
-Custom smart pointers
-=====================
-
-pybind11 supports ``std::unique_ptr`` and ``std::shared_ptr`` right out of the
-box. For any other custom smart pointer, transparent conversions can be enabled
-using a macro invocation similar to the following. It must be declared at the
-top namespace level before any binding code:
-
-.. code-block:: cpp
-
- PYBIND11_DECLARE_HOLDER_TYPE(T, SmartPtr<T>);
-
-The first argument of :func:`PYBIND11_DECLARE_HOLDER_TYPE` should be a
-placeholder name that is used as a template parameter of the second argument.
-Thus, feel free to use any identifier, but use it consistently on both sides;
-also, don't use the name of a type that already exists in your codebase.
-
-The macro also accepts a third optional boolean parameter that is set to false
-by default. Specify
-
-.. code-block:: cpp
-
- PYBIND11_DECLARE_HOLDER_TYPE(T, SmartPtr<T>, true);
-
-if ``SmartPtr<T>`` can always be initialized from a ``T*`` pointer without the
-risk of inconsistencies (such as multiple independent ``SmartPtr`` instances
-believing that they are the sole owner of the ``T*`` pointer). A common
-situation where ``true`` should be passed is when the ``T`` instances use
-*intrusive* reference counting.
-
-Please take a look at the :ref:`macro_notes` before using this feature.
-
-By default, pybind11 assumes that your custom smart pointer has a standard
-interface, i.e. provides a ``.get()`` member function to access the underlying
-raw pointer. If this is not the case, pybind11's ``holder_helper`` must be
-specialized:
-
-.. code-block:: cpp
-
- // Always needed for custom holder types
- PYBIND11_DECLARE_HOLDER_TYPE(T, SmartPtr<T>);
-
- // Only needed if the type's `.get()` goes by another name
- namespace pybind11 { namespace detail {
- template <typename T>
- struct holder_helper<SmartPtr<T>> { // <-- specialization
- static const T *get(const SmartPtr<T> &p) { return p.getPointer(); }
- };
- }}
-
-The above specialization informs pybind11 that the custom ``SmartPtr`` class
-provides ``.get()`` functionality via ``.getPointer()``.
-
-.. seealso::
-
- The file :file:`tests/test_smart_ptr.cpp` contains a complete example
- that demonstrates how to work with custom reference-counting holder types
- in more detail.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/basics.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/basics.rst
deleted file mode 100644
index 0681d86ac8a3e505cf44bb2f68429c3443ecbc33..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/basics.rst
+++ /dev/null
@@ -1,301 +0,0 @@
-.. _basics:
-
-First steps
-###########
-
-This sections demonstrates the basic features of pybind11. Before getting
-started, make sure that development environment is set up to compile the
-included set of test cases.
-
-
-Compiling the test cases
-========================
-
-Linux/macOS
------------
-
-On Linux you'll need to install the **python-dev** or **python3-dev** packages as
-well as **cmake**. On macOS, the included python version works out of the box,
-but **cmake** must still be installed.
-
-After installing the prerequisites, run
-
-.. code-block:: bash
-
- mkdir build
- cd build
- cmake ..
- make check -j 4
-
-The last line will both compile and run the tests.
-
-Windows
--------
-
-On Windows, only **Visual Studio 2015** and newer are supported since pybind11 relies
-on various C++11 language features that break older versions of Visual Studio.
-
-.. Note::
-
- To use the C++17 in Visual Studio 2017 (MSVC 14.1), pybind11 requires the flag
- ``/permissive-`` to be passed to the compiler `to enforce standard conformance`_. When
- building with Visual Studio 2019, this is not strictly necessary, but still adviced.
-
-.. _`to enforce standard conformance`: https://docs.microsoft.com/en-us/cpp/build/reference/permissive-standards-conformance?view=vs-2017
-
-To compile and run the tests:
-
-.. code-block:: batch
-
- mkdir build
- cd build
- cmake ..
- cmake --build . --config Release --target check
-
-This will create a Visual Studio project, compile and run the target, all from the
-command line.
-
-.. Note::
-
- If all tests fail, make sure that the Python binary and the testcases are compiled
- for the same processor type and bitness (i.e. either **i386** or **x86_64**). You
- can specify **x86_64** as the target architecture for the generated Visual Studio
- project using ``cmake -A x64 ..``.
-
-.. seealso::
-
- Advanced users who are already familiar with Boost.Python may want to skip
- the tutorial and look at the test cases in the :file:`tests` directory,
- which exercise all features of pybind11.
-
-Header and namespace conventions
-================================
-
-For brevity, all code examples assume that the following two lines are present:
-
-.. code-block:: cpp
-
- #include <pybind11/pybind11.h>
-
- namespace py = pybind11;
-
-Some features may require additional headers, but those will be specified as needed.
-
-.. _simple_example:
-
-Creating bindings for a simple function
-=======================================
-
-Let's start by creating Python bindings for an extremely simple function, which
-adds two numbers and returns their result:
-
-.. code-block:: cpp
-
- int add(int i, int j) {
- return i + j;
- }
-
-For simplicity [#f1]_, we'll put both this function and the binding code into
-a file named :file:`example.cpp` with the following contents:
-
-.. code-block:: cpp
-
- #include <pybind11/pybind11.h>
-
- int add(int i, int j) {
- return i + j;
- }
-
- PYBIND11_MODULE(example, m) {
- m.doc() = "pybind11 example plugin"; // optional module docstring
-
- m.def("add", &add, "A function which adds two numbers");
- }
-
-.. [#f1] In practice, implementation and binding code will generally be located
- in separate files.
-
-The :func:`PYBIND11_MODULE` macro creates a function that will be called when an
-``import`` statement is issued from within Python. The module name (``example``)
-is given as the first macro argument (it should not be in quotes). The second
-argument (``m``) defines a variable of type :class:`py::module_ <module>` which
-is the main interface for creating bindings. The method :func:`module_::def`
-generates binding code that exposes the ``add()`` function to Python.
-
-.. note::
-
- Notice how little code was needed to expose our function to Python: all
- details regarding the function's parameters and return value were
- automatically inferred using template metaprogramming. This overall
- approach and the used syntax are borrowed from Boost.Python, though the
- underlying implementation is very different.
-
-pybind11 is a header-only library, hence it is not necessary to link against
-any special libraries and there are no intermediate (magic) translation steps.
-On Linux, the above example can be compiled using the following command:
-
-.. code-block:: bash
-
- $ c++ -O3 -Wall -shared -std=c++11 -fPIC `python3 -m pybind11 --includes` example.cpp -o example`python3-config --extension-suffix`
-
-For more details on the required compiler flags on Linux and macOS, see
-:ref:`building_manually`. For complete cross-platform compilation instructions,
-refer to the :ref:`compiling` page.
-
-The `python_example`_ and `cmake_example`_ repositories are also a good place
-to start. They are both complete project examples with cross-platform build
-systems. The only difference between the two is that `python_example`_ uses
-Python's ``setuptools`` to build the module, while `cmake_example`_ uses CMake
-(which may be preferable for existing C++ projects).
-
-.. _python_example: https://github.com/pybind/python_example
-.. _cmake_example: https://github.com/pybind/cmake_example
-
-Building the above C++ code will produce a binary module file that can be
-imported to Python. Assuming that the compiled module is located in the
-current directory, the following interactive Python session shows how to
-load and execute the example:
-
-.. code-block:: pycon
-
- $ python
- Python 2.7.10 (default, Aug 22 2015, 20:33:39)
- [GCC 4.2.1 Compatible Apple LLVM 7.0.0 (clang-700.0.59.1)] on darwin
- Type "help", "copyright", "credits" or "license" for more information.
- >>> import example
- >>> example.add(1, 2)
- 3L
- >>>
-
-.. _keyword_args:
-
-Keyword arguments
-=================
-
-With a simple code modification, it is possible to inform Python about the
-names of the arguments ("i" and "j" in this case).
-
-.. code-block:: cpp
-
- m.def("add", &add, "A function which adds two numbers",
- py::arg("i"), py::arg("j"));
-
-:class:`arg` is one of several special tag classes which can be used to pass
-metadata into :func:`module_::def`. With this modified binding code, we can now
-call the function using keyword arguments, which is a more readable alternative
-particularly for functions taking many parameters:
-
-.. code-block:: pycon
-
- >>> import example
- >>> example.add(i=1, j=2)
- 3L
-
-The keyword names also appear in the function signatures within the documentation.
-
-.. code-block:: pycon
-
- >>> help(example)
-
- ....
-
- FUNCTIONS
- add(...)
- Signature : (i: int, j: int) -> int
-
- A function which adds two numbers
-
-A shorter notation for named arguments is also available:
-
-.. code-block:: cpp
-
- // regular notation
- m.def("add1", &add, py::arg("i"), py::arg("j"));
- // shorthand
- using namespace pybind11::literals;
- m.def("add2", &add, "i"_a, "j"_a);
-
-The :var:`_a` suffix forms a C++11 literal which is equivalent to :class:`arg`.
-Note that the literal operator must first be made visible with the directive
-``using namespace pybind11::literals``. This does not bring in anything else
-from the ``pybind11`` namespace except for literals.
-
-.. _default_args:
-
-Default arguments
-=================
-
-Suppose now that the function to be bound has default arguments, e.g.:
-
-.. code-block:: cpp
-
- int add(int i = 1, int j = 2) {
- return i + j;
- }
-
-Unfortunately, pybind11 cannot automatically extract these parameters, since they
-are not part of the function's type information. However, they are simple to specify
-using an extension of :class:`arg`:
-
-.. code-block:: cpp
-
- m.def("add", &add, "A function which adds two numbers",
- py::arg("i") = 1, py::arg("j") = 2);
-
-The default values also appear within the documentation.
-
-.. code-block:: pycon
-
- >>> help(example)
-
- ....
-
- FUNCTIONS
- add(...)
- Signature : (i: int = 1, j: int = 2) -> int
-
- A function which adds two numbers
-
-The shorthand notation is also available for default arguments:
-
-.. code-block:: cpp
-
- // regular notation
- m.def("add1", &add, py::arg("i") = 1, py::arg("j") = 2);
- // shorthand
- m.def("add2", &add, "i"_a=1, "j"_a=2);
-
-Exporting variables
-===================
-
-To expose a value from C++, use the ``attr`` function to register it in a
-module as shown below. Built-in types and general objects (more on that later)
-are automatically converted when assigned as attributes, and can be explicitly
-converted using the function ``py::cast``.
-
-.. code-block:: cpp
-
- PYBIND11_MODULE(example, m) {
- m.attr("the_answer") = 42;
- py::object world = py::cast("World");
- m.attr("what") = world;
- }
-
-These are then accessible from Python:
-
-.. code-block:: pycon
-
- >>> import example
- >>> example.the_answer
- 42
- >>> example.what
- 'World'
-
-.. _supported_types:
-
-Supported data types
-====================
-
-A large number of data types are supported out of the box and can be used
-seamlessly as functions arguments, return values or with ``py::cast`` in general.
-For a full overview, see the :doc:`advanced/cast/index` section.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/benchmark.py b/3rdParty/pybind11/pybind11-2.6.0/docs/benchmark.py
deleted file mode 100644
index 33d78fb4e6dc7bd1b99ed5647d33660c80d064b0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/benchmark.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-import random
-import os
-import time
-import datetime as dt
-
-nfns = 4 # Functions per class
-nargs = 4 # Arguments per function
-
-
-def generate_dummy_code_pybind11(nclasses=10):
- decl = ""
- bindings = ""
-
- for cl in range(nclasses):
- decl += "class cl%03i;\n" % cl
- decl += "\n"
-
- for cl in range(nclasses):
- decl += "class cl%03i {\n" % cl
- decl += "public:\n"
- bindings += ' py::class_<cl%03i>(m, "cl%03i")\n' % (cl, cl)
- for fn in range(nfns):
- ret = random.randint(0, nclasses - 1)
- params = [random.randint(0, nclasses - 1) for i in range(nargs)]
- decl += " cl%03i *fn_%03i(" % (ret, fn)
- decl += ", ".join("cl%03i *" % p for p in params)
- decl += ");\n"
- bindings += ' .def("fn_%03i", &cl%03i::fn_%03i)\n' % (fn, cl, fn)
- decl += "};\n\n"
- bindings += " ;\n"
-
- result = "#include <pybind11/pybind11.h>\n\n"
- result += "namespace py = pybind11;\n\n"
- result += decl + "\n"
- result += "PYBIND11_MODULE(example, m) {\n"
- result += bindings
- result += "}"
- return result
-
-
-def generate_dummy_code_boost(nclasses=10):
- decl = ""
- bindings = ""
-
- for cl in range(nclasses):
- decl += "class cl%03i;\n" % cl
- decl += "\n"
-
- for cl in range(nclasses):
- decl += "class cl%03i {\n" % cl
- decl += "public:\n"
- bindings += ' py::class_<cl%03i>("cl%03i")\n' % (cl, cl)
- for fn in range(nfns):
- ret = random.randint(0, nclasses - 1)
- params = [random.randint(0, nclasses - 1) for i in range(nargs)]
- decl += " cl%03i *fn_%03i(" % (ret, fn)
- decl += ", ".join("cl%03i *" % p for p in params)
- decl += ");\n"
- bindings += (
- ' .def("fn_%03i", &cl%03i::fn_%03i, py::return_value_policy<py::manage_new_object>())\n'
- % (fn, cl, fn)
- )
- decl += "};\n\n"
- bindings += " ;\n"
-
- result = "#include <boost/python.hpp>\n\n"
- result += "namespace py = boost::python;\n\n"
- result += decl + "\n"
- result += "BOOST_PYTHON_MODULE(example) {\n"
- result += bindings
- result += "}"
- return result
-
-
-for codegen in [generate_dummy_code_pybind11, generate_dummy_code_boost]:
- print("{")
- for i in range(0, 10):
- nclasses = 2 ** i
- with open("test.cpp", "w") as f:
- f.write(codegen(nclasses))
- n1 = dt.datetime.now()
- os.system(
- "g++ -Os -shared -rdynamic -undefined dynamic_lookup "
- "-fvisibility=hidden -std=c++14 test.cpp -I include "
- "-I /System/Library/Frameworks/Python.framework/Headers -o test.so"
- )
- n2 = dt.datetime.now()
- elapsed = (n2 - n1).total_seconds()
- size = os.stat("test.so").st_size
- print(" {%i, %f, %i}," % (nclasses * nfns, elapsed, size))
- print("}")
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/benchmark.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/benchmark.rst
deleted file mode 100644
index 02c2ccde7dc00db1e57b73a7523521f9c39a5639..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/benchmark.rst
+++ /dev/null
@@ -1,95 +0,0 @@
-Benchmark
-=========
-
-The following is the result of a synthetic benchmark comparing both compilation
-time and module size of pybind11 against Boost.Python. A detailed report about a
-Boost.Python to pybind11 conversion of a real project is available here: [#f1]_.
-
-.. [#f1] http://graylab.jhu.edu/RosettaCon2016/PyRosetta-4.pdf
-
-Setup
------
-
-A python script (see the ``docs/benchmark.py`` file) was used to generate a set
-of files with dummy classes whose count increases for each successive benchmark
-(between 1 and 2048 classes in powers of two). Each class has four methods with
-a randomly generated signature with a return value and four arguments. (There
-was no particular reason for this setup other than the desire to generate many
-unique function signatures whose count could be controlled in a simple way.)
-
-Here is an example of the binding code for one class:
-
-.. code-block:: cpp
-
- ...
- class cl034 {
- public:
- cl279 *fn_000(cl084 *, cl057 *, cl065 *, cl042 *);
- cl025 *fn_001(cl098 *, cl262 *, cl414 *, cl121 *);
- cl085 *fn_002(cl445 *, cl297 *, cl145 *, cl421 *);
- cl470 *fn_003(cl200 *, cl323 *, cl332 *, cl492 *);
- };
- ...
-
- PYBIND11_MODULE(example, m) {
- ...
- py::class_<cl034>(m, "cl034")
- .def("fn_000", &cl034::fn_000)
- .def("fn_001", &cl034::fn_001)
- .def("fn_002", &cl034::fn_002)
- .def("fn_003", &cl034::fn_003)
- ...
- }
-
-The Boost.Python version looks almost identical except that a return value
-policy had to be specified as an argument to ``def()``. For both libraries,
-compilation was done with
-
-.. code-block:: bash
-
- Apple LLVM version 7.0.2 (clang-700.1.81)
-
-and the following compilation flags
-
-.. code-block:: bash
-
- g++ -Os -shared -rdynamic -undefined dynamic_lookup -fvisibility=hidden -std=c++14
-
-Compilation time
-----------------
-
-The following log-log plot shows how the compilation time grows for an
-increasing number of class and function declarations. pybind11 includes many
-fewer headers, which initially leads to shorter compilation times, but the
-performance is ultimately fairly similar (pybind11 is 19.8 seconds faster for
-the largest largest file with 2048 classes and a total of 8192 methods -- a
-modest **1.2x** speedup relative to Boost.Python, which required 116.35
-seconds).
-
-.. only:: not latex
-
- .. image:: pybind11_vs_boost_python1.svg
-
-.. only:: latex
-
- .. image:: pybind11_vs_boost_python1.png
-
-Module size
------------
-
-Differences between the two libraries become much more pronounced when
-considering the file size of the generated Python plugin: for the largest file,
-the binary generated by Boost.Python required 16.8 MiB, which was **2.17
-times** / **9.1 megabytes** larger than the output generated by pybind11. For
-very small inputs, Boost.Python has an edge in the plot below -- however, note
-that it stores many definitions in an external library, whose size was not
-included here, hence the comparison is slightly shifted in Boost.Python's
-favor.
-
-.. only:: not latex
-
- .. image:: pybind11_vs_boost_python2.svg
-
-.. only:: latex
-
- .. image:: pybind11_vs_boost_python2.png
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/changelog.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/changelog.rst
deleted file mode 100644
index da1b51944733e8340d655919976f9cddfe83ea35..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/changelog.rst
+++ /dev/null
@@ -1,1516 +0,0 @@
-.. _changelog:
-
-Changelog
-#########
-
-Starting with version 1.8.0, pybind11 releases use a `semantic versioning
-<http://semver.org>`_ policy.
-
-v2.6.0 (Oct 21, 2020)
----------------------
-
-See :ref:`upgrade-guide-2.6` for help upgrading to the new version.
-
-New features:
-
-* Keyword-only arguments supported in Python 2 or 3 with ``py::kw_only()``.
- `#2100 <https://github.com/pybind/pybind11/pull/2100>`_
-
-* Positional-only arguments supported in Python 2 or 3 with ``py::pos_only()``.
- `#2459 <https://github.com/pybind/pybind11/pull/2459>`_
-
-* ``py::is_final()`` class modifier to block subclassing (CPython only).
- `#2151 <https://github.com/pybind/pybind11/pull/2151>`_
-
-* Added ``py::prepend()``, allowing a function to be placed at the beginning of
- the overload chain.
- `#1131 <https://github.com/pybind/pybind11/pull/1131>`_
-
-* Access to the type object now provided with ``py::type::of<T>()`` and
- ``py::type::of(h)``.
- `#2364 <https://github.com/pybind/pybind11/pull/2364>`_
-
-* Perfect forwarding support for methods.
- `#2048 <https://github.com/pybind/pybind11/pull/2048>`_
-
-* Added ``py::error_already_set::discard_as_unraisable()``.
- `#2372 <https://github.com/pybind/pybind11/pull/2372>`_
-
-* ``py::hash`` is now public.
- `#2217 <https://github.com/pybind/pybind11/pull/2217>`_
-
-* ``py::class_<union_type>`` is now supported. Note that writing to one data
- member of the union and reading another (type punning) is UB in C++. Thus
- pybind11-bound enums should never be used for such conversions.
- `#2320 <https://github.com/pybind/pybind11/pull/2320>`_.
-
-* Classes now check local scope when registering members, allowing a subclass
- to have a member with the same name as a parent (such as an enum).
- `#2335 <https://github.com/pybind/pybind11/pull/2335>`_
-
-Code correctness features:
-
-* Error now thrown when ``__init__`` is forgotten on subclasses.
- `#2152 <https://github.com/pybind/pybind11/pull/2152>`_
-
-* Throw error if conversion to a pybind11 type if the Python object isn't a
- valid instance of that type, such as ``py::bytes(o)`` when ``py::object o``
- isn't a bytes instance.
- `#2349 <https://github.com/pybind/pybind11/pull/2349>`_
-
-* Throw if conversion to ``str`` fails.
- `#2477 <https://github.com/pybind/pybind11/pull/2477>`_
-
-
-API changes:
-
-* ``py::module`` was renamed ``py::module_`` to avoid issues with C++20 when
- used unqualified, but an alias ``py::module`` is provided for backward
- compatibility.
- `#2489 <https://github.com/pybind/pybind11/pull/2489>`_
-
-* Public constructors for ``py::module_`` have been deprecated; please use
- ``pybind11::module_::create_extension_module`` if you were using the public
- constructor (fairly rare after ``PYBIND11_MODULE`` was introduced).
- `#2552 <https://github.com/pybind/pybind11/pull/2552>`_
-
-* ``PYBIND11_OVERLOAD*`` macros and ``get_overload`` function replaced by
- correctly-named ``PYBIND11_OVERRIDE*`` and ``get_override``, fixing
- inconsistencies in the presence of a closing ``;`` in these macros.
- ``get_type_overload`` is deprecated.
- `#2325 <https://github.com/pybind/pybind11/pull/2325>`_
-
-Packaging / building improvements:
-
-* The Python package was reworked to be more powerful and useful.
- `#2433 <https://github.com/pybind/pybind11/pull/2433>`_
-
- * :ref:`build-setuptools` is easier thanks to a new
- ``pybind11.setup_helpers`` module, which provides utilities to use
- setuptools with pybind11. It can be used via PEP 518, ``setup_requires``,
- or by directly importing or copying ``setup_helpers.py`` into your project.
-
- * CMake configuration files are now included in the Python package. Use
- ``pybind11.get_cmake_dir()`` or ``python -m pybind11 --cmakedir`` to get
- the directory with the CMake configuration files, or include the
- site-packages location in your ``CMAKE_MODULE_PATH``. Or you can use the
- new ``pybind11[global]`` extra when you install ``pybind11``, which
- installs the CMake files and headers into your base environment in the
- standard location.
-
- * ``pybind11-config`` is another way to write ``python -m pybind11`` if you
- have your PATH set up.
-
- * Added external typing support to the helper module, code from
- ``import pybind11`` can now be type checked.
- `#2588 <https://github.com/pybind/pybind11/pull/2588>`_
-
-* Minimum CMake required increased to 3.4.
- `#2338 <https://github.com/pybind/pybind11/pull/2338>`_ and
- `#2370 <https://github.com/pybind/pybind11/pull/2370>`_
-
- * Full integration with CMake’s C++ standard system and compile features
- replaces ``PYBIND11_CPP_STANDARD``.
-
- * Generated config file is now portable to different Python/compiler/CMake
- versions.
-
- * Virtual environments prioritized if ``PYTHON_EXECUTABLE`` is not set
- (``venv``, ``virtualenv``, and ``conda``) (similar to the new FindPython
- mode).
-
- * Other CMake features now natively supported, like
- ``CMAKE_INTERPROCEDURAL_OPTIMIZATION``, ``set(CMAKE_CXX_VISIBILITY_PRESET
- hidden)``.
-
- * ``CUDA`` as a language is now supported.
-
- * Helper functions ``pybind11_strip``, ``pybind11_extension``,
- ``pybind11_find_import`` added, see :doc:`cmake/index`.
-
- * Optional :ref:`find-python-mode` and :ref:`nopython-mode` with CMake.
- `#2370 <https://github.com/pybind/pybind11/pull/2370>`_
-
-* Uninstall target added.
- `#2265 <https://github.com/pybind/pybind11/pull/2265>`_ and
- `#2346 <https://github.com/pybind/pybind11/pull/2346>`_
-
-* ``pybind11_add_module()`` now accepts an optional ``OPT_SIZE`` flag that
- switches the binding target to size-based optimization if the global build
- type can not always be fixed to ``MinSizeRel`` (except in debug mode, where
- optimizations remain disabled). ``MinSizeRel`` or this flag reduces binary
- size quite substantially (~25% on some platforms).
- `#2463 <https://github.com/pybind/pybind11/pull/2463>`_
-
-Smaller or developer focused features and fixes:
-
-* Moved ``mkdoc.py`` to a new repo, `pybind11-mkdoc`_. There are no longer
- submodules in the main repo.
-
-* ``py::memoryview`` segfault fix and update, with new
- ``py::memoryview::from_memory`` in Python 3, and documentation.
- `#2223 <https://github.com/pybind/pybind11/pull/2223>`_
-
-* Fix for ``buffer_info`` on Python 2.
- `#2503 <https://github.com/pybind/pybind11/pull/2503>`_
-
-* If ``__eq__`` defined but not ``__hash__``, ``__hash__`` is now set to
- ``None``.
- `#2291 <https://github.com/pybind/pybind11/pull/2291>`_
-
-* ``py::ellipsis`` now also works on Python 2.
- `#2360 <https://github.com/pybind/pybind11/pull/2360>`_
-
-* Pointer to ``std::tuple`` & ``std::pair`` supported in cast.
- `#2334 <https://github.com/pybind/pybind11/pull/2334>`_
-
-* Small fixes in NumPy support. ``py::array`` now uses ``py::ssize_t`` as first
- argument type.
- `#2293 <https://github.com/pybind/pybind11/pull/2293>`_
-
-* Added missing signature for ``py::array``.
- `#2363 <https://github.com/pybind/pybind11/pull/2363>`_
-
-* ``unchecked_mutable_reference`` has access to operator ``()`` and ``[]`` when
- const.
- `#2514 <https://github.com/pybind/pybind11/pull/2514>`_
-
-* ``py::vectorize`` is now supported on functions that return void.
- `#1969 <https://github.com/pybind/pybind11/pull/1969>`_
-
-* ``py::capsule`` supports ``get_pointer`` and ``set_pointer``.
- `#1131 <https://github.com/pybind/pybind11/pull/1131>`_
-
-* Fix crash when different instances share the same pointer of the same type.
- `#2252 <https://github.com/pybind/pybind11/pull/2252>`_
-
-* Fix for ``py::len`` not clearing Python's error state when it fails and throws.
- `#2575 <https://github.com/pybind/pybind11/pull/2575>`_
-
-* Bugfixes related to more extensive testing, new GitHub Actions CI.
- `#2321 <https://github.com/pybind/pybind11/pull/2321>`_
-
-* Bug in timezone issue in Eastern hemisphere midnight fixed.
- `#2438 <https://github.com/pybind/pybind11/pull/2438>`_
-
-* ``std::chrono::time_point`` now works when the resolution is not the same as
- the system.
- `#2481 <https://github.com/pybind/pybind11/pull/2481>`_
-
-* Bug fixed where ``py::array_t`` could accept arrays that did not match the
- requested ordering.
- `#2484 <https://github.com/pybind/pybind11/pull/2484>`_
-
-* Avoid a segfault on some compilers when types are removed in Python.
- `#2564 <https://github.com/pybind/pybind11/pull/2564>`_
-
-* ``py::arg::none()`` is now also respected when passing keyword arguments.
- `#2611 <https://github.com/pybind/pybind11/pull/2611>`_
-
-* PyPy fixes, PyPy 7.3.x now supported, including PyPy3. (Known issue with
- PyPy2 and Windows `#2596 <https://github.com/pybind/pybind11/issues/2596>`_).
- `#2146 <https://github.com/pybind/pybind11/pull/2146>`_
-
-* CPython 3.9.0 workaround for undefined behavior (macOS segfault).
- `#2576 <https://github.com/pybind/pybind11/pull/2576>`_
-
-* CPython 3.9 warning fixes.
- `#2253 <https://github.com/pybind/pybind11/pull/2253>`_
-
-* Improved C++20 support, now tested in CI.
- `#2489 <https://github.com/pybind/pybind11/pull/2489>`_
- `#2599 <https://github.com/pybind/pybind11/pull/2599>`_
-
-* Improved but still incomplete debug Python interpreter support.
- `#2025 <https://github.com/pybind/pybind11/pull/2025>`_
-
-* NVCC (CUDA 11) now supported and tested in CI.
- `#2461 <https://github.com/pybind/pybind11/pull/2461>`_
-
-* NVIDIA PGI compilers now supported and tested in CI.
- `#2475 <https://github.com/pybind/pybind11/pull/2475>`_
-
-* At least Intel 18 now explicitly required when compiling with Intel.
- `#2577 <https://github.com/pybind/pybind11/pull/2577>`_
-
-* Extensive style checking in CI, with `pre-commit`_ support. Code
- modernization, checked by clang-tidy.
-
-* Expanded docs, including new main page, new installing section, and CMake
- helpers page, along with over a dozen new sections on existing pages.
-
-* In GitHub, new docs for contributing and new issue templates.
-
-.. _pre-commit: https://pre-commit.com
-
-.. _pybind11-mkdoc: https://github.com/pybind/pybind11-mkdoc
-
-v2.5.0 (Mar 31, 2020)
------------------------------------------------------
-
-* Use C++17 fold expressions in type casters, if available. This can
- improve performance during overload resolution when functions have
- multiple arguments.
- `#2043 <https://github.com/pybind/pybind11/pull/2043>`_.
-
-* Changed include directory resolution in ``pybind11/__init__.py``
- and installation in ``setup.py``. This fixes a number of open issues
- where pybind11 headers could not be found in certain environments.
- `#1995 <https://github.com/pybind/pybind11/pull/1995>`_.
-
-* C++20 ``char8_t`` and ``u8string`` support. `#2026
- <https://github.com/pybind/pybind11/pull/2026>`_.
-
-* CMake: search for Python 3.9. `bb9c91
- <https://github.com/pybind/pybind11/commit/bb9c91>`_.
-
-* Fixes for MSYS-based build environments.
- `#2087 <https://github.com/pybind/pybind11/pull/2087>`_,
- `#2053 <https://github.com/pybind/pybind11/pull/2053>`_.
-
-* STL bindings for ``std::vector<...>::clear``. `#2074
- <https://github.com/pybind/pybind11/pull/2074>`_.
-
-* Read-only flag for ``py::buffer``. `#1466
- <https://github.com/pybind/pybind11/pull/1466>`_.
-
-* Exception handling during module initialization.
- `bf2b031 <https://github.com/pybind/pybind11/commit/bf2b031>`_.
-
-* Support linking against a CPython debug build.
- `#2025 <https://github.com/pybind/pybind11/pull/2025>`_.
-
-* Fixed issues involving the availability and use of aligned ``new`` and
- ``delete``. `#1988 <https://github.com/pybind/pybind11/pull/1988>`_,
- `759221 <https://github.com/pybind/pybind11/commit/759221>`_.
-
-* Fixed a resource leak upon interpreter shutdown.
- `#2020 <https://github.com/pybind/pybind11/pull/2020>`_.
-
-* Fixed error handling in the boolean caster.
- `#1976 <https://github.com/pybind/pybind11/pull/1976>`_.
-
-v2.4.3 (Oct 15, 2019)
------------------------------------------------------
-
-* Adapt pybind11 to a C API convention change in Python 3.8. `#1950
- <https://github.com/pybind/pybind11/pull/1950>`_.
-
-v2.4.2 (Sep 21, 2019)
------------------------------------------------------
-
-* Replaced usage of a C++14 only construct. `#1929
- <https://github.com/pybind/pybind11/pull/1929>`_.
-
-* Made an ifdef future-proof for Python >= 4. `f3109d
- <https://github.com/pybind/pybind11/commit/f3109d>`_.
-
-v2.4.1 (Sep 20, 2019)
------------------------------------------------------
-
-* Fixed a problem involving implicit conversion from enumerations to integers
- on Python 3.8. `#1780 <https://github.com/pybind/pybind11/pull/1780>`_.
-
-v2.4.0 (Sep 19, 2019)
------------------------------------------------------
-
-* Try harder to keep pybind11-internal data structures separate when there
- are potential ABI incompatibilities. Fixes crashes that occurred when loading
- multiple pybind11 extensions that were e.g. compiled by GCC (libstdc++)
- and Clang (libc++).
- `#1588 <https://github.com/pybind/pybind11/pull/1588>`_ and
- `c9f5a <https://github.com/pybind/pybind11/commit/c9f5a>`_.
-
-* Added support for ``__await__``, ``__aiter__``, and ``__anext__`` protocols.
- `#1842 <https://github.com/pybind/pybind11/pull/1842>`_.
-
-* ``pybind11_add_module()``: don't strip symbols when compiling in
- ``RelWithDebInfo`` mode. `#1980
- <https://github.com/pybind/pybind11/pull/1980>`_.
-
-* ``enum_``: Reproduce Python behavior when comparing against invalid values
- (e.g. ``None``, strings, etc.). Add back support for ``__invert__()``.
- `#1912 <https://github.com/pybind/pybind11/pull/1912>`_,
- `#1907 <https://github.com/pybind/pybind11/pull/1907>`_.
-
-* List insertion operation for ``py::list``.
- Added ``.empty()`` to all collection types.
- Added ``py::set::contains()`` and ``py::dict::contains()``.
- `#1887 <https://github.com/pybind/pybind11/pull/1887>`_,
- `#1884 <https://github.com/pybind/pybind11/pull/1884>`_,
- `#1888 <https://github.com/pybind/pybind11/pull/1888>`_.
-
-* ``py::details::overload_cast_impl`` is available in C++11 mode, can be used
- like ``overload_cast`` with an additional set of parantheses.
- `#1581 <https://github.com/pybind/pybind11/pull/1581>`_.
-
-* Fixed ``get_include()`` on Conda.
- `#1877 <https://github.com/pybind/pybind11/pull/1877>`_.
-
-* ``stl_bind.h``: negative indexing support.
- `#1882 <https://github.com/pybind/pybind11/pull/1882>`_.
-
-* Minor CMake fix to add MinGW compatibility.
- `#1851 <https://github.com/pybind/pybind11/pull/1851>`_.
-
-* GIL-related fixes.
- `#1836 <https://github.com/pybind/pybind11/pull/1836>`_,
- `8b90b <https://github.com/pybind/pybind11/commit/8b90b>`_.
-
-* Other very minor/subtle fixes and improvements.
- `#1329 <https://github.com/pybind/pybind11/pull/1329>`_,
- `#1910 <https://github.com/pybind/pybind11/pull/1910>`_,
- `#1863 <https://github.com/pybind/pybind11/pull/1863>`_,
- `#1847 <https://github.com/pybind/pybind11/pull/1847>`_,
- `#1890 <https://github.com/pybind/pybind11/pull/1890>`_,
- `#1860 <https://github.com/pybind/pybind11/pull/1860>`_,
- `#1848 <https://github.com/pybind/pybind11/pull/1848>`_,
- `#1821 <https://github.com/pybind/pybind11/pull/1821>`_,
- `#1837 <https://github.com/pybind/pybind11/pull/1837>`_,
- `#1833 <https://github.com/pybind/pybind11/pull/1833>`_,
- `#1748 <https://github.com/pybind/pybind11/pull/1748>`_,
- `#1852 <https://github.com/pybind/pybind11/pull/1852>`_.
-
-v2.3.0 (June 11, 2019)
------------------------------------------------------
-
-* Significantly reduced module binary size (10-20%) when compiled in C++11 mode
- with GCC/Clang, or in any mode with MSVC. Function signatures are now always
- precomputed at compile time (this was previously only available in C++14 mode
- for non-MSVC compilers).
- `#934 <https://github.com/pybind/pybind11/pull/934>`_.
-
-* Add basic support for tag-based static polymorphism, where classes
- provide a method to returns the desired type of an instance.
- `#1326 <https://github.com/pybind/pybind11/pull/1326>`_.
-
-* Python type wrappers (``py::handle``, ``py::object``, etc.)
- now support map Python's number protocol onto C++ arithmetic
- operators such as ``operator+``, ``operator/=``, etc.
- `#1511 <https://github.com/pybind/pybind11/pull/1511>`_.
-
-* A number of improvements related to enumerations:
-
- 1. The ``enum_`` implementation was rewritten from scratch to reduce
- code bloat. Rather than instantiating a full implementation for each
- enumeration, most code is now contained in a generic base class.
- `#1511 <https://github.com/pybind/pybind11/pull/1511>`_.
-
- 2. The ``value()`` method of ``py::enum_`` now accepts an optional
- docstring that will be shown in the documentation of the associated
- enumeration. `#1160 <https://github.com/pybind/pybind11/pull/1160>`_.
-
- 3. check for already existing enum value and throw an error if present.
- `#1453 <https://github.com/pybind/pybind11/pull/1453>`_.
-
-* Support for over-aligned type allocation via C++17's aligned ``new``
- statement. `#1582 <https://github.com/pybind/pybind11/pull/1582>`_.
-
-* Added ``py::ellipsis()`` method for slicing of multidimensional NumPy arrays
- `#1502 <https://github.com/pybind/pybind11/pull/1502>`_.
-
-* Numerous Improvements to the ``mkdoc.py`` script for extracting documentation
- from C++ header files.
- `#1788 <https://github.com/pybind/pybind11/pull/1788>`_.
-
-* ``pybind11_add_module()``: allow including Python as a ``SYSTEM`` include path.
- `#1416 <https://github.com/pybind/pybind11/pull/1416>`_.
-
-* ``pybind11/stl.h`` does not convert strings to ``vector<string>`` anymore.
- `#1258 <https://github.com/pybind/pybind11/issues/1258>`_.
-
-* Mark static methods as such to fix auto-generated Sphinx documentation.
- `#1732 <https://github.com/pybind/pybind11/pull/1732>`_.
-
-* Re-throw forced unwind exceptions (e.g. during pthread termination).
- `#1208 <https://github.com/pybind/pybind11/pull/1208>`_.
-
-* Added ``__contains__`` method to the bindings of maps (``std::map``,
- ``std::unordered_map``).
- `#1767 <https://github.com/pybind/pybind11/pull/1767>`_.
-
-* Improvements to ``gil_scoped_acquire``.
- `#1211 <https://github.com/pybind/pybind11/pull/1211>`_.
-
-* Type caster support for ``std::deque<T>``.
- `#1609 <https://github.com/pybind/pybind11/pull/1609>`_.
-
-* Support for ``std::unique_ptr`` holders, whose deleters differ between a base and derived
- class. `#1353 <https://github.com/pybind/pybind11/pull/1353>`_.
-
-* Construction of STL array/vector-like data structures from
- iterators. Added an ``extend()`` operation.
- `#1709 <https://github.com/pybind/pybind11/pull/1709>`_,
-
-* CMake build system improvements for projects that include non-C++
- files (e.g. plain C, CUDA) in ``pybind11_add_module`` et al.
- `#1678 <https://github.com/pybind/pybind11/pull/1678>`_.
-
-* Fixed asynchronous invocation and deallocation of Python functions
- wrapped in ``std::function``.
- `#1595 <https://github.com/pybind/pybind11/pull/1595>`_.
-
-* Fixes regarding return value policy propagation in STL type casters.
- `#1603 <https://github.com/pybind/pybind11/pull/1603>`_.
-
-* Fixed scoped enum comparisons.
- `#1571 <https://github.com/pybind/pybind11/pull/1571>`_.
-
-* Fixed iostream redirection for code that releases the GIL.
- `#1368 <https://github.com/pybind/pybind11/pull/1368>`_,
-
-* A number of CI-related fixes.
- `#1757 <https://github.com/pybind/pybind11/pull/1757>`_,
- `#1744 <https://github.com/pybind/pybind11/pull/1744>`_,
- `#1670 <https://github.com/pybind/pybind11/pull/1670>`_.
-
-v2.2.4 (September 11, 2018)
------------------------------------------------------
-
-* Use new Python 3.7 Thread Specific Storage (TSS) implementation if available.
- `#1454 <https://github.com/pybind/pybind11/pull/1454>`_,
- `#1517 <https://github.com/pybind/pybind11/pull/1517>`_.
-
-* Fixes for newer MSVC versions and C++17 mode.
- `#1347 <https://github.com/pybind/pybind11/pull/1347>`_,
- `#1462 <https://github.com/pybind/pybind11/pull/1462>`_.
-
-* Propagate return value policies to type-specific casters
- when casting STL containers.
- `#1455 <https://github.com/pybind/pybind11/pull/1455>`_.
-
-* Allow ostream-redirection of more than 1024 characters.
- `#1479 <https://github.com/pybind/pybind11/pull/1479>`_.
-
-* Set ``Py_DEBUG`` define when compiling against a debug Python build.
- `#1438 <https://github.com/pybind/pybind11/pull/1438>`_.
-
-* Untangle integer logic in number type caster to work for custom
- types that may only be castable to a restricted set of builtin types.
- `#1442 <https://github.com/pybind/pybind11/pull/1442>`_.
-
-* CMake build system: Remember Python version in cache file.
- `#1434 <https://github.com/pybind/pybind11/pull/1434>`_.
-
-* Fix for custom smart pointers: use ``std::addressof`` to obtain holder
- address instead of ``operator&``.
- `#1435 <https://github.com/pybind/pybind11/pull/1435>`_.
-
-* Properly report exceptions thrown during module initialization.
- `#1362 <https://github.com/pybind/pybind11/pull/1362>`_.
-
-* Fixed a segmentation fault when creating empty-shaped NumPy array.
- `#1371 <https://github.com/pybind/pybind11/pull/1371>`_.
-
-* The version of Intel C++ compiler must be >= 2017, and this is now checked by
- the header files. `#1363 <https://github.com/pybind/pybind11/pull/1363>`_.
-
-* A few minor typo fixes and improvements to the test suite, and
- patches that silence compiler warnings.
-
-* Vectors now support construction from generators, as well as ``extend()`` from a
- list or generator.
- `#1496 <https://github.com/pybind/pybind11/pull/1496>`_.
-
-
-v2.2.3 (April 29, 2018)
------------------------------------------------------
-
-* The pybind11 header location detection was replaced by a new implementation
- that no longer depends on ``pip`` internals (the recently released ``pip``
- 10 has restricted access to this API).
- `#1190 <https://github.com/pybind/pybind11/pull/1190>`_.
-
-* Small adjustment to an implementation detail to work around a compiler segmentation fault in Clang 3.3/3.4.
- `#1350 <https://github.com/pybind/pybind11/pull/1350>`_.
-
-* The minimal supported version of the Intel compiler was >= 17.0 since
- pybind11 v2.1. This check is now explicit, and a compile-time error is raised
- if the compiler meet the requirement.
- `#1363 <https://github.com/pybind/pybind11/pull/1363>`_.
-
-* Fixed an endianness-related fault in the test suite.
- `#1287 <https://github.com/pybind/pybind11/pull/1287>`_.
-
-v2.2.2 (February 7, 2018)
------------------------------------------------------
-
-* Fixed a segfault when combining embedded interpreter
- shutdown/reinitialization with external loaded pybind11 modules.
- `#1092 <https://github.com/pybind/pybind11/pull/1092>`_.
-
-* Eigen support: fixed a bug where Nx1/1xN numpy inputs couldn't be passed as
- arguments to Eigen vectors (which for Eigen are simply compile-time fixed
- Nx1/1xN matrices).
- `#1106 <https://github.com/pybind/pybind11/pull/1106>`_.
-
-* Clarified to license by moving the licensing of contributions from
- ``LICENSE`` into ``CONTRIBUTING.md``: the licensing of contributions is not
- actually part of the software license as distributed. This isn't meant to be
- a substantial change in the licensing of the project, but addresses concerns
- that the clause made the license non-standard.
- `#1109 <https://github.com/pybind/pybind11/issues/1109>`_.
-
-* Fixed a regression introduced in 2.1 that broke binding functions with lvalue
- character literal arguments.
- `#1128 <https://github.com/pybind/pybind11/pull/1128>`_.
-
-* MSVC: fix for compilation failures under /permissive-, and added the flag to
- the appveyor test suite.
- `#1155 <https://github.com/pybind/pybind11/pull/1155>`_.
-
-* Fixed ``__qualname__`` generation, and in turn, fixes how class names
- (especially nested class names) are shown in generated docstrings.
- `#1171 <https://github.com/pybind/pybind11/pull/1171>`_.
-
-* Updated the FAQ with a suggested project citation reference.
- `#1189 <https://github.com/pybind/pybind11/pull/1189>`_.
-
-* Added fixes for deprecation warnings when compiled under C++17 with
- ``-Wdeprecated`` turned on, and add ``-Wdeprecated`` to the test suite
- compilation flags.
- `#1191 <https://github.com/pybind/pybind11/pull/1191>`_.
-
-* Fixed outdated PyPI URLs in ``setup.py``.
- `#1213 <https://github.com/pybind/pybind11/pull/1213>`_.
-
-* Fixed a refcount leak for arguments that end up in a ``py::args`` argument
- for functions with both fixed positional and ``py::args`` arguments.
- `#1216 <https://github.com/pybind/pybind11/pull/1216>`_.
-
-* Fixed a potential segfault resulting from possible premature destruction of
- ``py::args``/``py::kwargs`` arguments with overloaded functions.
- `#1223 <https://github.com/pybind/pybind11/pull/1223>`_.
-
-* Fixed ``del map[item]`` for a ``stl_bind.h`` bound stl map.
- `#1229 <https://github.com/pybind/pybind11/pull/1229>`_.
-
-* Fixed a regression from v2.1.x where the aggregate initialization could
- unintentionally end up at a constructor taking a templated
- ``std::initializer_list<T>`` argument.
- `#1249 <https://github.com/pybind/pybind11/pull/1249>`_.
-
-* Fixed an issue where calling a function with a keep_alive policy on the same
- nurse/patient pair would cause the internal patient storage to needlessly
- grow (unboundedly, if the nurse is long-lived).
- `#1251 <https://github.com/pybind/pybind11/issues/1251>`_.
-
-* Various other minor fixes.
-
-v2.2.1 (September 14, 2017)
------------------------------------------------------
-
-* Added ``py::module_::reload()`` member function for reloading a module.
- `#1040 <https://github.com/pybind/pybind11/pull/1040>`_.
-
-* Fixed a reference leak in the number converter.
- `#1078 <https://github.com/pybind/pybind11/pull/1078>`_.
-
-* Fixed compilation with Clang on host GCC < 5 (old libstdc++ which isn't fully
- C++11 compliant). `#1062 <https://github.com/pybind/pybind11/pull/1062>`_.
-
-* Fixed a regression where the automatic ``std::vector<bool>`` caster would
- fail to compile. The same fix also applies to any container which returns
- element proxies instead of references.
- `#1053 <https://github.com/pybind/pybind11/pull/1053>`_.
-
-* Fixed a regression where the ``py::keep_alive`` policy could not be applied
- to constructors. `#1065 <https://github.com/pybind/pybind11/pull/1065>`_.
-
-* Fixed a nullptr dereference when loading a ``py::module_local`` type
- that's only registered in an external module.
- `#1058 <https://github.com/pybind/pybind11/pull/1058>`_.
-
-* Fixed implicit conversion of accessors to types derived from ``py::object``.
- `#1076 <https://github.com/pybind/pybind11/pull/1076>`_.
-
-* The ``name`` in ``PYBIND11_MODULE(name, variable)`` can now be a macro.
- `#1082 <https://github.com/pybind/pybind11/pull/1082>`_.
-
-* Relaxed overly strict ``py::pickle()`` check for matching get and set types.
- `#1064 <https://github.com/pybind/pybind11/pull/1064>`_.
-
-* Conversion errors now try to be more informative when it's likely that
- a missing header is the cause (e.g. forgetting ``<pybind11/stl.h>``).
- `#1077 <https://github.com/pybind/pybind11/pull/1077>`_.
-
-v2.2.0 (August 31, 2017)
------------------------------------------------------
-
-* Support for embedding the Python interpreter. See the
- :doc:`documentation page </advanced/embedding>` for a
- full overview of the new features.
- `#774 <https://github.com/pybind/pybind11/pull/774>`_,
- `#889 <https://github.com/pybind/pybind11/pull/889>`_,
- `#892 <https://github.com/pybind/pybind11/pull/892>`_,
- `#920 <https://github.com/pybind/pybind11/pull/920>`_.
-
- .. code-block:: cpp
-
- #include <pybind11/embed.h>
- namespace py = pybind11;
-
- int main() {
- py::scoped_interpreter guard{}; // start the interpreter and keep it alive
-
- py::print("Hello, World!"); // use the Python API
- }
-
-* Support for inheriting from multiple C++ bases in Python.
- `#693 <https://github.com/pybind/pybind11/pull/693>`_.
-
- .. code-block:: python
-
- from cpp_module import CppBase1, CppBase2
-
- class PyDerived(CppBase1, CppBase2):
- def __init__(self):
- CppBase1.__init__(self) # C++ bases must be initialized explicitly
- CppBase2.__init__(self)
-
-* ``PYBIND11_MODULE`` is now the preferred way to create module entry points.
- ``PYBIND11_PLUGIN`` is deprecated. See :ref:`macros` for details.
- `#879 <https://github.com/pybind/pybind11/pull/879>`_.
-
- .. code-block:: cpp
-
- // new
- PYBIND11_MODULE(example, m) {
- m.def("add", [](int a, int b) { return a + b; });
- }
-
- // old
- PYBIND11_PLUGIN(example) {
- py::module m("example");
- m.def("add", [](int a, int b) { return a + b; });
- return m.ptr();
- }
-
-* pybind11's headers and build system now more strictly enforce hidden symbol
- visibility for extension modules. This should be seamless for most users,
- but see the :doc:`upgrade` if you use a custom build system.
- `#995 <https://github.com/pybind/pybind11/pull/995>`_.
-
-* Support for ``py::module_local`` types which allow multiple modules to
- export the same C++ types without conflicts. This is useful for opaque
- types like ``std::vector<int>``. ``py::bind_vector`` and ``py::bind_map``
- now default to ``py::module_local`` if their elements are builtins or
- local types. See :ref:`module_local` for details.
- `#949 <https://github.com/pybind/pybind11/pull/949>`_,
- `#981 <https://github.com/pybind/pybind11/pull/981>`_,
- `#995 <https://github.com/pybind/pybind11/pull/995>`_,
- `#997 <https://github.com/pybind/pybind11/pull/997>`_.
-
-* Custom constructors can now be added very easily using lambdas or factory
- functions which return a class instance by value, pointer or holder. This
- supersedes the old placement-new ``__init__`` technique.
- See :ref:`custom_constructors` for details.
- `#805 <https://github.com/pybind/pybind11/pull/805>`_,
- `#1014 <https://github.com/pybind/pybind11/pull/1014>`_.
-
- .. code-block:: cpp
-
- struct Example {
- Example(std::string);
- };
-
- py::class_<Example>(m, "Example")
- .def(py::init<std::string>()) // existing constructor
- .def(py::init([](int n) { // custom constructor
- return std::make_unique<Example>(std::to_string(n));
- }));
-
-* Similarly to custom constructors, pickling support functions are now bound
- using the ``py::pickle()`` adaptor which improves type safety. See the
- :doc:`upgrade` and :ref:`pickling` for details.
- `#1038 <https://github.com/pybind/pybind11/pull/1038>`_.
-
-* Builtin support for converting C++17 standard library types and general
- conversion improvements:
-
- 1. C++17 ``std::variant`` is supported right out of the box. C++11/14
- equivalents (e.g. ``boost::variant``) can also be added with a simple
- user-defined specialization. See :ref:`cpp17_container_casters` for details.
- `#811 <https://github.com/pybind/pybind11/pull/811>`_,
- `#845 <https://github.com/pybind/pybind11/pull/845>`_,
- `#989 <https://github.com/pybind/pybind11/pull/989>`_.
-
- 2. Out-of-the-box support for C++17 ``std::string_view``.
- `#906 <https://github.com/pybind/pybind11/pull/906>`_.
-
- 3. Improved compatibility of the builtin ``optional`` converter.
- `#874 <https://github.com/pybind/pybind11/pull/874>`_.
-
- 4. The ``bool`` converter now accepts ``numpy.bool_`` and types which
- define ``__bool__`` (Python 3.x) or ``__nonzero__`` (Python 2.7).
- `#925 <https://github.com/pybind/pybind11/pull/925>`_.
-
- 5. C++-to-Python casters are now more efficient and move elements out
- of rvalue containers whenever possible.
- `#851 <https://github.com/pybind/pybind11/pull/851>`_,
- `#936 <https://github.com/pybind/pybind11/pull/936>`_,
- `#938 <https://github.com/pybind/pybind11/pull/938>`_.
-
- 6. Fixed ``bytes`` to ``std::string/char*`` conversion on Python 3.
- `#817 <https://github.com/pybind/pybind11/pull/817>`_.
-
- 7. Fixed lifetime of temporary C++ objects created in Python-to-C++ conversions.
- `#924 <https://github.com/pybind/pybind11/pull/924>`_.
-
-* Scope guard call policy for RAII types, e.g. ``py::call_guard<py::gil_scoped_release>()``,
- ``py::call_guard<py::scoped_ostream_redirect>()``. See :ref:`call_policies` for details.
- `#740 <https://github.com/pybind/pybind11/pull/740>`_.
-
-* Utility for redirecting C++ streams to Python (e.g. ``std::cout`` ->
- ``sys.stdout``). Scope guard ``py::scoped_ostream_redirect`` in C++ and
- a context manager in Python. See :ref:`ostream_redirect`.
- `#1009 <https://github.com/pybind/pybind11/pull/1009>`_.
-
-* Improved handling of types and exceptions across module boundaries.
- `#915 <https://github.com/pybind/pybind11/pull/915>`_,
- `#951 <https://github.com/pybind/pybind11/pull/951>`_,
- `#995 <https://github.com/pybind/pybind11/pull/995>`_.
-
-* Fixed destruction order of ``py::keep_alive`` nurse/patient objects
- in reference cycles.
- `#856 <https://github.com/pybind/pybind11/pull/856>`_.
-
-* NumPy and buffer protocol related improvements:
-
- 1. Support for negative strides in Python buffer objects/numpy arrays. This
- required changing integers from unsigned to signed for the related C++ APIs.
- Note: If you have compiler warnings enabled, you may notice some new conversion
- warnings after upgrading. These can be resolved with ``static_cast``.
- `#782 <https://github.com/pybind/pybind11/pull/782>`_.
-
- 2. Support ``std::complex`` and arrays inside ``PYBIND11_NUMPY_DTYPE``.
- `#831 <https://github.com/pybind/pybind11/pull/831>`_,
- `#832 <https://github.com/pybind/pybind11/pull/832>`_.
-
- 3. Support for constructing ``py::buffer_info`` and ``py::arrays`` using
- arbitrary containers or iterators instead of requiring a ``std::vector``.
- `#788 <https://github.com/pybind/pybind11/pull/788>`_,
- `#822 <https://github.com/pybind/pybind11/pull/822>`_,
- `#860 <https://github.com/pybind/pybind11/pull/860>`_.
-
- 4. Explicitly check numpy version and require >= 1.7.0.
- `#819 <https://github.com/pybind/pybind11/pull/819>`_.
-
-* Support for allowing/prohibiting ``None`` for specific arguments and improved
- ``None`` overload resolution order. See :ref:`none_arguments` for details.
- `#843 <https://github.com/pybind/pybind11/pull/843>`_.
- `#859 <https://github.com/pybind/pybind11/pull/859>`_.
-
-* Added ``py::exec()`` as a shortcut for ``py::eval<py::eval_statements>()``
- and support for C++11 raw string literals as input. See :ref:`eval`.
- `#766 <https://github.com/pybind/pybind11/pull/766>`_,
- `#827 <https://github.com/pybind/pybind11/pull/827>`_.
-
-* ``py::vectorize()`` ignores non-vectorizable arguments and supports
- member functions.
- `#762 <https://github.com/pybind/pybind11/pull/762>`_.
-
-* Support for bound methods as callbacks (``pybind11/functional.h``).
- `#815 <https://github.com/pybind/pybind11/pull/815>`_.
-
-* Allow aliasing pybind11 methods: ``cls.attr("foo") = cls.attr("bar")``.
- `#802 <https://github.com/pybind/pybind11/pull/802>`_.
-
-* Don't allow mixed static/non-static overloads.
- `#804 <https://github.com/pybind/pybind11/pull/804>`_.
-
-* Fixed overriding static properties in derived classes.
- `#784 <https://github.com/pybind/pybind11/pull/784>`_.
-
-* Added support for write only properties.
- `#1144 <https://github.com/pybind/pybind11/pull/1144>`_.
-
-* Improved deduction of member functions of a derived class when its bases
- aren't registered with pybind11.
- `#855 <https://github.com/pybind/pybind11/pull/855>`_.
-
- .. code-block:: cpp
-
- struct Base {
- int foo() { return 42; }
- }
-
- struct Derived : Base {}
-
- // Now works, but previously required also binding `Base`
- py::class_<Derived>(m, "Derived")
- .def("foo", &Derived::foo); // function is actually from `Base`
-
-* The implementation of ``py::init<>`` now uses C++11 brace initialization
- syntax to construct instances, which permits binding implicit constructors of
- aggregate types. `#1015 <https://github.com/pybind/pybind11/pull/1015>`_.
-
- .. code-block:: cpp
-
- struct Aggregate {
- int a;
- std::string b;
- };
-
- py::class_<Aggregate>(m, "Aggregate")
- .def(py::init<int, const std::string &>());
-
-* Fixed issues with multiple inheritance with offset base/derived pointers.
- `#812 <https://github.com/pybind/pybind11/pull/812>`_,
- `#866 <https://github.com/pybind/pybind11/pull/866>`_,
- `#960 <https://github.com/pybind/pybind11/pull/960>`_.
-
-* Fixed reference leak of type objects.
- `#1030 <https://github.com/pybind/pybind11/pull/1030>`_.
-
-* Improved support for the ``/std:c++14`` and ``/std:c++latest`` modes
- on MSVC 2017.
- `#841 <https://github.com/pybind/pybind11/pull/841>`_,
- `#999 <https://github.com/pybind/pybind11/pull/999>`_.
-
-* Fixed detection of private operator new on MSVC.
- `#893 <https://github.com/pybind/pybind11/pull/893>`_,
- `#918 <https://github.com/pybind/pybind11/pull/918>`_.
-
-* Intel C++ compiler compatibility fixes.
- `#937 <https://github.com/pybind/pybind11/pull/937>`_.
-
-* Fixed implicit conversion of `py::enum_` to integer types on Python 2.7.
- `#821 <https://github.com/pybind/pybind11/pull/821>`_.
-
-* Added ``py::hash`` to fetch the hash value of Python objects, and
- ``.def(hash(py::self))`` to provide the C++ ``std::hash`` as the Python
- ``__hash__`` method.
- `#1034 <https://github.com/pybind/pybind11/pull/1034>`_.
-
-* Fixed ``__truediv__`` on Python 2 and ``__itruediv__`` on Python 3.
- `#867 <https://github.com/pybind/pybind11/pull/867>`_.
-
-* ``py::capsule`` objects now support the ``name`` attribute. This is useful
- for interfacing with ``scipy.LowLevelCallable``.
- `#902 <https://github.com/pybind/pybind11/pull/902>`_.
-
-* Fixed ``py::make_iterator``'s ``__next__()`` for past-the-end calls.
- `#897 <https://github.com/pybind/pybind11/pull/897>`_.
-
-* Added ``error_already_set::matches()`` for checking Python exceptions.
- `#772 <https://github.com/pybind/pybind11/pull/772>`_.
-
-* Deprecated ``py::error_already_set::clear()``. It's no longer needed
- following a simplification of the ``py::error_already_set`` class.
- `#954 <https://github.com/pybind/pybind11/pull/954>`_.
-
-* Deprecated ``py::handle::operator==()`` in favor of ``py::handle::is()``
- `#825 <https://github.com/pybind/pybind11/pull/825>`_.
-
-* Deprecated ``py::object::borrowed``/``py::object::stolen``.
- Use ``py::object::borrowed_t{}``/``py::object::stolen_t{}`` instead.
- `#771 <https://github.com/pybind/pybind11/pull/771>`_.
-
-* Changed internal data structure versioning to avoid conflicts between
- modules compiled with different revisions of pybind11.
- `#1012 <https://github.com/pybind/pybind11/pull/1012>`_.
-
-* Additional compile-time and run-time error checking and more informative messages.
- `#786 <https://github.com/pybind/pybind11/pull/786>`_,
- `#794 <https://github.com/pybind/pybind11/pull/794>`_,
- `#803 <https://github.com/pybind/pybind11/pull/803>`_.
-
-* Various minor improvements and fixes.
- `#764 <https://github.com/pybind/pybind11/pull/764>`_,
- `#791 <https://github.com/pybind/pybind11/pull/791>`_,
- `#795 <https://github.com/pybind/pybind11/pull/795>`_,
- `#840 <https://github.com/pybind/pybind11/pull/840>`_,
- `#844 <https://github.com/pybind/pybind11/pull/844>`_,
- `#846 <https://github.com/pybind/pybind11/pull/846>`_,
- `#849 <https://github.com/pybind/pybind11/pull/849>`_,
- `#858 <https://github.com/pybind/pybind11/pull/858>`_,
- `#862 <https://github.com/pybind/pybind11/pull/862>`_,
- `#871 <https://github.com/pybind/pybind11/pull/871>`_,
- `#872 <https://github.com/pybind/pybind11/pull/872>`_,
- `#881 <https://github.com/pybind/pybind11/pull/881>`_,
- `#888 <https://github.com/pybind/pybind11/pull/888>`_,
- `#899 <https://github.com/pybind/pybind11/pull/899>`_,
- `#928 <https://github.com/pybind/pybind11/pull/928>`_,
- `#931 <https://github.com/pybind/pybind11/pull/931>`_,
- `#944 <https://github.com/pybind/pybind11/pull/944>`_,
- `#950 <https://github.com/pybind/pybind11/pull/950>`_,
- `#952 <https://github.com/pybind/pybind11/pull/952>`_,
- `#962 <https://github.com/pybind/pybind11/pull/962>`_,
- `#965 <https://github.com/pybind/pybind11/pull/965>`_,
- `#970 <https://github.com/pybind/pybind11/pull/970>`_,
- `#978 <https://github.com/pybind/pybind11/pull/978>`_,
- `#979 <https://github.com/pybind/pybind11/pull/979>`_,
- `#986 <https://github.com/pybind/pybind11/pull/986>`_,
- `#1020 <https://github.com/pybind/pybind11/pull/1020>`_,
- `#1027 <https://github.com/pybind/pybind11/pull/1027>`_,
- `#1037 <https://github.com/pybind/pybind11/pull/1037>`_.
-
-* Testing improvements.
- `#798 <https://github.com/pybind/pybind11/pull/798>`_,
- `#882 <https://github.com/pybind/pybind11/pull/882>`_,
- `#898 <https://github.com/pybind/pybind11/pull/898>`_,
- `#900 <https://github.com/pybind/pybind11/pull/900>`_,
- `#921 <https://github.com/pybind/pybind11/pull/921>`_,
- `#923 <https://github.com/pybind/pybind11/pull/923>`_,
- `#963 <https://github.com/pybind/pybind11/pull/963>`_.
-
-v2.1.1 (April 7, 2017)
------------------------------------------------------
-
-* Fixed minimum version requirement for MSVC 2015u3
- `#773 <https://github.com/pybind/pybind11/pull/773>`_.
-
-v2.1.0 (March 22, 2017)
------------------------------------------------------
-
-* pybind11 now performs function overload resolution in two phases. The first
- phase only considers exact type matches, while the second allows for implicit
- conversions to take place. A special ``noconvert()`` syntax can be used to
- completely disable implicit conversions for specific arguments.
- `#643 <https://github.com/pybind/pybind11/pull/643>`_,
- `#634 <https://github.com/pybind/pybind11/pull/634>`_,
- `#650 <https://github.com/pybind/pybind11/pull/650>`_.
-
-* Fixed a regression where static properties no longer worked with classes
- using multiple inheritance. The ``py::metaclass`` attribute is no longer
- necessary (and deprecated as of this release) when binding classes with
- static properties.
- `#679 <https://github.com/pybind/pybind11/pull/679>`_,
-
-* Classes bound using ``pybind11`` can now use custom metaclasses.
- `#679 <https://github.com/pybind/pybind11/pull/679>`_,
-
-* ``py::args`` and ``py::kwargs`` can now be mixed with other positional
- arguments when binding functions using pybind11.
- `#611 <https://github.com/pybind/pybind11/pull/611>`_.
-
-* Improved support for C++11 unicode string and character types; added
- extensive documentation regarding pybind11's string conversion behavior.
- `#624 <https://github.com/pybind/pybind11/pull/624>`_,
- `#636 <https://github.com/pybind/pybind11/pull/636>`_,
- `#715 <https://github.com/pybind/pybind11/pull/715>`_.
-
-* pybind11 can now avoid expensive copies when converting Eigen arrays to NumPy
- arrays (and vice versa). `#610 <https://github.com/pybind/pybind11/pull/610>`_.
-
-* The "fast path" in ``py::vectorize`` now works for any full-size group of C or
- F-contiguous arrays. The non-fast path is also faster since it no longer performs
- copies of the input arguments (except when type conversions are necessary).
- `#610 <https://github.com/pybind/pybind11/pull/610>`_.
-
-* Added fast, unchecked access to NumPy arrays via a proxy object.
- `#746 <https://github.com/pybind/pybind11/pull/746>`_.
-
-* Transparent support for class-specific ``operator new`` and
- ``operator delete`` implementations.
- `#755 <https://github.com/pybind/pybind11/pull/755>`_.
-
-* Slimmer and more efficient STL-compatible iterator interface for sequence types.
- `#662 <https://github.com/pybind/pybind11/pull/662>`_.
-
-* Improved custom holder type support.
- `#607 <https://github.com/pybind/pybind11/pull/607>`_.
-
-* ``nullptr`` to ``None`` conversion fixed in various builtin type casters.
- `#732 <https://github.com/pybind/pybind11/pull/732>`_.
-
-* ``enum_`` now exposes its members via a special ``__members__`` attribute.
- `#666 <https://github.com/pybind/pybind11/pull/666>`_.
-
-* ``std::vector`` bindings created using ``stl_bind.h`` can now optionally
- implement the buffer protocol. `#488 <https://github.com/pybind/pybind11/pull/488>`_.
-
-* Automated C++ reference documentation using doxygen and breathe.
- `#598 <https://github.com/pybind/pybind11/pull/598>`_.
-
-* Added minimum compiler version assertions.
- `#727 <https://github.com/pybind/pybind11/pull/727>`_.
-
-* Improved compatibility with C++1z.
- `#677 <https://github.com/pybind/pybind11/pull/677>`_.
-
-* Improved ``py::capsule`` API. Can be used to implement cleanup
- callbacks that are involved at module destruction time.
- `#752 <https://github.com/pybind/pybind11/pull/752>`_.
-
-* Various minor improvements and fixes.
- `#595 <https://github.com/pybind/pybind11/pull/595>`_,
- `#588 <https://github.com/pybind/pybind11/pull/588>`_,
- `#589 <https://github.com/pybind/pybind11/pull/589>`_,
- `#603 <https://github.com/pybind/pybind11/pull/603>`_,
- `#619 <https://github.com/pybind/pybind11/pull/619>`_,
- `#648 <https://github.com/pybind/pybind11/pull/648>`_,
- `#695 <https://github.com/pybind/pybind11/pull/695>`_,
- `#720 <https://github.com/pybind/pybind11/pull/720>`_,
- `#723 <https://github.com/pybind/pybind11/pull/723>`_,
- `#729 <https://github.com/pybind/pybind11/pull/729>`_,
- `#724 <https://github.com/pybind/pybind11/pull/724>`_,
- `#742 <https://github.com/pybind/pybind11/pull/742>`_,
- `#753 <https://github.com/pybind/pybind11/pull/753>`_.
-
-v2.0.1 (Jan 4, 2017)
------------------------------------------------------
-
-* Fix pointer to reference error in type_caster on MSVC
- `#583 <https://github.com/pybind/pybind11/pull/583>`_.
-
-* Fixed a segmentation in the test suite due to a typo
- `cd7eac <https://github.com/pybind/pybind11/commit/cd7eac>`_.
-
-v2.0.0 (Jan 1, 2017)
------------------------------------------------------
-
-* Fixed a reference counting regression affecting types with custom metaclasses
- (introduced in v2.0.0-rc1).
- `#571 <https://github.com/pybind/pybind11/pull/571>`_.
-
-* Quenched a CMake policy warning.
- `#570 <https://github.com/pybind/pybind11/pull/570>`_.
-
-v2.0.0-rc1 (Dec 23, 2016)
------------------------------------------------------
-
-The pybind11 developers are excited to issue a release candidate of pybind11
-with a subsequent v2.0.0 release planned in early January next year.
-
-An incredible amount of effort by went into pybind11 over the last ~5 months,
-leading to a release that is jam-packed with exciting new features and numerous
-usability improvements. The following list links PRs or individual commits
-whenever applicable.
-
-Happy Christmas!
-
-* Support for binding C++ class hierarchies that make use of multiple
- inheritance. `#410 <https://github.com/pybind/pybind11/pull/410>`_.
-
-* PyPy support: pybind11 now supports nightly builds of PyPy and will
- interoperate with the future 5.7 release. No code changes are necessary,
- everything "just" works as usual. Note that we only target the Python 2.7
- branch for now; support for 3.x will be added once its ``cpyext`` extension
- support catches up. A few minor features remain unsupported for the time
- being (notably dynamic attributes in custom types).
- `#527 <https://github.com/pybind/pybind11/pull/527>`_.
-
-* Significant work on the documentation -- in particular, the monolithic
- ``advanced.rst`` file was restructured into a easier to read hierarchical
- organization. `#448 <https://github.com/pybind/pybind11/pull/448>`_.
-
-* Many NumPy-related improvements:
-
- 1. Object-oriented API to access and modify NumPy ``ndarray`` instances,
- replicating much of the corresponding NumPy C API functionality.
- `#402 <https://github.com/pybind/pybind11/pull/402>`_.
-
- 2. NumPy array ``dtype`` array descriptors are now first-class citizens and
- are exposed via a new class ``py::dtype``.
-
- 3. Structured dtypes can be registered using the ``PYBIND11_NUMPY_DTYPE()``
- macro. Special ``array`` constructors accepting dtype objects were also
- added.
-
- One potential caveat involving this change: format descriptor strings
- should now be accessed via ``format_descriptor::format()`` (however, for
- compatibility purposes, the old syntax ``format_descriptor::value`` will
- still work for non-structured data types). `#308
- <https://github.com/pybind/pybind11/pull/308>`_.
-
- 4. Further improvements to support structured dtypes throughout the system.
- `#472 <https://github.com/pybind/pybind11/pull/472>`_,
- `#474 <https://github.com/pybind/pybind11/pull/474>`_,
- `#459 <https://github.com/pybind/pybind11/pull/459>`_,
- `#453 <https://github.com/pybind/pybind11/pull/453>`_,
- `#452 <https://github.com/pybind/pybind11/pull/452>`_, and
- `#505 <https://github.com/pybind/pybind11/pull/505>`_.
-
- 5. Fast access operators. `#497 <https://github.com/pybind/pybind11/pull/497>`_.
-
- 6. Constructors for arrays whose storage is owned by another object.
- `#440 <https://github.com/pybind/pybind11/pull/440>`_.
-
- 7. Added constructors for ``array`` and ``array_t`` explicitly accepting shape
- and strides; if strides are not provided, they are deduced assuming
- C-contiguity. Also added simplified constructors for 1-dimensional case.
-
- 8. Added buffer/NumPy support for ``char[N]`` and ``std::array<char, N>`` types.
-
- 9. Added ``memoryview`` wrapper type which is constructible from ``buffer_info``.
-
-* Eigen: many additional conversions and support for non-contiguous
- arrays/slices.
- `#427 <https://github.com/pybind/pybind11/pull/427>`_,
- `#315 <https://github.com/pybind/pybind11/pull/315>`_,
- `#316 <https://github.com/pybind/pybind11/pull/316>`_,
- `#312 <https://github.com/pybind/pybind11/pull/312>`_, and
- `#267 <https://github.com/pybind/pybind11/pull/267>`_
-
-* Incompatible changes in ``class_<...>::class_()``:
-
- 1. Declarations of types that provide access via the buffer protocol must
- now include the ``py::buffer_protocol()`` annotation as an argument to
- the ``class_`` constructor.
-
- 2. Declarations of types that require a custom metaclass (i.e. all classes
- which include static properties via commands such as
- ``def_readwrite_static()``) must now include the ``py::metaclass()``
- annotation as an argument to the ``class_`` constructor.
-
- These two changes were necessary to make type definitions in pybind11
- future-proof, and to support PyPy via its cpyext mechanism. `#527
- <https://github.com/pybind/pybind11/pull/527>`_.
-
-
- 3. This version of pybind11 uses a redesigned mechanism for instantiating
- trampoline classes that are used to override virtual methods from within
- Python. This led to the following user-visible syntax change: instead of
-
- .. code-block:: cpp
-
- py::class_<TrampolineClass>("MyClass")
- .alias<MyClass>()
- ....
-
- write
-
- .. code-block:: cpp
-
- py::class_<MyClass, TrampolineClass>("MyClass")
- ....
-
- Importantly, both the original and the trampoline class are now
- specified as an arguments (in arbitrary order) to the ``py::class_``
- template, and the ``alias<..>()`` call is gone. The new scheme has zero
- overhead in cases when Python doesn't override any functions of the
- underlying C++ class. `rev. 86d825
- <https://github.com/pybind/pybind11/commit/86d825>`_.
-
-* Added ``eval`` and ``eval_file`` functions for evaluating expressions and
- statements from a string or file. `rev. 0d3fc3
- <https://github.com/pybind/pybind11/commit/0d3fc3>`_.
-
-* pybind11 can now create types with a modifiable dictionary.
- `#437 <https://github.com/pybind/pybind11/pull/437>`_ and
- `#444 <https://github.com/pybind/pybind11/pull/444>`_.
-
-* Support for translation of arbitrary C++ exceptions to Python counterparts.
- `#296 <https://github.com/pybind/pybind11/pull/296>`_ and
- `#273 <https://github.com/pybind/pybind11/pull/273>`_.
-
-* Report full backtraces through mixed C++/Python code, better reporting for
- import errors, fixed GIL management in exception processing.
- `#537 <https://github.com/pybind/pybind11/pull/537>`_,
- `#494 <https://github.com/pybind/pybind11/pull/494>`_,
- `rev. e72d95 <https://github.com/pybind/pybind11/commit/e72d95>`_, and
- `rev. 099d6e <https://github.com/pybind/pybind11/commit/099d6e>`_.
-
-* Support for bit-level operations, comparisons, and serialization of C++
- enumerations. `#503 <https://github.com/pybind/pybind11/pull/503>`_,
- `#508 <https://github.com/pybind/pybind11/pull/508>`_,
- `#380 <https://github.com/pybind/pybind11/pull/380>`_,
- `#309 <https://github.com/pybind/pybind11/pull/309>`_.
- `#311 <https://github.com/pybind/pybind11/pull/311>`_.
-
-* The ``class_`` constructor now accepts its template arguments in any order.
- `#385 <https://github.com/pybind/pybind11/pull/385>`_.
-
-* Attribute and item accessors now have a more complete interface which makes
- it possible to chain attributes as in
- ``obj.attr("a")[key].attr("b").attr("method")(1, 2, 3)``. `#425
- <https://github.com/pybind/pybind11/pull/425>`_.
-
-* Major redesign of the default and conversion constructors in ``pytypes.h``.
- `#464 <https://github.com/pybind/pybind11/pull/464>`_.
-
-* Added built-in support for ``std::shared_ptr`` holder type. It is no longer
- necessary to to include a declaration of the form
- ``PYBIND11_DECLARE_HOLDER_TYPE(T, std::shared_ptr<T>)`` (though continuing to
- do so won't cause an error).
- `#454 <https://github.com/pybind/pybind11/pull/454>`_.
-
-* New ``py::overload_cast`` casting operator to select among multiple possible
- overloads of a function. An example:
-
- .. code-block:: cpp
-
- py::class_<Pet>(m, "Pet")
- .def("set", py::overload_cast<int>(&Pet::set), "Set the pet's age")
- .def("set", py::overload_cast<const std::string &>(&Pet::set), "Set the pet's name");
-
- This feature only works on C++14-capable compilers.
- `#541 <https://github.com/pybind/pybind11/pull/541>`_.
-
-* C++ types are automatically cast to Python types, e.g. when assigning
- them as an attribute. For instance, the following is now legal:
-
- .. code-block:: cpp
-
- py::module m = /* ... */
- m.attr("constant") = 123;
-
- (Previously, a ``py::cast`` call was necessary to avoid a compilation error.)
- `#551 <https://github.com/pybind/pybind11/pull/551>`_.
-
-* Redesigned ``pytest``-based test suite. `#321 <https://github.com/pybind/pybind11/pull/321>`_.
-
-* Instance tracking to detect reference leaks in test suite. `#324 <https://github.com/pybind/pybind11/pull/324>`_
-
-* pybind11 can now distinguish between multiple different instances that are
- located at the same memory address, but which have different types.
- `#329 <https://github.com/pybind/pybind11/pull/329>`_.
-
-* Improved logic in ``move`` return value policy.
- `#510 <https://github.com/pybind/pybind11/pull/510>`_,
- `#297 <https://github.com/pybind/pybind11/pull/297>`_.
-
-* Generalized unpacking API to permit calling Python functions from C++ using
- notation such as ``foo(a1, a2, *args, "ka"_a=1, "kb"_a=2, **kwargs)``. `#372 <https://github.com/pybind/pybind11/pull/372>`_.
-
-* ``py::print()`` function whose behavior matches that of the native Python
- ``print()`` function. `#372 <https://github.com/pybind/pybind11/pull/372>`_.
-
-* Added ``py::dict`` keyword constructor:``auto d = dict("number"_a=42,
- "name"_a="World");``. `#372 <https://github.com/pybind/pybind11/pull/372>`_.
-
-* Added ``py::str::format()`` method and ``_s`` literal: ``py::str s = "1 + 2
- = {}"_s.format(3);``. `#372 <https://github.com/pybind/pybind11/pull/372>`_.
-
-* Added ``py::repr()`` function which is equivalent to Python's builtin
- ``repr()``. `#333 <https://github.com/pybind/pybind11/pull/333>`_.
-
-* Improved construction and destruction logic for holder types. It is now
- possible to reference instances with smart pointer holder types without
- constructing the holder if desired. The ``PYBIND11_DECLARE_HOLDER_TYPE``
- macro now accepts an optional second parameter to indicate whether the holder
- type uses intrusive reference counting.
- `#533 <https://github.com/pybind/pybind11/pull/533>`_ and
- `#561 <https://github.com/pybind/pybind11/pull/561>`_.
-
-* Mapping a stateless C++ function to Python and back is now "for free" (i.e.
- no extra indirections or argument conversion overheads). `rev. 954b79
- <https://github.com/pybind/pybind11/commit/954b79>`_.
-
-* Bindings for ``std::valarray<T>``.
- `#545 <https://github.com/pybind/pybind11/pull/545>`_.
-
-* Improved support for C++17 capable compilers.
- `#562 <https://github.com/pybind/pybind11/pull/562>`_.
-
-* Bindings for ``std::optional<t>``.
- `#475 <https://github.com/pybind/pybind11/pull/475>`_,
- `#476 <https://github.com/pybind/pybind11/pull/476>`_,
- `#479 <https://github.com/pybind/pybind11/pull/479>`_,
- `#499 <https://github.com/pybind/pybind11/pull/499>`_, and
- `#501 <https://github.com/pybind/pybind11/pull/501>`_.
-
-* ``stl_bind.h``: general improvements and support for ``std::map`` and
- ``std::unordered_map``.
- `#490 <https://github.com/pybind/pybind11/pull/490>`_,
- `#282 <https://github.com/pybind/pybind11/pull/282>`_,
- `#235 <https://github.com/pybind/pybind11/pull/235>`_.
-
-* The ``std::tuple``, ``std::pair``, ``std::list``, and ``std::vector`` type
- casters now accept any Python sequence type as input. `rev. 107285
- <https://github.com/pybind/pybind11/commit/107285>`_.
-
-* Improved CMake Python detection on multi-architecture Linux.
- `#532 <https://github.com/pybind/pybind11/pull/532>`_.
-
-* Infrastructure to selectively disable or enable parts of the automatically
- generated docstrings. `#486 <https://github.com/pybind/pybind11/pull/486>`_.
-
-* ``reference`` and ``reference_internal`` are now the default return value
- properties for static and non-static properties, respectively. `#473
- <https://github.com/pybind/pybind11/pull/473>`_. (the previous defaults
- were ``automatic``). `#473 <https://github.com/pybind/pybind11/pull/473>`_.
-
-* Support for ``std::unique_ptr`` with non-default deleters or no deleter at
- all (``py::nodelete``). `#384 <https://github.com/pybind/pybind11/pull/384>`_.
-
-* Deprecated ``handle::call()`` method. The new syntax to call Python
- functions is simply ``handle()``. It can also be invoked explicitly via
- ``handle::operator<X>()``, where ``X`` is an optional return value policy.
-
-* Print more informative error messages when ``make_tuple()`` or ``cast()``
- fail. `#262 <https://github.com/pybind/pybind11/pull/262>`_.
-
-* Creation of holder types for classes deriving from
- ``std::enable_shared_from_this<>`` now also works for ``const`` values.
- `#260 <https://github.com/pybind/pybind11/pull/260>`_.
-
-* ``make_iterator()`` improvements for better compatibility with various
- types (now uses prefix increment operator); it now also accepts iterators
- with different begin/end types as long as they are equality comparable.
- `#247 <https://github.com/pybind/pybind11/pull/247>`_.
-
-* ``arg()`` now accepts a wider range of argument types for default values.
- `#244 <https://github.com/pybind/pybind11/pull/244>`_.
-
-* Support ``keep_alive`` where the nurse object may be ``None``. `#341
- <https://github.com/pybind/pybind11/pull/341>`_.
-
-* Added constructors for ``str`` and ``bytes`` from zero-terminated char
- pointers, and from char pointers and length. Added constructors for ``str``
- from ``bytes`` and for ``bytes`` from ``str``, which will perform UTF-8
- decoding/encoding as required.
-
-* Many other improvements of library internals without user-visible changes
-
-
-1.8.1 (July 12, 2016)
-----------------------
-* Fixed a rare but potentially very severe issue when the garbage collector ran
- during pybind11 type creation.
-
-1.8.0 (June 14, 2016)
-----------------------
-* Redesigned CMake build system which exports a convenient
- ``pybind11_add_module`` function to parent projects.
-* ``std::vector<>`` type bindings analogous to Boost.Python's ``indexing_suite``
-* Transparent conversion of sparse and dense Eigen matrices and vectors (``eigen.h``)
-* Added an ``ExtraFlags`` template argument to the NumPy ``array_t<>`` wrapper
- to disable an enforced cast that may lose precision, e.g. to create overloads
- for different precisions and complex vs real-valued matrices.
-* Prevent implicit conversion of floating point values to integral types in
- function arguments
-* Fixed incorrect default return value policy for functions returning a shared
- pointer
-* Don't allow registering a type via ``class_`` twice
-* Don't allow casting a ``None`` value into a C++ lvalue reference
-* Fixed a crash in ``enum_::operator==`` that was triggered by the ``help()`` command
-* Improved detection of whether or not custom C++ types can be copy/move-constructed
-* Extended ``str`` type to also work with ``bytes`` instances
-* Added a ``"name"_a`` user defined string literal that is equivalent to ``py::arg("name")``.
-* When specifying function arguments via ``py::arg``, the test that verifies
- the number of arguments now runs at compile time.
-* Added ``[[noreturn]]`` attribute to ``pybind11_fail()`` to quench some
- compiler warnings
-* List function arguments in exception text when the dispatch code cannot find
- a matching overload
-* Added ``PYBIND11_OVERLOAD_NAME`` and ``PYBIND11_OVERLOAD_PURE_NAME`` macros which
- can be used to override virtual methods whose name differs in C++ and Python
- (e.g. ``__call__`` and ``operator()``)
-* Various minor ``iterator`` and ``make_iterator()`` improvements
-* Transparently support ``__bool__`` on Python 2.x and Python 3.x
-* Fixed issue with destructor of unpickled object not being called
-* Minor CMake build system improvements on Windows
-* New ``pybind11::args`` and ``pybind11::kwargs`` types to create functions which
- take an arbitrary number of arguments and keyword arguments
-* New syntax to call a Python function from C++ using ``*args`` and ``*kwargs``
-* The functions ``def_property_*`` now correctly process docstring arguments (these
- formerly caused a segmentation fault)
-* Many ``mkdoc.py`` improvements (enumerations, template arguments, ``DOC()``
- macro accepts more arguments)
-* Cygwin support
-* Documentation improvements (pickling support, ``keep_alive``, macro usage)
-
-1.7 (April 30, 2016)
-----------------------
-* Added a new ``move`` return value policy that triggers C++11 move semantics.
- The automatic return value policy falls back to this case whenever a rvalue
- reference is encountered
-* Significantly more general GIL state routines that are used instead of
- Python's troublesome ``PyGILState_Ensure`` and ``PyGILState_Release`` API
-* Redesign of opaque types that drastically simplifies their usage
-* Extended ability to pass values of type ``[const] void *``
-* ``keep_alive`` fix: don't fail when there is no patient
-* ``functional.h``: acquire the GIL before calling a Python function
-* Added Python RAII type wrappers ``none`` and ``iterable``
-* Added ``*args`` and ``*kwargs`` pass-through parameters to
- ``pybind11.get_include()`` function
-* Iterator improvements and fixes
-* Documentation on return value policies and opaque types improved
-
-1.6 (April 30, 2016)
-----------------------
-* Skipped due to upload to PyPI gone wrong and inability to recover
- (https://github.com/pypa/packaging-problems/issues/74)
-
-1.5 (April 21, 2016)
-----------------------
-* For polymorphic types, use RTTI to try to return the closest type registered with pybind11
-* Pickling support for serializing and unserializing C++ instances to a byte stream in Python
-* Added a convenience routine ``make_iterator()`` which turns a range indicated
- by a pair of C++ iterators into a iterable Python object
-* Added ``len()`` and a variadic ``make_tuple()`` function
-* Addressed a rare issue that could confuse the current virtual function
- dispatcher and another that could lead to crashes in multi-threaded
- applications
-* Added a ``get_include()`` function to the Python module that returns the path
- of the directory containing the installed pybind11 header files
-* Documentation improvements: import issues, symbol visibility, pickling, limitations
-* Added casting support for ``std::reference_wrapper<>``
-
-1.4 (April 7, 2016)
---------------------------
-* Transparent type conversion for ``std::wstring`` and ``wchar_t``
-* Allow passing ``nullptr``-valued strings
-* Transparent passing of ``void *`` pointers using capsules
-* Transparent support for returning values wrapped in ``std::unique_ptr<>``
-* Improved docstring generation for compatibility with Sphinx
-* Nicer debug error message when default parameter construction fails
-* Support for "opaque" types that bypass the transparent conversion layer for STL containers
-* Redesigned type casting interface to avoid ambiguities that could occasionally cause compiler errors
-* Redesigned property implementation; fixes crashes due to an unfortunate default return value policy
-* Anaconda package generation support
-
-1.3 (March 8, 2016)
---------------------------
-
-* Added support for the Intel C++ compiler (v15+)
-* Added support for the STL unordered set/map data structures
-* Added support for the STL linked list data structure
-* NumPy-style broadcasting support in ``pybind11::vectorize``
-* pybind11 now displays more verbose error messages when ``arg::operator=()`` fails
-* pybind11 internal data structures now live in a version-dependent namespace to avoid ABI issues
-* Many, many bugfixes involving corner cases and advanced usage
-
-1.2 (February 7, 2016)
---------------------------
-
-* Optional: efficient generation of function signatures at compile time using C++14
-* Switched to a simpler and more general way of dealing with function default
- arguments. Unused keyword arguments in function calls are now detected and
- cause errors as expected
-* New ``keep_alive`` call policy analogous to Boost.Python's ``with_custodian_and_ward``
-* New ``pybind11::base<>`` attribute to indicate a subclass relationship
-* Improved interface for RAII type wrappers in ``pytypes.h``
-* Use RAII type wrappers consistently within pybind11 itself. This
- fixes various potential refcount leaks when exceptions occur
-* Added new ``bytes`` RAII type wrapper (maps to ``string`` in Python 2.7)
-* Made handle and related RAII classes const correct, using them more
- consistently everywhere now
-* Got rid of the ugly ``__pybind11__`` attributes on the Python side---they are
- now stored in a C++ hash table that is not visible in Python
-* Fixed refcount leaks involving NumPy arrays and bound functions
-* Vastly improved handling of shared/smart pointers
-* Removed an unnecessary copy operation in ``pybind11::vectorize``
-* Fixed naming clashes when both pybind11 and NumPy headers are included
-* Added conversions for additional exception types
-* Documentation improvements (using multiple extension modules, smart pointers,
- other minor clarifications)
-* unified infrastructure for parsing variadic arguments in ``class_`` and cpp_function
-* Fixed license text (was: ZLIB, should have been: 3-clause BSD)
-* Python 3.2 compatibility
-* Fixed remaining issues when accessing types in another plugin module
-* Added enum comparison and casting methods
-* Improved SFINAE-based detection of whether types are copy-constructible
-* Eliminated many warnings about unused variables and the use of ``offsetof()``
-* Support for ``std::array<>`` conversions
-
-1.1 (December 7, 2015)
---------------------------
-
-* Documentation improvements (GIL, wrapping functions, casting, fixed many typos)
-* Generalized conversion of integer types
-* Improved support for casting function objects
-* Improved support for ``std::shared_ptr<>`` conversions
-* Initial support for ``std::set<>`` conversions
-* Fixed type resolution issue for types defined in a separate plugin module
-* CMake build system improvements
-* Factored out generic functionality to non-templated code (smaller code size)
-* Added a code size / compile time benchmark vs Boost.Python
-* Added an appveyor CI script
-
-1.0 (October 15, 2015)
-------------------------
-* Initial release
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/classes.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/classes.rst
deleted file mode 100644
index f3610ef367d0cbb19dcb8c790ede6b1bf6c4dc3c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/classes.rst
+++ /dev/null
@@ -1,532 +0,0 @@
-.. _classes:
-
-Object-oriented code
-####################
-
-Creating bindings for a custom type
-===================================
-
-Let's now look at a more complex example where we'll create bindings for a
-custom C++ data structure named ``Pet``. Its definition is given below:
-
-.. code-block:: cpp
-
- struct Pet {
- Pet(const std::string &name) : name(name) { }
- void setName(const std::string &name_) { name = name_; }
- const std::string &getName() const { return name; }
-
- std::string name;
- };
-
-The binding code for ``Pet`` looks as follows:
-
-.. code-block:: cpp
-
- #include <pybind11/pybind11.h>
-
- namespace py = pybind11;
-
- PYBIND11_MODULE(example, m) {
- py::class_<Pet>(m, "Pet")
- .def(py::init<const std::string &>())
- .def("setName", &Pet::setName)
- .def("getName", &Pet::getName);
- }
-
-:class:`class_` creates bindings for a C++ *class* or *struct*-style data
-structure. :func:`init` is a convenience function that takes the types of a
-constructor's parameters as template arguments and wraps the corresponding
-constructor (see the :ref:`custom_constructors` section for details). An
-interactive Python session demonstrating this example is shown below:
-
-.. code-block:: pycon
-
- % python
- >>> import example
- >>> p = example.Pet('Molly')
- >>> print(p)
- <example.Pet object at 0x10cd98060>
- >>> p.getName()
- u'Molly'
- >>> p.setName('Charly')
- >>> p.getName()
- u'Charly'
-
-.. seealso::
-
- Static member functions can be bound in the same way using
- :func:`class_::def_static`.
-
-Keyword and default arguments
-=============================
-It is possible to specify keyword and default arguments using the syntax
-discussed in the previous chapter. Refer to the sections :ref:`keyword_args`
-and :ref:`default_args` for details.
-
-Binding lambda functions
-========================
-
-Note how ``print(p)`` produced a rather useless summary of our data structure in the example above:
-
-.. code-block:: pycon
-
- >>> print(p)
- <example.Pet object at 0x10cd98060>
-
-To address this, we could bind a utility function that returns a human-readable
-summary to the special method slot named ``__repr__``. Unfortunately, there is no
-suitable functionality in the ``Pet`` data structure, and it would be nice if
-we did not have to change it. This can easily be accomplished by binding a
-Lambda function instead:
-
-.. code-block:: cpp
-
- py::class_<Pet>(m, "Pet")
- .def(py::init<const std::string &>())
- .def("setName", &Pet::setName)
- .def("getName", &Pet::getName)
- .def("__repr__",
- [](const Pet &a) {
- return "<example.Pet named '" + a.name + "'>";
- }
- );
-
-Both stateless [#f1]_ and stateful lambda closures are supported by pybind11.
-With the above change, the same Python code now produces the following output:
-
-.. code-block:: pycon
-
- >>> print(p)
- <example.Pet named 'Molly'>
-
-.. [#f1] Stateless closures are those with an empty pair of brackets ``[]`` as the capture object.
-
-.. _properties:
-
-Instance and static fields
-==========================
-
-We can also directly expose the ``name`` field using the
-:func:`class_::def_readwrite` method. A similar :func:`class_::def_readonly`
-method also exists for ``const`` fields.
-
-.. code-block:: cpp
-
- py::class_<Pet>(m, "Pet")
- .def(py::init<const std::string &>())
- .def_readwrite("name", &Pet::name)
- // ... remainder ...
-
-This makes it possible to write
-
-.. code-block:: pycon
-
- >>> p = example.Pet('Molly')
- >>> p.name
- u'Molly'
- >>> p.name = 'Charly'
- >>> p.name
- u'Charly'
-
-Now suppose that ``Pet::name`` was a private internal variable
-that can only be accessed via setters and getters.
-
-.. code-block:: cpp
-
- class Pet {
- public:
- Pet(const std::string &name) : name(name) { }
- void setName(const std::string &name_) { name = name_; }
- const std::string &getName() const { return name; }
- private:
- std::string name;
- };
-
-In this case, the method :func:`class_::def_property`
-(:func:`class_::def_property_readonly` for read-only data) can be used to
-provide a field-like interface within Python that will transparently call
-the setter and getter functions:
-
-.. code-block:: cpp
-
- py::class_<Pet>(m, "Pet")
- .def(py::init<const std::string &>())
- .def_property("name", &Pet::getName, &Pet::setName)
- // ... remainder ...
-
-Write only properties can be defined by passing ``nullptr`` as the
-input for the read function.
-
-.. seealso::
-
- Similar functions :func:`class_::def_readwrite_static`,
- :func:`class_::def_readonly_static` :func:`class_::def_property_static`,
- and :func:`class_::def_property_readonly_static` are provided for binding
- static variables and properties. Please also see the section on
- :ref:`static_properties` in the advanced part of the documentation.
-
-Dynamic attributes
-==================
-
-Native Python classes can pick up new attributes dynamically:
-
-.. code-block:: pycon
-
- >>> class Pet:
- ... name = 'Molly'
- ...
- >>> p = Pet()
- >>> p.name = 'Charly' # overwrite existing
- >>> p.age = 2 # dynamically add a new attribute
-
-By default, classes exported from C++ do not support this and the only writable
-attributes are the ones explicitly defined using :func:`class_::def_readwrite`
-or :func:`class_::def_property`.
-
-.. code-block:: cpp
-
- py::class_<Pet>(m, "Pet")
- .def(py::init<>())
- .def_readwrite("name", &Pet::name);
-
-Trying to set any other attribute results in an error:
-
-.. code-block:: pycon
-
- >>> p = example.Pet()
- >>> p.name = 'Charly' # OK, attribute defined in C++
- >>> p.age = 2 # fail
- AttributeError: 'Pet' object has no attribute 'age'
-
-To enable dynamic attributes for C++ classes, the :class:`py::dynamic_attr` tag
-must be added to the :class:`py::class_` constructor:
-
-.. code-block:: cpp
-
- py::class_<Pet>(m, "Pet", py::dynamic_attr())
- .def(py::init<>())
- .def_readwrite("name", &Pet::name);
-
-Now everything works as expected:
-
-.. code-block:: pycon
-
- >>> p = example.Pet()
- >>> p.name = 'Charly' # OK, overwrite value in C++
- >>> p.age = 2 # OK, dynamically add a new attribute
- >>> p.__dict__ # just like a native Python class
- {'age': 2}
-
-Note that there is a small runtime cost for a class with dynamic attributes.
-Not only because of the addition of a ``__dict__``, but also because of more
-expensive garbage collection tracking which must be activated to resolve
-possible circular references. Native Python classes incur this same cost by
-default, so this is not anything to worry about. By default, pybind11 classes
-are more efficient than native Python classes. Enabling dynamic attributes
-just brings them on par.
-
-.. _inheritance:
-
-Inheritance and automatic downcasting
-=====================================
-
-Suppose now that the example consists of two data structures with an
-inheritance relationship:
-
-.. code-block:: cpp
-
- struct Pet {
- Pet(const std::string &name) : name(name) { }
- std::string name;
- };
-
- struct Dog : Pet {
- Dog(const std::string &name) : Pet(name) { }
- std::string bark() const { return "woof!"; }
- };
-
-There are two different ways of indicating a hierarchical relationship to
-pybind11: the first specifies the C++ base class as an extra template
-parameter of the :class:`class_`:
-
-.. code-block:: cpp
-
- py::class_<Pet>(m, "Pet")
- .def(py::init<const std::string &>())
- .def_readwrite("name", &Pet::name);
-
- // Method 1: template parameter:
- py::class_<Dog, Pet /* <- specify C++ parent type */>(m, "Dog")
- .def(py::init<const std::string &>())
- .def("bark", &Dog::bark);
-
-Alternatively, we can also assign a name to the previously bound ``Pet``
-:class:`class_` object and reference it when binding the ``Dog`` class:
-
-.. code-block:: cpp
-
- py::class_<Pet> pet(m, "Pet");
- pet.def(py::init<const std::string &>())
- .def_readwrite("name", &Pet::name);
-
- // Method 2: pass parent class_ object:
- py::class_<Dog>(m, "Dog", pet /* <- specify Python parent type */)
- .def(py::init<const std::string &>())
- .def("bark", &Dog::bark);
-
-Functionality-wise, both approaches are equivalent. Afterwards, instances will
-expose fields and methods of both types:
-
-.. code-block:: pycon
-
- >>> p = example.Dog('Molly')
- >>> p.name
- u'Molly'
- >>> p.bark()
- u'woof!'
-
-The C++ classes defined above are regular non-polymorphic types with an
-inheritance relationship. This is reflected in Python:
-
-.. code-block:: cpp
-
- // Return a base pointer to a derived instance
- m.def("pet_store", []() { return std::unique_ptr<Pet>(new Dog("Molly")); });
-
-.. code-block:: pycon
-
- >>> p = example.pet_store()
- >>> type(p) # `Dog` instance behind `Pet` pointer
- Pet # no pointer downcasting for regular non-polymorphic types
- >>> p.bark()
- AttributeError: 'Pet' object has no attribute 'bark'
-
-The function returned a ``Dog`` instance, but because it's a non-polymorphic
-type behind a base pointer, Python only sees a ``Pet``. In C++, a type is only
-considered polymorphic if it has at least one virtual function and pybind11
-will automatically recognize this:
-
-.. code-block:: cpp
-
- struct PolymorphicPet {
- virtual ~PolymorphicPet() = default;
- };
-
- struct PolymorphicDog : PolymorphicPet {
- std::string bark() const { return "woof!"; }
- };
-
- // Same binding code
- py::class_<PolymorphicPet>(m, "PolymorphicPet");
- py::class_<PolymorphicDog, PolymorphicPet>(m, "PolymorphicDog")
- .def(py::init<>())
- .def("bark", &PolymorphicDog::bark);
-
- // Again, return a base pointer to a derived instance
- m.def("pet_store2", []() { return std::unique_ptr<PolymorphicPet>(new PolymorphicDog); });
-
-.. code-block:: pycon
-
- >>> p = example.pet_store2()
- >>> type(p)
- PolymorphicDog # automatically downcast
- >>> p.bark()
- u'woof!'
-
-Given a pointer to a polymorphic base, pybind11 performs automatic downcasting
-to the actual derived type. Note that this goes beyond the usual situation in
-C++: we don't just get access to the virtual functions of the base, we get the
-concrete derived type including functions and attributes that the base type may
-not even be aware of.
-
-.. seealso::
-
- For more information about polymorphic behavior see :ref:`overriding_virtuals`.
-
-
-Overloaded methods
-==================
-
-Sometimes there are several overloaded C++ methods with the same name taking
-different kinds of input arguments:
-
-.. code-block:: cpp
-
- struct Pet {
- Pet(const std::string &name, int age) : name(name), age(age) { }
-
- void set(int age_) { age = age_; }
- void set(const std::string &name_) { name = name_; }
-
- std::string name;
- int age;
- };
-
-Attempting to bind ``Pet::set`` will cause an error since the compiler does not
-know which method the user intended to select. We can disambiguate by casting
-them to function pointers. Binding multiple functions to the same Python name
-automatically creates a chain of function overloads that will be tried in
-sequence.
-
-.. code-block:: cpp
-
- py::class_<Pet>(m, "Pet")
- .def(py::init<const std::string &, int>())
- .def("set", static_cast<void (Pet::*)(int)>(&Pet::set), "Set the pet's age")
- .def("set", static_cast<void (Pet::*)(const std::string &)>(&Pet::set), "Set the pet's name");
-
-The overload signatures are also visible in the method's docstring:
-
-.. code-block:: pycon
-
- >>> help(example.Pet)
-
- class Pet(__builtin__.object)
- | Methods defined here:
- |
- | __init__(...)
- | Signature : (Pet, str, int) -> NoneType
- |
- | set(...)
- | 1. Signature : (Pet, int) -> NoneType
- |
- | Set the pet's age
- |
- | 2. Signature : (Pet, str) -> NoneType
- |
- | Set the pet's name
-
-If you have a C++14 compatible compiler [#cpp14]_, you can use an alternative
-syntax to cast the overloaded function:
-
-.. code-block:: cpp
-
- py::class_<Pet>(m, "Pet")
- .def("set", py::overload_cast<int>(&Pet::set), "Set the pet's age")
- .def("set", py::overload_cast<const std::string &>(&Pet::set), "Set the pet's name");
-
-Here, ``py::overload_cast`` only requires the parameter types to be specified.
-The return type and class are deduced. This avoids the additional noise of
-``void (Pet::*)()`` as seen in the raw cast. If a function is overloaded based
-on constness, the ``py::const_`` tag should be used:
-
-.. code-block:: cpp
-
- struct Widget {
- int foo(int x, float y);
- int foo(int x, float y) const;
- };
-
- py::class_<Widget>(m, "Widget")
- .def("foo_mutable", py::overload_cast<int, float>(&Widget::foo))
- .def("foo_const", py::overload_cast<int, float>(&Widget::foo, py::const_));
-
-If you prefer the ``py::overload_cast`` syntax but have a C++11 compatible compiler only,
-you can use ``py::detail::overload_cast_impl`` with an additional set of parentheses:
-
-.. code-block:: cpp
-
- template <typename... Args>
- using overload_cast_ = pybind11::detail::overload_cast_impl<Args...>;
-
- py::class_<Pet>(m, "Pet")
- .def("set", overload_cast_<int>()(&Pet::set), "Set the pet's age")
- .def("set", overload_cast_<const std::string &>()(&Pet::set), "Set the pet's name");
-
-.. [#cpp14] A compiler which supports the ``-std=c++14`` flag
- or Visual Studio 2015 Update 2 and newer.
-
-.. note::
-
- To define multiple overloaded constructors, simply declare one after the
- other using the ``.def(py::init<...>())`` syntax. The existing machinery
- for specifying keyword and default arguments also works.
-
-Enumerations and internal types
-===============================
-
-Let's now suppose that the example class contains an internal enumeration type,
-e.g.:
-
-.. code-block:: cpp
-
- struct Pet {
- enum Kind {
- Dog = 0,
- Cat
- };
-
- Pet(const std::string &name, Kind type) : name(name), type(type) { }
-
- std::string name;
- Kind type;
- };
-
-The binding code for this example looks as follows:
-
-.. code-block:: cpp
-
- py::class_<Pet> pet(m, "Pet");
-
- pet.def(py::init<const std::string &, Pet::Kind>())
- .def_readwrite("name", &Pet::name)
- .def_readwrite("type", &Pet::type);
-
- py::enum_<Pet::Kind>(pet, "Kind")
- .value("Dog", Pet::Kind::Dog)
- .value("Cat", Pet::Kind::Cat)
- .export_values();
-
-To ensure that the ``Kind`` type is created within the scope of ``Pet``, the
-``pet`` :class:`class_` instance must be supplied to the :class:`enum_`.
-constructor. The :func:`enum_::export_values` function exports the enum entries
-into the parent scope, which should be skipped for newer C++11-style strongly
-typed enums.
-
-.. code-block:: pycon
-
- >>> p = Pet('Lucy', Pet.Cat)
- >>> p.type
- Kind.Cat
- >>> int(p.type)
- 1L
-
-The entries defined by the enumeration type are exposed in the ``__members__`` property:
-
-.. code-block:: pycon
-
- >>> Pet.Kind.__members__
- {'Dog': Kind.Dog, 'Cat': Kind.Cat}
-
-The ``name`` property returns the name of the enum value as a unicode string.
-
-.. note::
-
- It is also possible to use ``str(enum)``, however these accomplish different
- goals. The following shows how these two approaches differ.
-
- .. code-block:: pycon
-
- >>> p = Pet( "Lucy", Pet.Cat )
- >>> pet_type = p.type
- >>> pet_type
- Pet.Cat
- >>> str(pet_type)
- 'Pet.Cat'
- >>> pet_type.name
- 'Cat'
-
-.. note::
-
- When the special tag ``py::arithmetic()`` is specified to the ``enum_``
- constructor, pybind11 creates an enumeration that also supports rudimentary
- arithmetic and bit-level operations like comparisons, and, or, xor, negation,
- etc.
-
- .. code-block:: cpp
-
- py::enum_<Pet::Kind>(pet, "Kind", py::arithmetic())
- ...
-
- By default, these are omitted to conserve space.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/cmake/index.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/cmake/index.rst
deleted file mode 100644
index eaf66d70f31fadc25bc6810aa458854893b9db6e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/cmake/index.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-CMake helpers
--------------
-
-Pybind11 can be used with ``add_subdirectory(extern/pybind11)``, or from an
-install with ``find_package(pybind11 CONFIG)``. The interface provided in
-either case is functionally identical.
-
-.. cmake-module:: ../../tools/pybind11Config.cmake.in
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/compiling.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/compiling.rst
deleted file mode 100644
index 25b703e341efc498725b82f57aedc4c1e315717d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/compiling.rst
+++ /dev/null
@@ -1,600 +0,0 @@
-.. _compiling:
-
-Build systems
-#############
-
-.. _build-setuptools:
-
-Building with setuptools
-========================
-
-For projects on PyPI, building with setuptools is the way to go. Sylvain Corlay
-has kindly provided an example project which shows how to set up everything,
-including automatic generation of documentation using Sphinx. Please refer to
-the [python_example]_ repository.
-
-.. [python_example] https://github.com/pybind/python_example
-
-A helper file is provided with pybind11 that can simplify usage with setuptools.
-
-To use pybind11 inside your ``setup.py``, you have to have some system to
-ensure that ``pybind11`` is installed when you build your package. There are
-four possible ways to do this, and pybind11 supports all four: You can ask all
-users to install pybind11 beforehand (bad), you can use
-:ref:`setup_helpers-pep518` (good, but very new and requires Pip 10),
-:ref:`setup_helpers-setup_requires` (discouraged by Python packagers now that
-PEP 518 is available, but it still works everywhere), or you can
-:ref:`setup_helpers-copy-manually` (always works but you have to manually sync
-your copy to get updates).
-
-An example of a ``setup.py`` using pybind11's helpers:
-
-.. code-block:: python
-
- from glob import glob
- from setuptools import setup
- from pybind11.setup_helpers import Pybind11Extension
-
- ext_modules = [
- Pybind11Extension(
- "python_example",
- sorted(glob("src/*.cpp")), # Sort source files for reproducibility
- ),
- ]
-
- setup(
- ...,
- ext_modules=ext_modules
- )
-
-If you want to do an automatic search for the highest supported C++ standard,
-that is supported via a ``build_ext`` command override; it will only affect
-``Pybind11Extensions``:
-
-.. code-block:: python
-
- from glob import glob
- from setuptools import setup
- from pybind11.setup_helpers import Pybind11Extension, build_ext
-
- ext_modules = [
- Pybind11Extension(
- "python_example",
- sorted(glob("src/*.cpp")),
- ),
- ]
-
- setup(
- ...,
- cmdclass={"build_ext": build_ext},
- ext_modules=ext_modules
- )
-
-Since pybind11 does not require NumPy when building, a light-weight replacement
-for NumPy's parallel compilation distutils tool is included. Use it like this:
-
-.. code-block:: python
-
- from pybind11.setup_helpers import ParallelCompile
-
- # Optional multithreaded build
- ParallelCompile("NPY_NUM_BUILD_JOBS").install()
-
- setup(...)
-
-The argument is the name of an environment variable to control the number of
-threads, such as ``NPY_NUM_BUILD_JOBS`` (as used by NumPy), though you can set
-something different if you want. You can also pass ``default=N`` to set the
-default number of threads (0 will take the number of threads available) and
-``max=N``, the maximum number of threads; if you have a large extension you may
-want set this to a memory dependent number.
-
-.. _setup_helpers-pep518:
-
-PEP 518 requirements (Pip 10+ required)
----------------------------------------
-
-If you use `PEP 518's <https://www.python.org/dev/peps/pep-0518/>`_
-``pyproject.toml`` file, you can ensure that ``pybind11`` is available during
-the compilation of your project. When this file exists, Pip will make a new
-virtual environment, download just the packages listed here in ``requires=``,
-and build a wheel (binary Python package). It will then throw away the
-environment, and install your wheel.
-
-Your ``pyproject.toml`` file will likely look something like this:
-
-.. code-block:: toml
-
- [build-system]
- requires = ["setuptools", "wheel", "pybind11==2.6.0"]
- build-backend = "setuptools.build_meta"
-
-.. note::
-
- The main drawback to this method is that a `PEP 517`_ compliant build tool,
- such as Pip 10+, is required for this approach to work; older versions of
- Pip completely ignore this file. If you distribute binaries (called wheels
- in Python) using something like `cibuildwheel`_, remember that ``setup.py``
- and ``pyproject.toml`` are not even contained in the wheel, so this high
- Pip requirement is only for source builds, and will not affect users of
- your binary wheels.
-
-.. _PEP 517: https://www.python.org/dev/peps/pep-0517/
-.. _cibuildwheel: https://cibuildwheel.readthedocs.io
-
-.. _setup_helpers-setup_requires:
-
-Classic ``setup_requires``
---------------------------
-
-If you want to support old versions of Pip with the classic
-``setup_requires=["pybind11"]`` keyword argument to setup, which triggers a
-two-phase ``setup.py`` run, then you will need to use something like this to
-ensure the first pass works (which has not yet installed the ``setup_requires``
-packages, since it can't install something it does not know about):
-
-.. code-block:: python
-
- try:
- from pybind11.setup_helpers import Pybind11Extension
- except ImportError:
- from setuptools import Extension as Pybind11Extension
-
-
-It doesn't matter that the Extension class is not the enhanced subclass for the
-first pass run; and the second pass will have the ``setup_requires``
-requirements.
-
-This is obviously more of a hack than the PEP 518 method, but it supports
-ancient versions of Pip.
-
-.. _setup_helpers-copy-manually:
-
-Copy manually
--------------
-
-You can also copy ``setup_helpers.py`` directly to your project; it was
-designed to be usable standalone, like the old example ``setup.py``. You can
-set ``include_pybind11=False`` to skip including the pybind11 package headers,
-so you can use it with git submodules and a specific git version. If you use
-this, you will need to import from a local file in ``setup.py`` and ensure the
-helper file is part of your MANIFEST.
-
-
-Closely related, if you include pybind11 as a subproject, you can run the
-``setup_helpers.py`` inplace. If loaded correctly, this should even pick up
-the correct include for pybind11, though you can turn it off as shown above if
-you want to input it manually.
-
-Suggested usage if you have pybind11 as a submodule in ``extern/pybind11``:
-
-.. code-block:: python
-
- DIR = os.path.abspath(os.path.dirname(__file__))
-
- sys.path.append(os.path.join(DIR, "extern", "pybind11"))
- from pybind11.setup_helpers import Pybind11Extension # noqa: E402
-
- del sys.path[-1]
-
-
-.. versionchanged:: 2.6
-
- Added ``setup_helpers`` file.
-
-Building with cppimport
-========================
-
-[cppimport]_ is a small Python import hook that determines whether there is a C++
-source file whose name matches the requested module. If there is, the file is
-compiled as a Python extension using pybind11 and placed in the same folder as
-the C++ source file. Python is then able to find the module and load it.
-
-.. [cppimport] https://github.com/tbenthompson/cppimport
-
-.. _cmake:
-
-Building with CMake
-===================
-
-For C++ codebases that have an existing CMake-based build system, a Python
-extension module can be created with just a few lines of code:
-
-.. code-block:: cmake
-
- cmake_minimum_required(VERSION 3.4...3.18)
- project(example LANGUAGES CXX)
-
- add_subdirectory(pybind11)
- pybind11_add_module(example example.cpp)
-
-This assumes that the pybind11 repository is located in a subdirectory named
-:file:`pybind11` and that the code is located in a file named :file:`example.cpp`.
-The CMake command ``add_subdirectory`` will import the pybind11 project which
-provides the ``pybind11_add_module`` function. It will take care of all the
-details needed to build a Python extension module on any platform.
-
-A working sample project, including a way to invoke CMake from :file:`setup.py` for
-PyPI integration, can be found in the [cmake_example]_ repository.
-
-.. [cmake_example] https://github.com/pybind/cmake_example
-
-.. versionchanged:: 2.6
- CMake 3.4+ is required.
-
-Further information can be found at :doc:`cmake/index`.
-
-pybind11_add_module
--------------------
-
-To ease the creation of Python extension modules, pybind11 provides a CMake
-function with the following signature:
-
-.. code-block:: cmake
-
- pybind11_add_module(<name> [MODULE | SHARED] [EXCLUDE_FROM_ALL]
- [NO_EXTRAS] [THIN_LTO] [OPT_SIZE] source1 [source2 ...])
-
-This function behaves very much like CMake's builtin ``add_library`` (in fact,
-it's a wrapper function around that command). It will add a library target
-called ``<name>`` to be built from the listed source files. In addition, it
-will take care of all the Python-specific compiler and linker flags as well
-as the OS- and Python-version-specific file extension. The produced target
-``<name>`` can be further manipulated with regular CMake commands.
-
-``MODULE`` or ``SHARED`` may be given to specify the type of library. If no
-type is given, ``MODULE`` is used by default which ensures the creation of a
-Python-exclusive module. Specifying ``SHARED`` will create a more traditional
-dynamic library which can also be linked from elsewhere. ``EXCLUDE_FROM_ALL``
-removes this target from the default build (see CMake docs for details).
-
-Since pybind11 is a template library, ``pybind11_add_module`` adds compiler
-flags to ensure high quality code generation without bloat arising from long
-symbol names and duplication of code in different translation units. It
-sets default visibility to *hidden*, which is required for some pybind11
-features and functionality when attempting to load multiple pybind11 modules
-compiled under different pybind11 versions. It also adds additional flags
-enabling LTO (Link Time Optimization) and strip unneeded symbols. See the
-:ref:`FAQ entry <faq:symhidden>` for a more detailed explanation. These
-latter optimizations are never applied in ``Debug`` mode. If ``NO_EXTRAS`` is
-given, they will always be disabled, even in ``Release`` mode. However, this
-will result in code bloat and is generally not recommended.
-
-As stated above, LTO is enabled by default. Some newer compilers also support
-different flavors of LTO such as `ThinLTO`_. Setting ``THIN_LTO`` will cause
-the function to prefer this flavor if available. The function falls back to
-regular LTO if ``-flto=thin`` is not available. If
-``CMAKE_INTERPROCEDURAL_OPTIMIZATION`` is set (either ``ON`` or ``OFF``), then
-that will be respected instead of the built-in flag search.
-
-.. note::
-
- If you want to set the property form on targets or the
- ``CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG>`` versions of this, you should
- still use ``set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)`` (otherwise a
- no-op) to disable pybind11's ipo flags.
-
-The ``OPT_SIZE`` flag enables size-based optimization equivalent to the
-standard ``/Os`` or ``-Os`` compiler flags and the ``MinSizeRel`` build type,
-which avoid optimizations that that can substantially increase the size of the
-resulting binary. This flag is particularly useful in projects that are split
-into performance-critical parts and associated bindings. In this case, we can
-compile the project in release mode (and hence, optimize performance globally),
-and specify ``OPT_SIZE`` for the binding target, where size might be the main
-concern as performance is often less critical here. A ~25% size reduction has
-been observed in practice. This flag only changes the optimization behavior at
-a per-target level and takes precedence over the global CMake build type
-(``Release``, ``RelWithDebInfo``) except for ``Debug`` builds, where
-optimizations remain disabled.
-
-.. _ThinLTO: http://clang.llvm.org/docs/ThinLTO.html
-
-Configuration variables
------------------------
-
-By default, pybind11 will compile modules with the compiler default or the
-minimum standard required by pybind11, whichever is higher. You can set the
-standard explicitly with
-`CMAKE_CXX_STANDARD <https://cmake.org/cmake/help/latest/variable/CMAKE_CXX_STANDARD.html>`_:
-
-.. code-block:: cmake
-
- set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ version selection") # or 11, 14, 17, 20
- set(CMAKE_CXX_STANDARD_REQUIRED ON) # optional, ensure standard is supported
- set(CMAKE_CXX_EXTENSIONS OFF) # optional, keep compiler extensionsn off
-
-The variables can also be set when calling CMake from the command line using
-the ``-D<variable>=<value>`` flag. You can also manually set ``CXX_STANDARD``
-on a target or use ``target_compile_features`` on your targets - anything that
-CMake supports.
-
-Classic Python support: The target Python version can be selected by setting
-``PYBIND11_PYTHON_VERSION`` or an exact Python installation can be specified
-with ``PYTHON_EXECUTABLE``. For example:
-
-.. code-block:: bash
-
- cmake -DPYBIND11_PYTHON_VERSION=3.6 ..
-
- # Another method:
- cmake -DPYTHON_EXECUTABLE=/path/to/python ..
-
- # This often is a good way to get the current Python, works in environments:
- cmake -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") ..
-
-
-find_package vs. add_subdirectory
----------------------------------
-
-For CMake-based projects that don't include the pybind11 repository internally,
-an external installation can be detected through ``find_package(pybind11)``.
-See the `Config file`_ docstring for details of relevant CMake variables.
-
-.. code-block:: cmake
-
- cmake_minimum_required(VERSION 3.4...3.18)
- project(example LANGUAGES CXX)
-
- find_package(pybind11 REQUIRED)
- pybind11_add_module(example example.cpp)
-
-Note that ``find_package(pybind11)`` will only work correctly if pybind11
-has been correctly installed on the system, e. g. after downloading or cloning
-the pybind11 repository :
-
-.. code-block:: bash
-
- # Classic CMake
- cd pybind11
- mkdir build
- cd build
- cmake ..
- make install
-
- # CMake 3.15+
- cd pybind11
- cmake -S . -B build
- cmake --build build -j 2 # Build on 2 cores
- cmake --install build
-
-Once detected, the aforementioned ``pybind11_add_module`` can be employed as
-before. The function usage and configuration variables are identical no matter
-if pybind11 is added as a subdirectory or found as an installed package. You
-can refer to the same [cmake_example]_ repository for a full sample project
--- just swap out ``add_subdirectory`` for ``find_package``.
-
-.. _Config file: https://github.com/pybind/pybind11/blob/master/tools/pybind11Config.cmake.in
-
-
-.. _find-python-mode:
-
-FindPython mode
----------------
-
-CMake 3.12+ (3.15+ recommended) added a new module called FindPython that had a
-highly improved search algorithm and modern targets and tools. If you use
-FindPython, pybind11 will detect this and use the existing targets instead:
-
-.. code-block:: cmake
-
- cmake_minumum_required(VERSION 3.15...3.18)
- project(example LANGUAGES CXX)
-
- find_package(Python COMPONENTS Interpreter Development REQUIRED)
- find_package(pybind11 CONFIG REQUIRED)
- # or add_subdirectory(pybind11)
-
- pybind11_add_module(example example.cpp)
-
-You can also use the targets (as listed below) with FindPython. If you define
-``PYBIND11_FINDPYTHON``, pybind11 will perform the FindPython step for you
-(mostly useful when building pybind11's own tests, or as a way to change search
-algorithms from the CMake invocation, with ``-DPYBIND11_FINDPYTHON=ON``.
-
-.. warning::
-
- If you use FindPython2 and FindPython3 to dual-target Python, use the
- individual targets listed below, and avoid targets that directly include
- Python parts.
-
-There are `many ways to hint or force a discovery of a specific Python
-installation <https://cmake.org/cmake/help/latest/module/FindPython.html>`_),
-setting ``Python_ROOT_DIR`` may be the most common one (though with
-virtualenv/venv support, and Conda support, this tends to find the correct
-Python version more often than the old system did).
-
-.. versionadded:: 2.6
-
-Advanced: interface library targets
------------------------------------
-
-Pybind11 supports modern CMake usage patterns with a set of interface targets,
-available in all modes. The targets provided are:
-
- ``pybind11::headers``
- Just the pybind11 headers and minimum compile requirements
-
- ``pybind11::python2_no_register``
- Quiets the warning/error when mixing C++14 or higher and Python 2
-
- ``pybind11::pybind11``
- Python headers + ``pybind11::headers`` + ``pybind11::python2_no_register`` (Python 2 only)
-
- ``pybind11::python_link_helper``
- Just the "linking" part of pybind11:module
-
- ``pybind11::module``
- Everything for extension modules - ``pybind11::pybind11`` + ``Python::Module`` (FindPython CMake 3.15+) or ``pybind11::python_link_helper``
-
- ``pybind11::embed``
- Everything for embedding the Python interpreter - ``pybind11::pybind11`` + ``Python::Embed`` (FindPython) or Python libs
-
- ``pybind11::lto`` / ``pybind11::thin_lto``
- An alternative to `INTERPROCEDURAL_OPTIMIZATION` for adding link-time optimization.
-
- ``pybind11::windows_extras``
- ``/bigobj`` and ``/mp`` for MSVC.
-
- ``pybind11::opt_size``
- ``/Os`` for MSVC, ``-Os`` for other compilers. Does nothing for debug builds.
-
-Two helper functions are also provided:
-
- ``pybind11_strip(target)``
- Strips a target (uses ``CMAKE_STRIP`` after the target is built)
-
- ``pybind11_extension(target)``
- Sets the correct extension (with SOABI) for a target.
-
-You can use these targets to build complex applications. For example, the
-``add_python_module`` function is identical to:
-
-.. code-block:: cmake
-
- cmake_minimum_required(VERSION 3.4)
- project(example LANGUAGES CXX)
-
- find_package(pybind11 REQUIRED) # or add_subdirectory(pybind11)
-
- add_library(example MODULE main.cpp)
-
- target_link_libraries(example PRIVATE pybind11::module pybind11::lto pybind11::windows_extras)
-
- pybind11_extension(example)
- pybind11_strip(example)
-
- set_target_properties(example PROPERTIES CXX_VISIBILITY_PRESET "hidden"
- CUDA_VISIBILITY_PRESET "hidden")
-
-Instead of setting properties, you can set ``CMAKE_*`` variables to initialize these correctly.
-
-.. warning::
-
- Since pybind11 is a metatemplate library, it is crucial that certain
- compiler flags are provided to ensure high quality code generation. In
- contrast to the ``pybind11_add_module()`` command, the CMake interface
- provides a *composable* set of targets to ensure that you retain flexibility.
- It can be expecially important to provide or set these properties; the
- :ref:`FAQ <faq:symhidden>` contains an explanation on why these are needed.
-
-.. versionadded:: 2.6
-
-.. _nopython-mode:
-
-Advanced: NOPYTHON mode
------------------------
-
-If you want complete control, you can set ``PYBIND11_NOPYTHON`` to completely
-disable Python integration (this also happens if you run ``FindPython2`` and
-``FindPython3`` without running ``FindPython``). This gives you complete
-freedom to integrate into an existing system (like `Scikit-Build's
-<https://scikit-build.readthedocs.io>`_ ``PythonExtensions``).
-``pybind11_add_module`` and ``pybind11_extension`` will be unavailable, and the
-targets will be missing any Python specific behavior.
-
-.. versionadded:: 2.6
-
-Embedding the Python interpreter
---------------------------------
-
-In addition to extension modules, pybind11 also supports embedding Python into
-a C++ executable or library. In CMake, simply link with the ``pybind11::embed``
-target. It provides everything needed to get the interpreter running. The Python
-headers and libraries are attached to the target. Unlike ``pybind11::module``,
-there is no need to manually set any additional properties here. For more
-information about usage in C++, see :doc:`/advanced/embedding`.
-
-.. code-block:: cmake
-
- cmake_minimum_required(VERSION 3.4...3.18)
- project(example LANGUAGES CXX)
-
- find_package(pybind11 REQUIRED) # or add_subdirectory(pybind11)
-
- add_executable(example main.cpp)
- target_link_libraries(example PRIVATE pybind11::embed)
-
-.. _building_manually:
-
-Building manually
-=================
-
-pybind11 is a header-only library, hence it is not necessary to link against
-any special libraries and there are no intermediate (magic) translation steps.
-
-On Linux, you can compile an example such as the one given in
-:ref:`simple_example` using the following command:
-
-.. code-block:: bash
-
- $ c++ -O3 -Wall -shared -std=c++11 -fPIC `python3 -m pybind11 --includes` example.cpp -o example`python3-config --extension-suffix`
-
-The flags given here assume that you're using Python 3. For Python 2, just
-change the executable appropriately (to ``python`` or ``python2``).
-
-The ``python3 -m pybind11 --includes`` command fetches the include paths for
-both pybind11 and Python headers. This assumes that pybind11 has been installed
-using ``pip`` or ``conda``. If it hasn't, you can also manually specify
-``-I <path-to-pybind11>/include`` together with the Python includes path
-``python3-config --includes``.
-
-Note that Python 2.7 modules don't use a special suffix, so you should simply
-use ``example.so`` instead of ``example`python3-config --extension-suffix```.
-Besides, the ``--extension-suffix`` option may or may not be available, depending
-on the distribution; in the latter case, the module extension can be manually
-set to ``.so``.
-
-On macOS: the build command is almost the same but it also requires passing
-the ``-undefined dynamic_lookup`` flag so as to ignore missing symbols when
-building the module:
-
-.. code-block:: bash
-
- $ c++ -O3 -Wall -shared -std=c++11 -undefined dynamic_lookup `python3 -m pybind11 --includes` example.cpp -o example`python3-config --extension-suffix`
-
-In general, it is advisable to include several additional build parameters
-that can considerably reduce the size of the created binary. Refer to section
-:ref:`cmake` for a detailed example of a suitable cross-platform CMake-based
-build system that works on all platforms including Windows.
-
-.. note::
-
- On Linux and macOS, it's better to (intentionally) not link against
- ``libpython``. The symbols will be resolved when the extension library
- is loaded into a Python binary. This is preferable because you might
- have several different installations of a given Python version (e.g. the
- system-provided Python, and one that ships with a piece of commercial
- software). In this way, the plugin will work with both versions, instead
- of possibly importing a second Python library into a process that already
- contains one (which will lead to a segfault).
-
-
-Building with Bazel
-===================
-
-You can build with the Bazel build system using the `pybind11_bazel
-<https://github.com/pybind/pybind11_bazel>`_ repository.
-
-Generating binding code automatically
-=====================================
-
-The ``Binder`` project is a tool for automatic generation of pybind11 binding
-code by introspecting existing C++ codebases using LLVM/Clang. See the
-[binder]_ documentation for details.
-
-.. [binder] http://cppbinder.readthedocs.io/en/latest/about.html
-
-[AutoWIG]_ is a Python library that wraps automatically compiled libraries into
-high-level languages. It parses C++ code using LLVM/Clang technologies and
-generates the wrappers using the Mako templating engine. The approach is automatic,
-extensible, and applies to very complex C++ libraries, composed of thousands of
-classes or incorporating modern meta-programming constructs.
-
-.. [AutoWIG] https://github.com/StatisKit/AutoWIG
-
-[robotpy-build]_ is a is a pure python, cross platform build tool that aims to
-simplify creation of python wheels for pybind11 projects, and provide
-cross-project dependency management. Additionally, it is able to autogenerate
-customizable pybind11-based wrappers by parsing C++ header files.
-
-.. [robotpy-build] https://robotpy-build.readthedocs.io
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/conf.py b/3rdParty/pybind11/pybind11-2.6.0/docs/conf.py
deleted file mode 100644
index 66db310e46e45bea7b3df48ce5c448cf0d30c932..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/conf.py
+++ /dev/null
@@ -1,377 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# pybind11 documentation build configuration file, created by
-# sphinx-quickstart on Sun Oct 11 19:23:48 2015.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys
-import os
-import shlex
-import subprocess
-from pathlib import Path
-import re
-
-DIR = Path(__file__).parent.resolve()
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
- "breathe",
- "sphinxcontrib.rsvgconverter",
- "sphinxcontrib.moderncmakedomain",
-]
-
-breathe_projects = {"pybind11": ".build/doxygenxml/"}
-breathe_default_project = "pybind11"
-breathe_domain_by_extension = {"h": "cpp"}
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = [".templates"]
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-# source_suffix = ['.rst', '.md']
-source_suffix = ".rst"
-
-# The encoding of source files.
-# source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = "index"
-
-# General information about the project.
-project = "pybind11"
-copyright = "2017, Wenzel Jakob"
-author = "Wenzel Jakob"
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-
-# Read the listed version
-with open("../pybind11/_version.py") as f:
- code = compile(f.read(), "../pybind11/_version.py", "exec")
-loc = {}
-exec(code, loc)
-
-# The full version, including alpha/beta/rc tags.
-version = loc["__version__"]
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-# today = ''
-# Else, today_fmt is used as the format for a strftime call.
-# today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = [".build", "release.rst"]
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-default_role = "any"
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-# add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-# show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-# pygments_style = 'monokai'
-
-# A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-# keep_warnings = False
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. See the documentation for
-# a list of builtin themes.
-
-on_rtd = os.environ.get("READTHEDOCS", None) == "True"
-
-if not on_rtd: # only import and set the theme if we're building docs locally
- import sphinx_rtd_theme
-
- html_theme = "sphinx_rtd_theme"
- html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
- html_context = {"css_files": ["_static/theme_overrides.css"]}
-else:
- html_context = {
- "css_files": [
- "//media.readthedocs.org/css/sphinx_rtd_theme.css",
- "//media.readthedocs.org/css/readthedocs-doc-embed.css",
- "_static/theme_overrides.css",
- ]
- }
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further. For a list of options available for each theme, see the
-# documentation.
-# html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
-
-# The name for this set of Sphinx documents. If None, it defaults to
-# "<project> v<version> documentation".
-# html_title = None
-
-# A shorter title for the navigation bar. Default is the same as html_title.
-# html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-# html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-# html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-# html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-# html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-# html_additional_pages = {}
-
-# If false, no module index is generated.
-# html_domain_indices = True
-
-# If false, no index is generated.
-# html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-# html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it. The value of this option must be the
-# base URL from which the finished HTML is served.
-# html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
-
-# Language to be used for generating the HTML full-text search index.
-# Sphinx supports the following languages:
-# 'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
-# 'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr'
-# html_search_language = 'en'
-
-# A dictionary with options for the search language support, empty by default.
-# Now only 'ja' uses this config value
-# html_search_options = {'type': 'default'}
-
-# The name of a javascript file (relative to the configuration directory) that
-# implements a search results scorer. If empty, the default will be used.
-# html_search_scorer = 'scorer.js'
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = "pybind11doc"
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
- # The paper size ('letterpaper' or 'a4paper').
- # 'papersize': 'letterpaper',
- #
- # The font size ('10pt', '11pt' or '12pt').
- # 'pointsize': '10pt',
- #
- # Additional stuff for the LaTeX preamble.
- # remove blank pages (between the title page and the TOC, etc.)
- "classoptions": ",openany,oneside",
- "preamble": r"""
-\usepackage{fontawesome}
-\usepackage{textgreek}
-\DeclareUnicodeCharacter{00A0}{}
-\DeclareUnicodeCharacter{2194}{\faArrowsH}
-\DeclareUnicodeCharacter{1F382}{\faBirthdayCake}
-\DeclareUnicodeCharacter{1F355}{\faAdjust}
-\DeclareUnicodeCharacter{0301}{'}
-\DeclareUnicodeCharacter{03C0}{\textpi}
-
-""",
- # Latex figure (float) alignment
- # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-# author, documentclass [howto, manual, or own class]).
-latex_documents = [
- (master_doc, "pybind11.tex", "pybind11 Documentation", "Wenzel Jakob", "manual"),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-# latex_logo = 'pybind11-logo.png'
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-# latex_use_parts = False
-
-# If true, show page references after internal links.
-# latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-# latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-# latex_appendices = []
-
-# If false, no module index is generated.
-# latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "pybind11", "pybind11 Documentation", [author], 1)]
-
-# If true, show URL addresses after external links.
-# man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-# dir menu entry, description, category)
-texinfo_documents = [
- (
- master_doc,
- "pybind11",
- "pybind11 Documentation",
- author,
- "pybind11",
- "One line description of project.",
- "Miscellaneous",
- ),
-]
-
-# Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
-
-# If false, no module index is generated.
-# texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-# texinfo_no_detailmenu = False
-
-primary_domain = "cpp"
-highlight_language = "cpp"
-
-
-def generate_doxygen_xml(app):
- build_dir = os.path.join(app.confdir, ".build")
- if not os.path.exists(build_dir):
- os.mkdir(build_dir)
-
- try:
- subprocess.call(["doxygen", "--version"])
- retcode = subprocess.call(["doxygen"], cwd=app.confdir)
- if retcode < 0:
- sys.stderr.write("doxygen error code: {}\n".format(-retcode))
- except OSError as e:
- sys.stderr.write("doxygen execution failed: {}\n".format(e))
-
-
-def prepare(app):
- with open(DIR.parent / "README.rst") as f:
- contents = f.read()
-
- # Filter out section titles for index.rst for LaTeX
- if app.builder.name == "latex":
- contents = re.sub(r"^(.*)\n[-~]{3,}$", r"**\1**", contents, flags=re.MULTILINE)
-
- with open(DIR / "readme.rst", "w") as f:
- f.write(contents)
-
-
-def clean_up(app, exception):
- (DIR / "readme.rst").unlink()
-
-
-def setup(app):
-
- # Add hook for building doxygen xml when needed
- app.connect("builder-inited", generate_doxygen_xml)
-
- # Copy the readme in
- app.connect("builder-inited", prepare)
-
- # Clean up the generated readme
- app.connect("build-finished", clean_up)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/faq.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/faq.rst
deleted file mode 100644
index 8bf05a40a4a48515585758780d50a77f5c3da4d0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/faq.rst
+++ /dev/null
@@ -1,343 +0,0 @@
-Frequently asked questions
-##########################
-
-"ImportError: dynamic module does not define init function"
-===========================================================
-
-1. Make sure that the name specified in PYBIND11_MODULE is identical to the
-filename of the extension library (without suffixes such as .so)
-
-2. If the above did not fix the issue, you are likely using an incompatible
-version of Python (for instance, the extension library was compiled against
-Python 2, while the interpreter is running on top of some version of Python
-3, or vice versa).
-
-"Symbol not found: ``__Py_ZeroStruct`` / ``_PyInstanceMethod_Type``"
-========================================================================
-
-See the first answer.
-
-"SystemError: dynamic module not initialized properly"
-======================================================
-
-See the first answer.
-
-The Python interpreter immediately crashes when importing my module
-===================================================================
-
-See the first answer.
-
-.. _faq_reference_arguments:
-
-Limitations involving reference arguments
-=========================================
-
-In C++, it's fairly common to pass arguments using mutable references or
-mutable pointers, which allows both read and write access to the value
-supplied by the caller. This is sometimes done for efficiency reasons, or to
-realize functions that have multiple return values. Here are two very basic
-examples:
-
-.. code-block:: cpp
-
- void increment(int &i) { i++; }
- void increment_ptr(int *i) { (*i)++; }
-
-In Python, all arguments are passed by reference, so there is no general
-issue in binding such code from Python.
-
-However, certain basic Python types (like ``str``, ``int``, ``bool``,
-``float``, etc.) are **immutable**. This means that the following attempt
-to port the function to Python doesn't have the same effect on the value
-provided by the caller -- in fact, it does nothing at all.
-
-.. code-block:: python
-
- def increment(i):
- i += 1 # nope..
-
-pybind11 is also affected by such language-level conventions, which means that
-binding ``increment`` or ``increment_ptr`` will also create Python functions
-that don't modify their arguments.
-
-Although inconvenient, one workaround is to encapsulate the immutable types in
-a custom type that does allow modifications.
-
-An other alternative involves binding a small wrapper lambda function that
-returns a tuple with all output arguments (see the remainder of the
-documentation for examples on binding lambda functions). An example:
-
-.. code-block:: cpp
-
- int foo(int &i) { i++; return 123; }
-
-and the binding code
-
-.. code-block:: cpp
-
- m.def("foo", [](int i) { int rv = foo(i); return std::make_tuple(rv, i); });
-
-
-How can I reduce the build time?
-================================
-
-It's good practice to split binding code over multiple files, as in the
-following example:
-
-:file:`example.cpp`:
-
-.. code-block:: cpp
-
- void init_ex1(py::module_ &);
- void init_ex2(py::module_ &);
- /* ... */
-
- PYBIND11_MODULE(example, m) {
- init_ex1(m);
- init_ex2(m);
- /* ... */
- }
-
-:file:`ex1.cpp`:
-
-.. code-block:: cpp
-
- void init_ex1(py::module_ &m) {
- m.def("add", [](int a, int b) { return a + b; });
- }
-
-:file:`ex2.cpp`:
-
-.. code-block:: cpp
-
- void init_ex2(py::module_ &m) {
- m.def("sub", [](int a, int b) { return a - b; });
- }
-
-:command:`python`:
-
-.. code-block:: pycon
-
- >>> import example
- >>> example.add(1, 2)
- 3
- >>> example.sub(1, 1)
- 0
-
-As shown above, the various ``init_ex`` functions should be contained in
-separate files that can be compiled independently from one another, and then
-linked together into the same final shared object. Following this approach
-will:
-
-1. reduce memory requirements per compilation unit.
-
-2. enable parallel builds (if desired).
-
-3. allow for faster incremental builds. For instance, when a single class
- definition is changed, only a subset of the binding code will generally need
- to be recompiled.
-
-"recursive template instantiation exceeded maximum depth of 256"
-================================================================
-
-If you receive an error about excessive recursive template evaluation, try
-specifying a larger value, e.g. ``-ftemplate-depth=1024`` on GCC/Clang. The
-culprit is generally the generation of function signatures at compile time
-using C++14 template metaprogramming.
-
-.. _`faq:hidden_visibility`:
-
-"‘SomeClass’ declared with greater visibility than the type of its field ‘SomeClass::member’ [-Wattributes]"
-============================================================================================================
-
-This error typically indicates that you are compiling without the required
-``-fvisibility`` flag. pybind11 code internally forces hidden visibility on
-all internal code, but if non-hidden (and thus *exported*) code attempts to
-include a pybind type (for example, ``py::object`` or ``py::list``) you can run
-into this warning.
-
-To avoid it, make sure you are specifying ``-fvisibility=hidden`` when
-compiling pybind code.
-
-As to why ``-fvisibility=hidden`` is necessary, because pybind modules could
-have been compiled under different versions of pybind itself, it is also
-important that the symbols defined in one module do not clash with the
-potentially-incompatible symbols defined in another. While Python extension
-modules are usually loaded with localized symbols (under POSIX systems
-typically using ``dlopen`` with the ``RTLD_LOCAL`` flag), this Python default
-can be changed, but even if it isn't it is not always enough to guarantee
-complete independence of the symbols involved when not using
-``-fvisibility=hidden``.
-
-Additionally, ``-fvisiblity=hidden`` can deliver considerably binary size
-savings. (See the following section for more details).
-
-
-.. _`faq:symhidden`:
-
-How can I create smaller binaries?
-==================================
-
-To do its job, pybind11 extensively relies on a programming technique known as
-*template metaprogramming*, which is a way of performing computation at compile
-time using type information. Template metaprogamming usually instantiates code
-involving significant numbers of deeply nested types that are either completely
-removed or reduced to just a few instructions during the compiler's optimization
-phase. However, due to the nested nature of these types, the resulting symbol
-names in the compiled extension library can be extremely long. For instance,
-the included test suite contains the following symbol:
-
-.. only:: html
-
- .. code-block:: none
-
- _​_​Z​N​8​p​y​b​i​n​d​1​1​1​2​c​p​p​_​f​u​n​c​t​i​o​n​C​1​I​v​8​E​x​a​m​p​l​e​2​J​R​N​S​t​3​_​_​1​6​v​e​c​t​o​r​I​N​S​3​_​1​2​b​a​s​i​c​_​s​t​r​i​n​g​I​w​N​S​3​_​1​1​c​h​a​r​_​t​r​a​i​t​s​I​w​E​E​N​S​3​_​9​a​l​l​o​c​a​t​o​r​I​w​E​E​E​E​N​S​8​_​I​S​A​_​E​E​E​E​E​J​N​S​_​4​n​a​m​e​E​N​S​_​7​s​i​b​l​i​n​g​E​N​S​_​9​i​s​_​m​e​t​h​o​d​E​A​2​8​_​c​E​E​E​M​T​0​_​F​T​_​D​p​T​1​_​E​D​p​R​K​T​2​_
-
-.. only:: not html
-
- .. code-block:: cpp
-
- __ZN8pybind1112cpp_functionC1Iv8Example2JRNSt3__16vectorINS3_12basic_stringIwNS3_11char_traitsIwEENS3_9allocatorIwEEEENS8_ISA_EEEEEJNS_4nameENS_7siblingENS_9is_methodEA28_cEEEMT0_FT_DpT1_EDpRKT2_
-
-which is the mangled form of the following function type:
-
-.. code-block:: cpp
-
- pybind11::cpp_function::cpp_function<void, Example2, std::__1::vector<std::__1::basic_string<wchar_t, std::__1::char_traits<wchar_t>, std::__1::allocator<wchar_t> >, std::__1::allocator<std::__1::basic_string<wchar_t, std::__1::char_traits<wchar_t>, std::__1::allocator<wchar_t> > > >&, pybind11::name, pybind11::sibling, pybind11::is_method, char [28]>(void (Example2::*)(std::__1::vector<std::__1::basic_string<wchar_t, std::__1::char_traits<wchar_t>, std::__1::allocator<wchar_t> >, std::__1::allocator<std::__1::basic_string<wchar_t, std::__1::char_traits<wchar_t>, std::__1::allocator<wchar_t> > > >&), pybind11::name const&, pybind11::sibling const&, pybind11::is_method const&, char const (&) [28])
-
-The memory needed to store just the mangled name of this function (196 bytes)
-is larger than the actual piece of code (111 bytes) it represents! On the other
-hand, it's silly to even give this function a name -- after all, it's just a
-tiny cog in a bigger piece of machinery that is not exposed to the outside
-world. So we'll generally only want to export symbols for those functions which
-are actually called from the outside.
-
-This can be achieved by specifying the parameter ``-fvisibility=hidden`` to GCC
-and Clang, which sets the default symbol visibility to *hidden*, which has a
-tremendous impact on the final binary size of the resulting extension library.
-(On Visual Studio, symbols are already hidden by default, so nothing needs to
-be done there.)
-
-In addition to decreasing binary size, ``-fvisibility=hidden`` also avoids
-potential serious issues when loading multiple modules and is required for
-proper pybind operation. See the previous FAQ entry for more details.
-
-Working with ancient Visual Studio 2008 builds on Windows
-=========================================================
-
-The official Windows distributions of Python are compiled using truly
-ancient versions of Visual Studio that lack good C++11 support. Some users
-implicitly assume that it would be impossible to load a plugin built with
-Visual Studio 2015 into a Python distribution that was compiled using Visual
-Studio 2008. However, no such issue exists: it's perfectly legitimate to
-interface DLLs that are built with different compilers and/or C libraries.
-Common gotchas to watch out for involve not ``free()``-ing memory region
-that that were ``malloc()``-ed in another shared library, using data
-structures with incompatible ABIs, and so on. pybind11 is very careful not
-to make these types of mistakes.
-
-How can I properly handle Ctrl-C in long-running functions?
-===========================================================
-
-Ctrl-C is received by the Python interpreter, and holds it until the GIL
-is released, so a long-running function won't be interrupted.
-
-To interrupt from inside your function, you can use the ``PyErr_CheckSignals()``
-function, that will tell if a signal has been raised on the Python side. This
-function merely checks a flag, so its impact is negligible. When a signal has
-been received, you must either explicitly interrupt execution by throwing
-``py::error_already_set`` (which will propagate the existing
-``KeyboardInterrupt``), or clear the error (which you usually will not want):
-
-.. code-block:: cpp
-
- PYBIND11_MODULE(example, m)
- {
- m.def("long running_func", []()
- {
- for (;;) {
- if (PyErr_CheckSignals() != 0)
- throw py::error_already_set();
- // Long running iteration
- }
- });
- }
-
-CMake doesn't detect the right Python version
-=============================================
-
-The CMake-based build system will try to automatically detect the installed
-version of Python and link against that. When this fails, or when there are
-multiple versions of Python and it finds the wrong one, delete
-``CMakeCache.txt`` and then add ``-DPYTHON_EXECUTABLE=$(which python)`` to your
-CMake configure line. (Replace ``$(which python)`` with a path to python if
-your prefer.)
-
-You can alternatively try ``-DPYBIND11_FINDPYTHON=ON``, which will activate the
-new CMake FindPython support instead of pybind11's custom search. Requires
-CMake 3.12+, and 3.15+ or 3.18.2+ are even better. You can set this in your
-``CMakeLists.txt`` before adding or finding pybind11, as well.
-
-Inconsistent detection of Python version in CMake and pybind11
-==============================================================
-
-The functions ``find_package(PythonInterp)`` and ``find_package(PythonLibs)``
-provided by CMake for Python version detection are modified by pybind11 due to
-unreliability and limitations that make them unsuitable for pybind11's needs.
-Instead pybind11 provides its own, more reliable Python detection CMake code.
-Conflicts can arise, however, when using pybind11 in a project that *also* uses
-the CMake Python detection in a system with several Python versions installed.
-
-This difference may cause inconsistencies and errors if *both* mechanisms are
-used in the same project. Consider the following CMake code executed in a
-system with Python 2.7 and 3.x installed:
-
-.. code-block:: cmake
-
- find_package(PythonInterp)
- find_package(PythonLibs)
- find_package(pybind11)
-
-It will detect Python 2.7 and pybind11 will pick it as well.
-
-In contrast this code:
-
-.. code-block:: cmake
-
- find_package(pybind11)
- find_package(PythonInterp)
- find_package(PythonLibs)
-
-will detect Python 3.x for pybind11 and may crash on
-``find_package(PythonLibs)`` afterwards.
-
-There are three possible solutions:
-
-1. Avoid using ``find_package(PythonInterp)`` and ``find_package(PythonLibs)``
- from CMake and rely on pybind11 in detecting Python version. If this is not
- possible, the CMake machinery should be called *before* including pybind11.
-2. Set ``PYBIND11_FINDPYTHON`` to ``True`` or use ``find_package(Python
- COMPONENTS Interpreter Development)`` on modern CMake (3.12+, 3.15+ better,
- 3.18.2+ best). Pybind11 in these cases uses the new CMake FindPython instead
- of the old, deprecated search tools, and these modules are much better at
- finding the correct Python.
-3. Set ``PYBIND11_NOPYTHON`` to ``TRUE``. Pybind11 will not search for Python.
- However, you will have to use the target-based system, and do more setup
- yourself, because it does not know about or include things that depend on
- Python, like ``pybind11_add_module``. This might be ideal for integrating
- into an existing system, like scikit-build's Python helpers.
-
-How to cite this project?
-=========================
-
-We suggest the following BibTeX template to cite pybind11 in scientific
-discourse:
-
-.. code-block:: bash
-
- @misc{pybind11,
- author = {Wenzel Jakob and Jason Rhinelander and Dean Moldovan},
- year = {2017},
- note = {https://github.com/pybind/pybind11},
- title = {pybind11 -- Seamless operability between C++11 and Python}
- }
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/index.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/index.rst
deleted file mode 100644
index 4e2e8ca3a04a072d9adfdfa4bb98f5c221be10ea..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/index.rst
+++ /dev/null
@@ -1,48 +0,0 @@
-.. only:: latex
-
- Intro
- =====
-
-.. include:: readme.rst
-
-.. only:: not latex
-
- Contents:
-
-.. toctree::
- :maxdepth: 1
-
- changelog
- upgrade
-
-.. toctree::
- :caption: The Basics
- :maxdepth: 2
-
- installing
- basics
- classes
- compiling
-
-.. toctree::
- :caption: Advanced Topics
- :maxdepth: 2
-
- advanced/functions
- advanced/classes
- advanced/exceptions
- advanced/smart_ptrs
- advanced/cast/index
- advanced/pycpp/index
- advanced/embedding
- advanced/misc
-
-.. toctree::
- :caption: Extra Information
- :maxdepth: 1
-
- faq
- benchmark
- limitations
- reference
- cmake/index
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/installing.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/installing.rst
deleted file mode 100644
index 25972859812f940e5aaab1df25342ff48304d348..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/installing.rst
+++ /dev/null
@@ -1,103 +0,0 @@
-.. _installing:
-
-Installing the library
-######################
-
-There are several ways to get the pybind11 source, which lives at
-`pybind/pybind11 on GitHub <https://github.com/pybind/pybind11>`_. The pybind11
-developers recommend one of the first three ways listed here, submodule, PyPI,
-or conda-forge, for obtaining pybind11.
-
-Include as a submodule
-======================
-
-When you are working on a project in Git, you can use the pybind11 repository
-as a submodule. From your git repository, use:
-
-.. code-block:: bash
-
- git submodule add ../../pybind/pybind11 extern/pybind11 -b stable
- git submodule update --init
-
-This assumes you are placing your dependencies in ``extern/``, and that you are
-using GitHub; if you are not using GitHub, use the full https or ssh URL
-instead of the relative URL ``../../pybind/pybind11`` above. Some other servers
-also require the ``.git`` extension (GitHub does not).
-
-From here, you can now include ``extern/pybind11/include``, or you can use
-the various integration tools (see :ref:`compiling`) pybind11 provides directly
-from the local folder.
-
-Include with PyPI
-=================
-
-You can download the sources and CMake files as a Python package from PyPI
-using Pip. Just use:
-
-.. code-block:: bash
-
- pip install pybind11
-
-This will provide pybind11 in a standard Python package format. If you want
-pybind11 available directly in your environment root, you can use:
-
-.. code-block:: bash
-
- pip install "pybind11[global]"
-
-This is not recommended if you are installing with your system Python, as it
-will add files to ``/usr/local/include/pybind11`` and
-``/usr/local/share/cmake/pybind11``, so unless that is what you want, it is
-recommended only for use in virtual environments or your ``pyproject.toml``
-file (see :ref:`compiling`).
-
-Include with conda-forge
-========================
-
-You can use pybind11 with conda packaging via `conda-forge
-<https://github.com/conda-forge/pybind11-feedstock>`_:
-
-.. code-block:: bash
-
- conda install -c conda-forge pybind11
-
-
-Include with vcpkg
-==================
-You can download and install pybind11 using the Microsoft `vcpkg
-<https://github.com/Microsoft/vcpkg/>`_ dependency manager:
-
-.. code-block:: bash
-
- git clone https://github.com/Microsoft/vcpkg.git
- cd vcpkg
- ./bootstrap-vcpkg.sh
- ./vcpkg integrate install
- vcpkg install pybind11
-
-The pybind11 port in vcpkg is kept up to date by Microsoft team members and
-community contributors. If the version is out of date, please `create an issue
-or pull request <https://github.com/Microsoft/vcpkg/>`_ on the vcpkg
-repository.
-
-Global install with brew
-========================
-
-The brew package manager (Homebrew on macOS, or Linuxbrew on Linux) has a
-`pybind11 package
-<https://github.com/Homebrew/homebrew-core/blob/master/Formula/pybind11.rb>`_.
-To install:
-
-.. code-block:: bash
-
- brew install pybind11
-
-.. We should list Conan, and possibly a few other C++ package managers (hunter,
-.. perhaps). Conan has a very clean CMake integration that would be good to show.
-
-Other options
-=============
-
-Other locations you can find pybind11 are `listed here
-<https://repology.org/project/python:pybind11/versions>`_; these are maintained
-by various packagers and the community.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/limitations.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/limitations.rst
deleted file mode 100644
index be7300cdb6f5e2fcbb487bf17c6ee7abc46959df..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/limitations.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-Limitations
-###########
-
-Design choices
-^^^^^^^^^^^^^^
-
-pybind11 strives to be a general solution to binding generation, but it also has
-certain limitations:
-
-- pybind11 casts away ``const``-ness in function arguments and return values.
- This is in line with the Python language, which has no concept of ``const``
- values. This means that some additional care is needed to avoid bugs that
- would be caught by the type checker in a traditional C++ program.
-
-- The NumPy interface ``pybind11::array`` greatly simplifies accessing
- numerical data from C++ (and vice versa), but it's not a full-blown array
- class like ``Eigen::Array`` or ``boost.multi_array``. ``Eigen`` objects are
- directly supported, however, with ``pybind11/eigen.h``.
-
-Large but useful features could be implemented in pybind11 but would lead to a
-significant increase in complexity. Pybind11 strives to be simple and compact.
-Users who require large new features are encouraged to write an extension to
-pybind11; see `pybind11_json <https://github.com/pybind/pybind11_json>`_ for an
-example.
-
-
-Known bugs
-^^^^^^^^^^
-
-These are issues that hopefully will one day be fixed, but currently are
-unsolved. If you know how to help with one of these issues, contributions
-are welcome!
-
-- Intel 20.2 is currently having an issue with the test suite.
- `#2573 <https://github.com/pybind/pybind11/pull/2573>`_
-
-- Debug mode Python does not support 1-5 tests in the test suite currently.
- `#2422 <https://github.com/pybind/pybind11/pull/2422>`_
-
-- PyPy3 7.3.1 and 7.3.2 have issues with several tests on 32-bit Windows.
-
-Known limitations
-^^^^^^^^^^^^^^^^^
-
-These are issues that are probably solvable, but have not been fixed yet. A
-clean, well written patch would likely be accepted to solve them.
-
-- Type casters are not kept alive recursively.
- `#2527 <https://github.com/pybind/pybind11/issues/2527>`_
- One consequence is that containers of ``char *`` are currently not supported.
- `#2245 <https://github.com/pybind/pybind11/issues/2245>`_
-
-- The ``cpptest`` does not run on Windows with Python 3.8 or newer, due to DLL
- loader changes. User code that is correctly installed should not be affected.
- `#2560 <https://github.com/pybind/pybind11/issue/2560>`_
-
-Python 3.9.0 warning
-^^^^^^^^^^^^^^^^^^^^
-
-Combining older versions of pybind11 (< 2.6.0) with Python on 3.9.0 will
-trigger undefined behavior that typically manifests as crashes during
-interpreter shutdown (but could also destroy your data. **You have been
-warned**).
-
-This issue has been
-`fixed in Python <https://github.com/python/cpython/pull/22670>`_. As a
-mitigation until 3.9.1 is released and commonly used, pybind11 (2.6.0 or newer)
-includes a temporary workaround specifically when Python 3.9.0 is detected at
-runtime, leaking about 50 bytes of memory when a callback function is garbage
-collected. For reference; the pybind11 test suite has about 2,000 such
-callbacks, but only 49 are garbage collected before the end-of-process. Wheels
-built with Python 3.9.0 will correctly avoid the leak when run in Python 3.9.1.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11-logo.png b/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11-logo.png
deleted file mode 100644
index 4cbad54f797d3ced04d4048f282df5e4336d4af4..0000000000000000000000000000000000000000
Binary files a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11-logo.png and /dev/null differ
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python1.png b/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python1.png
deleted file mode 100644
index 833231f240809884fb6eb4079db528b9b3c0a9ac..0000000000000000000000000000000000000000
Binary files a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python1.png and /dev/null differ
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python1.svg b/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python1.svg
deleted file mode 100644
index 5bf950e6fdc81676d9a9774926a623b4f6a2e2a8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python1.svg
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="468pt" height="252pt" viewBox="0 0 468 252" version="1.1">
-<defs>
-<g>
-<symbol overflow="visible" id="glyph0-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph0-1">
-<path style="stroke:none;" d="M 3.726562 0 L 2.847656 0 L 2.847656 -5.601562 C 2.636719 -5.398438 2.359375 -5.195312 2.015625 -4.996094 C 1.671875 -4.792969 1.363281 -4.640625 1.089844 -4.539062 L 1.089844 -5.390625 C 1.582031 -5.621094 2.011719 -5.902344 2.378906 -6.230469 C 2.746094 -6.558594 3.007812 -6.878906 3.160156 -7.1875 L 3.726562 -7.1875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-2">
-<path style="stroke:none;" d="M 0.414062 -3.53125 C 0.414062 -4.375 0.503906 -5.058594 0.675781 -5.574219 C 0.851562 -6.089844 1.109375 -6.488281 1.453125 -6.765625 C 1.796875 -7.046875 2.226562 -7.1875 2.75 -7.1875 C 3.132812 -7.1875 3.46875 -7.109375 3.757812 -6.957031 C 4.046875 -6.800781 4.289062 -6.578125 4.476562 -6.285156 C 4.664062 -5.996094 4.8125 -5.640625 4.921875 -5.222656 C 5.03125 -4.804688 5.082031 -4.238281 5.082031 -3.53125 C 5.082031 -2.691406 4.996094 -2.011719 4.824219 -1.496094 C 4.652344 -0.980469 4.394531 -0.582031 4.050781 -0.300781 C 3.707031 -0.0195312 3.273438 0.121094 2.75 0.121094 C 2.058594 0.121094 1.515625 -0.125 1.125 -0.621094 C 0.652344 -1.214844 0.414062 -2.1875 0.414062 -3.53125 Z M 1.320312 -3.53125 C 1.320312 -2.355469 1.457031 -1.574219 1.730469 -1.183594 C 2.007812 -0.796875 2.34375 -0.601562 2.75 -0.601562 C 3.152344 -0.601562 3.492188 -0.796875 3.765625 -1.1875 C 4.042969 -1.578125 4.179688 -2.359375 4.179688 -3.53125 C 4.179688 -4.710938 4.042969 -5.492188 3.765625 -5.878906 C 3.492188 -6.265625 3.148438 -6.460938 2.738281 -6.460938 C 2.335938 -6.460938 2.011719 -6.289062 1.773438 -5.945312 C 1.46875 -5.511719 1.320312 -4.707031 1.320312 -3.53125 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-3">
-<path style="stroke:none;" d="M 5.035156 -0.84375 L 5.035156 0 L 0.304688 0 C 0.296875 -0.210938 0.332031 -0.414062 0.40625 -0.609375 C 0.527344 -0.933594 0.71875 -1.25 0.984375 -1.5625 C 1.25 -1.875 1.632812 -2.234375 2.132812 -2.648438 C 2.910156 -3.285156 3.4375 -3.789062 3.710938 -4.164062 C 3.984375 -4.535156 4.121094 -4.886719 4.121094 -5.21875 C 4.121094 -5.566406 3.996094 -5.863281 3.746094 -6.101562 C 3.5 -6.339844 3.171875 -6.460938 2.773438 -6.460938 C 2.351562 -6.460938 2.011719 -6.332031 1.757812 -6.078125 C 1.503906 -5.824219 1.375 -5.472656 1.371094 -5.023438 L 0.46875 -5.117188 C 0.53125 -5.789062 0.761719 -6.304688 1.167969 -6.65625 C 1.570312 -7.011719 2.113281 -7.1875 2.792969 -7.1875 C 3.480469 -7.1875 4.023438 -6.996094 4.421875 -6.617188 C 4.824219 -6.234375 5.023438 -5.761719 5.023438 -5.199219 C 5.023438 -4.914062 4.964844 -4.632812 4.847656 -4.355469 C 4.730469 -4.078125 4.535156 -3.789062 4.265625 -3.480469 C 3.992188 -3.175781 3.542969 -2.753906 2.910156 -2.222656 C 2.382812 -1.78125 2.042969 -1.480469 1.894531 -1.320312 C 1.746094 -1.164062 1.621094 -1.003906 1.523438 -0.84375 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-4">
-<path style="stroke:none;" d="M 0.414062 -1.875 L 1.335938 -1.953125 C 1.40625 -1.503906 1.566406 -1.167969 1.8125 -0.941406 C 2.0625 -0.714844 2.363281 -0.601562 2.714844 -0.601562 C 3.136719 -0.601562 3.496094 -0.761719 3.789062 -1.078125 C 4.082031 -1.398438 4.226562 -1.820312 4.226562 -2.347656 C 4.226562 -2.851562 4.085938 -3.246094 3.804688 -3.535156 C 3.523438 -3.824219 3.15625 -3.96875 2.699219 -3.96875 C 2.417969 -3.96875 2.160156 -3.90625 1.933594 -3.777344 C 1.707031 -3.648438 1.527344 -3.480469 1.398438 -3.277344 L 0.570312 -3.382812 L 1.265625 -7.0625 L 4.824219 -7.0625 L 4.824219 -6.21875 L 1.96875 -6.21875 L 1.582031 -4.296875 C 2.011719 -4.597656 2.460938 -4.746094 2.933594 -4.746094 C 3.558594 -4.746094 4.085938 -4.53125 4.515625 -4.097656 C 4.945312 -3.664062 5.160156 -3.105469 5.160156 -2.425781 C 5.160156 -1.777344 4.972656 -1.21875 4.59375 -0.746094 C 4.136719 -0.167969 3.507812 0.121094 2.714844 0.121094 C 2.0625 0.121094 1.53125 -0.0585938 1.121094 -0.425781 C 0.710938 -0.789062 0.472656 -1.273438 0.414062 -1.875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-5">
-<path style="stroke:none;" d="M 0.820312 0 L 0.820312 -7.15625 L 5.648438 -7.15625 L 5.648438 -6.3125 L 1.765625 -6.3125 L 1.765625 -4.097656 L 5.125 -4.097656 L 5.125 -3.25 L 1.765625 -3.25 L 1.765625 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-6">
-<path style="stroke:none;" d="M 4.058594 0 L 4.058594 -0.761719 C 3.65625 -0.175781 3.105469 0.117188 2.414062 0.117188 C 2.105469 0.117188 1.820312 0.0585938 1.554688 -0.0585938 C 1.289062 -0.175781 1.09375 -0.324219 0.964844 -0.5 C 0.835938 -0.679688 0.746094 -0.894531 0.695312 -1.152344 C 0.65625 -1.324219 0.640625 -1.597656 0.640625 -1.972656 L 0.640625 -5.1875 L 1.519531 -5.1875 L 1.519531 -2.308594 C 1.519531 -1.851562 1.535156 -1.542969 1.570312 -1.382812 C 1.625 -1.152344 1.746094 -0.96875 1.921875 -0.835938 C 2.101562 -0.703125 2.324219 -0.640625 2.585938 -0.640625 C 2.851562 -0.640625 3.097656 -0.707031 3.328125 -0.84375 C 3.5625 -0.976562 3.726562 -1.160156 3.820312 -1.394531 C 3.917969 -1.625 3.964844 -1.964844 3.964844 -2.40625 L 3.964844 -5.1875 L 4.84375 -5.1875 L 4.84375 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-7">
-<path style="stroke:none;" d="M 0.660156 0 L 0.660156 -5.1875 L 1.449219 -5.1875 L 1.449219 -4.449219 C 1.832031 -5.019531 2.382812 -5.304688 3.101562 -5.304688 C 3.414062 -5.304688 3.699219 -5.246094 3.960938 -5.132812 C 4.222656 -5.023438 4.421875 -4.875 4.550781 -4.691406 C 4.679688 -4.507812 4.773438 -4.292969 4.824219 -4.042969 C 4.855469 -3.878906 4.875 -3.59375 4.875 -3.1875 L 4.875 0 L 3.992188 0 L 3.992188 -3.15625 C 3.992188 -3.511719 3.960938 -3.78125 3.890625 -3.957031 C 3.824219 -4.132812 3.703125 -4.277344 3.527344 -4.382812 C 3.351562 -4.488281 3.148438 -4.539062 2.914062 -4.539062 C 2.539062 -4.539062 2.21875 -4.421875 1.945312 -4.183594 C 1.671875 -3.945312 1.539062 -3.496094 1.539062 -2.832031 L 1.539062 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-8">
-<path style="stroke:none;" d="M 4.042969 -1.898438 L 4.90625 -1.789062 C 4.8125 -1.191406 4.570312 -0.726562 4.183594 -0.386719 C 3.792969 -0.0507812 3.316406 0.117188 2.75 0.117188 C 2.039062 0.117188 1.46875 -0.113281 1.039062 -0.578125 C 0.605469 -1.042969 0.390625 -1.707031 0.390625 -2.574219 C 0.390625 -3.132812 0.484375 -3.625 0.667969 -4.042969 C 0.855469 -4.460938 1.136719 -4.777344 1.515625 -4.988281 C 1.894531 -5.199219 2.308594 -5.304688 2.753906 -5.304688 C 3.316406 -5.304688 3.777344 -5.160156 4.136719 -4.875 C 4.492188 -4.589844 4.722656 -4.1875 4.824219 -3.664062 L 3.96875 -3.53125 C 3.886719 -3.878906 3.746094 -4.140625 3.539062 -4.316406 C 3.332031 -4.492188 3.082031 -4.578125 2.789062 -4.578125 C 2.34375 -4.578125 1.984375 -4.421875 1.710938 -4.105469 C 1.433594 -3.789062 1.292969 -3.285156 1.292969 -2.597656 C 1.292969 -1.902344 1.425781 -1.394531 1.695312 -1.078125 C 1.960938 -0.761719 2.308594 -0.605469 2.738281 -0.605469 C 3.085938 -0.605469 3.371094 -0.710938 3.601562 -0.921875 C 3.835938 -1.132812 3.980469 -1.460938 4.042969 -1.898438 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-9">
-<path style="stroke:none;" d="M 2.578125 -0.785156 L 2.703125 -0.0078125 C 2.457031 0.0429688 2.234375 0.0703125 2.039062 0.0703125 C 1.722656 0.0703125 1.476562 0.0195312 1.296875 -0.0820312 C 1.121094 -0.183594 1 -0.316406 0.929688 -0.480469 C 0.855469 -0.644531 0.820312 -0.992188 0.820312 -1.519531 L 0.820312 -4.5 L 0.175781 -4.5 L 0.175781 -5.1875 L 0.820312 -5.1875 L 0.820312 -6.46875 L 1.695312 -6.996094 L 1.695312 -5.1875 L 2.578125 -5.1875 L 2.578125 -4.5 L 1.695312 -4.5 L 1.695312 -1.46875 C 1.695312 -1.21875 1.710938 -1.058594 1.742188 -0.984375 C 1.773438 -0.914062 1.820312 -0.859375 1.890625 -0.816406 C 1.960938 -0.773438 2.0625 -0.75 2.191406 -0.75 C 2.289062 -0.75 2.417969 -0.761719 2.578125 -0.785156 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-10">
-<path style="stroke:none;" d="M 0.664062 -6.148438 L 0.664062 -7.15625 L 1.542969 -7.15625 L 1.542969 -6.148438 Z M 0.664062 0 L 0.664062 -5.1875 L 1.542969 -5.1875 L 1.542969 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-11">
-<path style="stroke:none;" d="M 0.332031 -2.59375 C 0.332031 -3.554688 0.597656 -4.265625 1.132812 -4.726562 C 1.578125 -5.109375 2.121094 -5.304688 2.765625 -5.304688 C 3.476562 -5.304688 4.058594 -5.070312 4.511719 -4.601562 C 4.964844 -4.132812 5.191406 -3.488281 5.191406 -2.664062 C 5.191406 -2 5.089844 -1.472656 4.890625 -1.089844 C 4.691406 -0.707031 4.398438 -0.410156 4.015625 -0.199219 C 3.632812 0.0117188 3.214844 0.117188 2.765625 0.117188 C 2.039062 0.117188 1.449219 -0.117188 1.003906 -0.582031 C 0.554688 -1.046875 0.332031 -1.71875 0.332031 -2.59375 Z M 1.234375 -2.59375 C 1.234375 -1.929688 1.378906 -1.429688 1.671875 -1.101562 C 1.960938 -0.769531 2.324219 -0.605469 2.765625 -0.605469 C 3.199219 -0.605469 3.5625 -0.773438 3.851562 -1.101562 C 4.140625 -1.433594 4.289062 -1.941406 4.289062 -2.621094 C 4.289062 -3.261719 4.140625 -3.75 3.851562 -4.078125 C 3.558594 -4.410156 3.195312 -4.574219 2.765625 -4.574219 C 2.324219 -4.574219 1.960938 -4.410156 1.671875 -4.082031 C 1.382812 -3.753906 1.234375 -3.257812 1.234375 -2.59375 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-12">
-<path style="stroke:none;" d="M 0.308594 -1.546875 L 1.175781 -1.683594 C 1.226562 -1.335938 1.363281 -1.070312 1.585938 -0.882812 C 1.808594 -0.699219 2.117188 -0.605469 2.519531 -0.605469 C 2.921875 -0.605469 3.222656 -0.6875 3.417969 -0.851562 C 3.613281 -1.015625 3.710938 -1.210938 3.710938 -1.429688 C 3.710938 -1.628906 3.625 -1.785156 3.453125 -1.898438 C 3.332031 -1.976562 3.03125 -2.078125 2.554688 -2.195312 C 1.910156 -2.359375 1.460938 -2.5 1.214844 -2.621094 C 0.964844 -2.738281 0.777344 -2.902344 0.648438 -3.113281 C 0.519531 -3.324219 0.453125 -3.554688 0.453125 -3.808594 C 0.453125 -4.039062 0.507812 -4.253906 0.613281 -4.449219 C 0.71875 -4.648438 0.863281 -4.8125 1.046875 -4.941406 C 1.183594 -5.042969 1.367188 -5.128906 1.605469 -5.199219 C 1.839844 -5.269531 2.09375 -5.304688 2.363281 -5.304688 C 2.769531 -5.304688 3.128906 -5.242188 3.433594 -5.125 C 3.742188 -5.007812 3.96875 -4.851562 4.117188 -4.652344 C 4.261719 -4.453125 4.363281 -4.183594 4.417969 -3.847656 L 3.558594 -3.730469 C 3.519531 -3.996094 3.40625 -4.207031 3.21875 -4.355469 C 3.03125 -4.503906 2.769531 -4.578125 2.425781 -4.578125 C 2.023438 -4.578125 1.734375 -4.511719 1.5625 -4.378906 C 1.390625 -4.246094 1.304688 -4.089844 1.304688 -3.910156 C 1.304688 -3.796875 1.339844 -3.695312 1.410156 -3.601562 C 1.484375 -3.507812 1.59375 -3.429688 1.75 -3.367188 C 1.835938 -3.335938 2.09375 -3.261719 2.523438 -3.144531 C 3.144531 -2.976562 3.578125 -2.84375 3.824219 -2.738281 C 4.070312 -2.632812 4.265625 -2.476562 4.40625 -2.273438 C 4.546875 -2.074219 4.613281 -1.824219 4.613281 -1.523438 C 4.613281 -1.230469 4.527344 -0.953125 4.359375 -0.695312 C 4.1875 -0.4375 3.941406 -0.238281 3.617188 -0.09375 C 3.296875 0.046875 2.929688 0.117188 2.523438 0.117188 C 1.851562 0.117188 1.335938 -0.0234375 0.984375 -0.304688 C 0.632812 -0.582031 0.40625 -0.996094 0.308594 -1.546875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph1-1">
-<path style="stroke:none;" d="M -2.300781 -0.449219 L -2.378906 -1.34375 C -2.019531 -1.386719 -1.726562 -1.484375 -1.496094 -1.636719 C -1.265625 -1.792969 -1.082031 -2.03125 -0.941406 -2.359375 C -0.796875 -2.683594 -0.726562 -3.050781 -0.726562 -3.457031 C -0.726562 -3.820312 -0.78125 -4.136719 -0.890625 -4.414062 C -0.996094 -4.691406 -1.144531 -4.898438 -1.332031 -5.03125 C -1.519531 -5.167969 -1.722656 -5.234375 -1.945312 -5.234375 C -2.167969 -5.234375 -2.363281 -5.167969 -2.53125 -5.039062 C -2.699219 -4.910156 -2.839844 -4.695312 -2.953125 -4.394531 C -3.027344 -4.203125 -3.144531 -3.777344 -3.304688 -3.121094 C -3.460938 -2.460938 -3.609375 -2 -3.75 -1.738281 C -3.929688 -1.398438 -4.152344 -1.140625 -4.417969 -0.972656 C -4.683594 -0.804688 -4.980469 -0.722656 -5.308594 -0.722656 C -5.667969 -0.722656 -6.007812 -0.824219 -6.320312 -1.03125 C -6.632812 -1.234375 -6.875 -1.535156 -7.035156 -1.929688 C -7.199219 -2.324219 -7.28125 -2.761719 -7.28125 -3.242188 C -7.28125 -3.773438 -7.195312 -4.242188 -7.023438 -4.644531 C -6.851562 -5.050781 -6.601562 -5.363281 -6.269531 -5.582031 C -5.9375 -5.800781 -5.5625 -5.917969 -5.140625 -5.933594 L -5.074219 -5.023438 C -5.527344 -4.976562 -5.867188 -4.808594 -6.097656 -4.527344 C -6.328125 -4.246094 -6.445312 -3.832031 -6.445312 -3.28125 C -6.445312 -2.707031 -6.339844 -2.289062 -6.128906 -2.027344 C -5.921875 -1.765625 -5.667969 -1.636719 -5.371094 -1.636719 C -5.113281 -1.636719 -4.902344 -1.726562 -4.734375 -1.914062 C -4.570312 -2.097656 -4.398438 -2.574219 -4.226562 -3.34375 C -4.050781 -4.113281 -3.898438 -4.640625 -3.769531 -4.925781 C -3.578125 -5.34375 -3.335938 -5.652344 -3.039062 -5.851562 C -2.746094 -6.046875 -2.40625 -6.148438 -2.023438 -6.148438 C -1.640625 -6.148438 -1.28125 -6.039062 -0.945312 -5.820312 C -0.609375 -5.601562 -0.347656 -5.289062 -0.160156 -4.878906 C 0.0273438 -4.472656 0.121094 -4.011719 0.121094 -3.5 C 0.121094 -2.851562 0.0273438 -2.308594 -0.160156 -1.871094 C -0.351562 -1.433594 -0.632812 -1.089844 -1.011719 -0.84375 C -1.390625 -0.59375 -1.820312 -0.460938 -2.300781 -0.449219 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-2">
-<path style="stroke:none;" d="M -1.671875 -4.210938 L -1.558594 -5.117188 C -1.027344 -4.972656 -0.617188 -4.707031 -0.320312 -4.320312 C -0.0273438 -3.933594 0.117188 -3.4375 0.117188 -2.835938 C 0.117188 -2.078125 -0.117188 -1.476562 -0.582031 -1.03125 C -1.050781 -0.585938 -1.707031 -0.367188 -2.546875 -0.367188 C -3.421875 -0.367188 -4.097656 -0.589844 -4.578125 -1.039062 C -5.0625 -1.488281 -5.304688 -2.070312 -5.304688 -2.789062 C -5.304688 -3.480469 -5.066406 -4.046875 -4.59375 -4.488281 C -4.121094 -4.925781 -3.457031 -5.148438 -2.601562 -5.148438 C -2.550781 -5.148438 -2.472656 -5.144531 -2.367188 -5.140625 L -2.367188 -1.273438 C -1.796875 -1.304688 -1.363281 -1.46875 -1.058594 -1.757812 C -0.757812 -2.046875 -0.605469 -2.410156 -0.605469 -2.84375 C -0.605469 -3.164062 -0.691406 -3.4375 -0.859375 -3.667969 C -1.027344 -3.894531 -1.296875 -4.074219 -1.671875 -4.210938 Z M -3.089844 -1.324219 L -3.089844 -4.21875 C -3.527344 -4.179688 -3.855469 -4.070312 -4.070312 -3.886719 C -4.410156 -3.605469 -4.578125 -3.242188 -4.578125 -2.796875 C -4.578125 -2.394531 -4.445312 -2.054688 -4.175781 -1.78125 C -3.90625 -1.503906 -3.542969 -1.351562 -3.089844 -1.324219 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-3">
-<path style="stroke:none;" d="M -1.898438 -4.042969 L -1.789062 -4.90625 C -1.191406 -4.8125 -0.726562 -4.570312 -0.386719 -4.183594 C -0.0507812 -3.792969 0.117188 -3.316406 0.117188 -2.75 C 0.117188 -2.039062 -0.113281 -1.46875 -0.578125 -1.039062 C -1.042969 -0.605469 -1.707031 -0.390625 -2.574219 -0.390625 C -3.132812 -0.390625 -3.625 -0.484375 -4.042969 -0.667969 C -4.460938 -0.855469 -4.777344 -1.136719 -4.988281 -1.515625 C -5.199219 -1.894531 -5.304688 -2.308594 -5.304688 -2.753906 C -5.304688 -3.316406 -5.160156 -3.777344 -4.875 -4.136719 C -4.589844 -4.492188 -4.1875 -4.722656 -3.664062 -4.824219 L -3.53125 -3.96875 C -3.878906 -3.886719 -4.140625 -3.746094 -4.316406 -3.539062 C -4.492188 -3.332031 -4.578125 -3.082031 -4.578125 -2.789062 C -4.578125 -2.34375 -4.421875 -1.984375 -4.105469 -1.710938 C -3.789062 -1.433594 -3.285156 -1.292969 -2.597656 -1.292969 C -1.902344 -1.292969 -1.394531 -1.425781 -1.078125 -1.695312 C -0.761719 -1.960938 -0.605469 -2.308594 -0.605469 -2.738281 C -0.605469 -3.085938 -0.710938 -3.371094 -0.921875 -3.601562 C -1.132812 -3.835938 -1.460938 -3.980469 -1.898438 -4.042969 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-4">
-<path style="stroke:none;" d="M -2.59375 -0.332031 C -3.554688 -0.332031 -4.265625 -0.597656 -4.726562 -1.132812 C -5.109375 -1.578125 -5.304688 -2.121094 -5.304688 -2.765625 C -5.304688 -3.476562 -5.070312 -4.058594 -4.601562 -4.511719 C -4.132812 -4.964844 -3.488281 -5.191406 -2.664062 -5.191406 C -2 -5.191406 -1.472656 -5.089844 -1.089844 -4.890625 C -0.707031 -4.691406 -0.410156 -4.398438 -0.199219 -4.015625 C 0.0117188 -3.632812 0.117188 -3.214844 0.117188 -2.765625 C 0.117188 -2.039062 -0.117188 -1.449219 -0.582031 -1.003906 C -1.046875 -0.554688 -1.71875 -0.332031 -2.59375 -0.332031 Z M -2.59375 -1.234375 C -1.929688 -1.234375 -1.429688 -1.378906 -1.101562 -1.671875 C -0.769531 -1.960938 -0.605469 -2.324219 -0.605469 -2.765625 C -0.605469 -3.199219 -0.773438 -3.5625 -1.101562 -3.851562 C -1.433594 -4.140625 -1.941406 -4.289062 -2.621094 -4.289062 C -3.261719 -4.289062 -3.75 -4.140625 -4.078125 -3.851562 C -4.410156 -3.558594 -4.574219 -3.195312 -4.574219 -2.765625 C -4.574219 -2.324219 -4.410156 -1.960938 -4.082031 -1.671875 C -3.753906 -1.382812 -3.257812 -1.234375 -2.59375 -1.234375 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-5">
-<path style="stroke:none;" d="M 0 -0.660156 L -5.1875 -0.660156 L -5.1875 -1.449219 L -4.449219 -1.449219 C -5.019531 -1.832031 -5.304688 -2.382812 -5.304688 -3.101562 C -5.304688 -3.414062 -5.246094 -3.699219 -5.132812 -3.960938 C -5.023438 -4.222656 -4.875 -4.421875 -4.691406 -4.550781 C -4.507812 -4.679688 -4.292969 -4.773438 -4.042969 -4.824219 C -3.878906 -4.855469 -3.59375 -4.875 -3.1875 -4.875 L 0 -4.875 L 0 -3.992188 L -3.15625 -3.992188 C -3.511719 -3.992188 -3.78125 -3.960938 -3.957031 -3.890625 C -4.132812 -3.824219 -4.277344 -3.703125 -4.382812 -3.527344 C -4.488281 -3.351562 -4.539062 -3.148438 -4.539062 -2.914062 C -4.539062 -2.539062 -4.421875 -2.21875 -4.183594 -1.945312 C -3.945312 -1.671875 -3.496094 -1.539062 -2.832031 -1.539062 L 0 -1.539062 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-6">
-<path style="stroke:none;" d="M 0 -4.023438 L -0.65625 -4.023438 C -0.140625 -3.695312 0.117188 -3.210938 0.117188 -2.574219 C 0.117188 -2.160156 0.00390625 -1.78125 -0.226562 -1.433594 C -0.453125 -1.085938 -0.769531 -0.816406 -1.179688 -0.628906 C -1.585938 -0.4375 -2.058594 -0.34375 -2.585938 -0.34375 C -3.105469 -0.34375 -3.574219 -0.429688 -3.996094 -0.601562 C -4.417969 -0.773438 -4.742188 -1.03125 -4.964844 -1.375 C -5.191406 -1.722656 -5.304688 -2.109375 -5.304688 -2.535156 C -5.304688 -2.847656 -5.238281 -3.125 -5.105469 -3.367188 C -4.972656 -3.613281 -4.800781 -3.8125 -4.589844 -3.964844 L -7.15625 -3.964844 L -7.15625 -4.839844 L 0 -4.839844 Z M -2.585938 -1.246094 C -1.921875 -1.246094 -1.425781 -1.386719 -1.097656 -1.664062 C -0.769531 -1.945312 -0.605469 -2.273438 -0.605469 -2.65625 C -0.605469 -3.039062 -0.761719 -3.367188 -1.078125 -3.636719 C -1.390625 -3.90625 -1.871094 -4.039062 -2.515625 -4.039062 C -3.226562 -4.039062 -3.746094 -3.902344 -4.078125 -3.628906 C -4.410156 -3.355469 -4.574219 -3.015625 -4.574219 -2.617188 C -4.574219 -2.226562 -4.414062 -1.898438 -4.097656 -1.636719 C -3.777344 -1.375 -3.273438 -1.246094 -2.585938 -1.246094 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-7">
-<path style="stroke:none;" d="M -1.546875 -0.308594 L -1.683594 -1.175781 C -1.335938 -1.226562 -1.070312 -1.363281 -0.882812 -1.585938 C -0.699219 -1.808594 -0.605469 -2.117188 -0.605469 -2.519531 C -0.605469 -2.921875 -0.6875 -3.222656 -0.851562 -3.417969 C -1.015625 -3.613281 -1.210938 -3.710938 -1.429688 -3.710938 C -1.628906 -3.710938 -1.785156 -3.625 -1.898438 -3.453125 C -1.976562 -3.332031 -2.078125 -3.03125 -2.195312 -2.554688 C -2.359375 -1.910156 -2.5 -1.460938 -2.621094 -1.214844 C -2.738281 -0.964844 -2.902344 -0.777344 -3.113281 -0.648438 C -3.324219 -0.519531 -3.554688 -0.453125 -3.808594 -0.453125 C -4.039062 -0.453125 -4.253906 -0.507812 -4.449219 -0.613281 C -4.648438 -0.71875 -4.8125 -0.863281 -4.941406 -1.046875 C -5.042969 -1.183594 -5.128906 -1.367188 -5.199219 -1.605469 C -5.269531 -1.839844 -5.304688 -2.09375 -5.304688 -2.363281 C -5.304688 -2.769531 -5.242188 -3.128906 -5.125 -3.433594 C -5.007812 -3.742188 -4.851562 -3.96875 -4.652344 -4.117188 C -4.453125 -4.261719 -4.183594 -4.363281 -3.847656 -4.417969 L -3.730469 -3.558594 C -3.996094 -3.519531 -4.207031 -3.40625 -4.355469 -3.21875 C -4.503906 -3.03125 -4.578125 -2.769531 -4.578125 -2.425781 C -4.578125 -2.023438 -4.511719 -1.734375 -4.378906 -1.5625 C -4.246094 -1.390625 -4.089844 -1.304688 -3.910156 -1.304688 C -3.796875 -1.304688 -3.695312 -1.339844 -3.601562 -1.410156 C -3.507812 -1.484375 -3.429688 -1.59375 -3.367188 -1.75 C -3.335938 -1.835938 -3.261719 -2.09375 -3.144531 -2.523438 C -2.976562 -3.144531 -2.84375 -3.578125 -2.738281 -3.824219 C -2.632812 -4.070312 -2.476562 -4.265625 -2.273438 -4.40625 C -2.074219 -4.546875 -1.824219 -4.613281 -1.523438 -4.613281 C -1.230469 -4.613281 -0.953125 -4.527344 -0.695312 -4.359375 C -0.4375 -4.1875 -0.238281 -3.941406 -0.09375 -3.617188 C 0.046875 -3.296875 0.117188 -2.929688 0.117188 -2.523438 C 0.117188 -1.851562 -0.0234375 -1.335938 -0.304688 -0.984375 C -0.582031 -0.632812 -0.996094 -0.40625 -1.546875 -0.308594 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph2-1">
-<path style="stroke:none;" d="M 7.054688 -3.011719 L 8.191406 -2.726562 C 7.953125 -1.792969 7.523438 -1.078125 6.90625 -0.589844 C 6.285156 -0.0976562 5.53125 0.148438 4.632812 0.148438 C 3.707031 0.148438 2.957031 -0.0429688 2.375 -0.417969 C 1.796875 -0.796875 1.355469 -1.34375 1.050781 -2.054688 C 0.75 -2.769531 0.597656 -3.539062 0.597656 -4.359375 C 0.597656 -5.253906 0.769531 -6.035156 1.109375 -6.699219 C 1.453125 -7.367188 1.9375 -7.871094 2.570312 -8.21875 C 3.199219 -8.5625 3.894531 -8.734375 4.652344 -8.734375 C 5.511719 -8.734375 6.234375 -8.515625 6.820312 -8.078125 C 7.40625 -7.640625 7.8125 -7.027344 8.046875 -6.234375 L 6.925781 -5.96875 C 6.726562 -6.59375 6.4375 -7.050781 6.058594 -7.335938 C 5.679688 -7.621094 5.203125 -7.765625 4.628906 -7.765625 C 3.96875 -7.765625 3.417969 -7.605469 2.972656 -7.289062 C 2.53125 -6.972656 2.21875 -6.546875 2.039062 -6.015625 C 1.859375 -5.480469 1.769531 -4.929688 1.769531 -4.367188 C 1.769531 -3.636719 1.875 -2.996094 2.089844 -2.453125 C 2.300781 -1.90625 2.632812 -1.5 3.082031 -1.230469 C 3.53125 -0.960938 4.015625 -0.828125 4.539062 -0.828125 C 5.175781 -0.828125 5.71875 -1.007812 6.15625 -1.375 C 6.597656 -1.742188 6.898438 -2.289062 7.054688 -3.011719 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-2">
-<path style="stroke:none;" d="M 0.398438 -3.109375 C 0.398438 -4.261719 0.71875 -5.117188 1.359375 -5.671875 C 1.894531 -6.132812 2.546875 -6.363281 3.316406 -6.363281 C 4.171875 -6.363281 4.871094 -6.082031 5.414062 -5.523438 C 5.957031 -4.960938 6.226562 -4.1875 6.226562 -3.199219 C 6.226562 -2.398438 6.109375 -1.769531 5.867188 -1.308594 C 5.628906 -0.851562 5.277344 -0.492188 4.820312 -0.242188 C 4.359375 0.0117188 3.859375 0.140625 3.316406 0.140625 C 2.445312 0.140625 1.742188 -0.140625 1.203125 -0.695312 C 0.667969 -1.253906 0.398438 -2.0625 0.398438 -3.109375 Z M 1.484375 -3.109375 C 1.484375 -2.3125 1.65625 -1.71875 2.003906 -1.320312 C 2.351562 -0.925781 2.789062 -0.726562 3.316406 -0.726562 C 3.839844 -0.726562 4.273438 -0.925781 4.625 -1.324219 C 4.972656 -1.722656 5.144531 -2.328125 5.144531 -3.148438 C 5.144531 -3.917969 4.96875 -4.5 4.621094 -4.894531 C 4.269531 -5.292969 3.835938 -5.492188 3.316406 -5.492188 C 2.789062 -5.492188 2.351562 -5.292969 2.003906 -4.898438 C 1.65625 -4.503906 1.484375 -3.90625 1.484375 -3.109375 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-3">
-<path style="stroke:none;" d="M 0.789062 0 L 0.789062 -6.222656 L 1.734375 -6.222656 L 1.734375 -5.351562 C 1.929688 -5.65625 2.1875 -5.898438 2.515625 -6.085938 C 2.839844 -6.269531 3.207031 -6.363281 3.621094 -6.363281 C 4.082031 -6.363281 4.460938 -6.265625 4.753906 -6.078125 C 5.050781 -5.886719 5.257812 -5.617188 5.378906 -5.273438 C 5.871094 -6 6.511719 -6.363281 7.300781 -6.363281 C 7.917969 -6.363281 8.390625 -6.191406 8.726562 -5.851562 C 9.058594 -5.507812 9.222656 -4.984375 9.222656 -4.273438 L 9.222656 0 L 8.171875 0 L 8.171875 -3.921875 C 8.171875 -4.34375 8.140625 -4.644531 8.070312 -4.832031 C 8.003906 -5.015625 7.878906 -5.164062 7.699219 -5.28125 C 7.519531 -5.394531 7.308594 -5.449219 7.066406 -5.449219 C 6.628906 -5.449219 6.265625 -5.304688 5.976562 -5.011719 C 5.6875 -4.722656 5.542969 -4.257812 5.542969 -3.617188 L 5.542969 0 L 4.488281 0 L 4.488281 -4.042969 C 4.488281 -4.511719 4.402344 -4.863281 4.230469 -5.097656 C 4.058594 -5.332031 3.777344 -5.449219 3.386719 -5.449219 C 3.089844 -5.449219 2.816406 -5.371094 2.5625 -5.214844 C 2.3125 -5.058594 2.128906 -4.828125 2.015625 -4.53125 C 1.902344 -4.230469 1.84375 -3.796875 1.84375 -3.226562 L 1.84375 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-4">
-<path style="stroke:none;" d="M 0.789062 2.382812 L 0.789062 -6.222656 L 1.75 -6.222656 L 1.75 -5.414062 C 1.976562 -5.730469 2.234375 -5.96875 2.519531 -6.125 C 2.804688 -6.285156 3.148438 -6.363281 3.554688 -6.363281 C 4.085938 -6.363281 4.554688 -6.226562 4.960938 -5.953125 C 5.367188 -5.679688 5.675781 -5.292969 5.882812 -4.796875 C 6.089844 -4.296875 6.195312 -3.75 6.195312 -3.15625 C 6.195312 -2.519531 6.078125 -1.949219 5.851562 -1.4375 C 5.621094 -0.929688 5.289062 -0.539062 4.855469 -0.265625 C 4.417969 0.00390625 3.960938 0.140625 3.480469 0.140625 C 3.128906 0.140625 2.8125 0.0664062 2.535156 -0.0820312 C 2.253906 -0.230469 2.023438 -0.417969 1.84375 -0.644531 L 1.84375 2.382812 Z M 1.746094 -3.078125 C 1.746094 -2.277344 1.90625 -1.683594 2.234375 -1.300781 C 2.558594 -0.917969 2.949219 -0.726562 3.410156 -0.726562 C 3.878906 -0.726562 4.28125 -0.925781 4.613281 -1.320312 C 4.949219 -1.71875 5.117188 -2.332031 5.117188 -3.164062 C 5.117188 -3.957031 4.953125 -4.550781 4.625 -4.945312 C 4.300781 -5.339844 3.910156 -5.539062 3.457031 -5.539062 C 3.007812 -5.539062 2.609375 -5.328125 2.265625 -4.90625 C 1.917969 -4.488281 1.746094 -3.875 1.746094 -3.078125 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-5">
-<path style="stroke:none;" d="M 0.796875 -7.375 L 0.796875 -8.589844 L 1.851562 -8.589844 L 1.851562 -7.375 Z M 0.796875 0 L 0.796875 -6.222656 L 1.851562 -6.222656 L 1.851562 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-6">
-<path style="stroke:none;" d="M 0.765625 0 L 0.765625 -8.589844 L 1.820312 -8.589844 L 1.820312 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-7">
-<path style="stroke:none;" d="M 4.851562 -0.765625 C 4.460938 -0.433594 4.085938 -0.203125 3.722656 -0.0625 C 3.363281 0.0742188 2.976562 0.140625 2.5625 0.140625 C 1.878906 0.140625 1.351562 -0.0273438 0.984375 -0.359375 C 0.617188 -0.695312 0.433594 -1.121094 0.433594 -1.640625 C 0.433594 -1.945312 0.503906 -2.222656 0.640625 -2.476562 C 0.78125 -2.726562 0.960938 -2.929688 1.1875 -3.082031 C 1.410156 -3.234375 1.664062 -3.351562 1.945312 -3.429688 C 2.152344 -3.484375 2.464844 -3.535156 2.882812 -3.585938 C 3.734375 -3.6875 4.359375 -3.808594 4.765625 -3.949219 C 4.769531 -4.09375 4.769531 -4.1875 4.769531 -4.226562 C 4.769531 -4.65625 4.671875 -4.957031 4.46875 -5.132812 C 4.199219 -5.371094 3.800781 -5.492188 3.269531 -5.492188 C 2.773438 -5.492188 2.40625 -5.402344 2.171875 -5.230469 C 1.933594 -5.054688 1.757812 -4.75 1.648438 -4.304688 L 0.617188 -4.445312 C 0.710938 -4.886719 0.863281 -5.246094 1.078125 -5.515625 C 1.292969 -5.789062 1.601562 -5.996094 2.007812 -6.144531 C 2.414062 -6.289062 2.886719 -6.363281 3.421875 -6.363281 C 3.953125 -6.363281 4.382812 -6.300781 4.71875 -6.175781 C 5.050781 -6.050781 5.292969 -5.894531 5.449219 -5.703125 C 5.605469 -5.515625 5.714844 -5.273438 5.777344 -4.984375 C 5.8125 -4.804688 5.828125 -4.484375 5.828125 -4.015625 L 5.828125 -2.609375 C 5.828125 -1.628906 5.851562 -1.007812 5.898438 -0.746094 C 5.941406 -0.488281 6.03125 -0.238281 6.164062 0 L 5.0625 0 C 4.953125 -0.21875 4.882812 -0.476562 4.851562 -0.765625 Z M 4.765625 -3.125 C 4.382812 -2.96875 3.804688 -2.835938 3.039062 -2.726562 C 2.605469 -2.664062 2.300781 -2.59375 2.121094 -2.515625 C 1.941406 -2.4375 1.804688 -2.320312 1.703125 -2.171875 C 1.605469 -2.019531 1.558594 -1.851562 1.558594 -1.671875 C 1.558594 -1.390625 1.664062 -1.15625 1.878906 -0.96875 C 2.089844 -0.78125 2.402344 -0.6875 2.8125 -0.6875 C 3.21875 -0.6875 3.578125 -0.773438 3.898438 -0.953125 C 4.214844 -1.128906 4.445312 -1.375 4.59375 -1.679688 C 4.707031 -1.917969 4.765625 -2.273438 4.765625 -2.734375 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-8">
-<path style="stroke:none;" d="M 3.09375 -0.945312 L 3.246094 -0.0117188 C 2.949219 0.0507812 2.683594 0.0820312 2.449219 0.0820312 C 2.066406 0.0820312 1.769531 0.0234375 1.558594 -0.101562 C 1.347656 -0.222656 1.199219 -0.378906 1.113281 -0.578125 C 1.027344 -0.773438 0.984375 -1.1875 0.984375 -1.820312 L 0.984375 -5.402344 L 0.210938 -5.402344 L 0.210938 -6.222656 L 0.984375 -6.222656 L 0.984375 -7.765625 L 2.03125 -8.398438 L 2.03125 -6.222656 L 3.09375 -6.222656 L 3.09375 -5.402344 L 2.03125 -5.402344 L 2.03125 -1.765625 C 2.03125 -1.464844 2.050781 -1.269531 2.089844 -1.183594 C 2.125 -1.097656 2.1875 -1.03125 2.269531 -0.976562 C 2.355469 -0.925781 2.476562 -0.902344 2.632812 -0.902344 C 2.75 -0.902344 2.902344 -0.914062 3.09375 -0.945312 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-9">
-<path style="stroke:none;" d="M 0.789062 0 L 0.789062 -6.222656 L 1.742188 -6.222656 L 1.742188 -5.335938 C 2.199219 -6.019531 2.859375 -6.363281 3.71875 -6.363281 C 4.09375 -6.363281 4.441406 -6.296875 4.753906 -6.160156 C 5.070312 -6.027344 5.304688 -5.851562 5.460938 -5.632812 C 5.617188 -5.414062 5.726562 -5.152344 5.789062 -4.851562 C 5.828125 -4.65625 5.847656 -4.3125 5.847656 -3.828125 L 5.847656 0 L 4.792969 0 L 4.792969 -3.785156 C 4.792969 -4.214844 4.75 -4.535156 4.671875 -4.75 C 4.589844 -4.960938 4.441406 -5.132812 4.234375 -5.257812 C 4.023438 -5.386719 3.78125 -5.449219 3.5 -5.449219 C 3.050781 -5.449219 2.660156 -5.304688 2.335938 -5.023438 C 2.007812 -4.738281 1.84375 -4.195312 1.84375 -3.398438 L 1.84375 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-10">
-<path style="stroke:none;" d="M 5.050781 -2.003906 L 6.140625 -1.867188 C 5.96875 -1.230469 5.648438 -0.738281 5.1875 -0.386719 C 4.722656 -0.0351562 4.125 0.140625 3.40625 0.140625 C 2.496094 0.140625 1.773438 -0.140625 1.238281 -0.699219 C 0.707031 -1.261719 0.4375 -2.046875 0.4375 -3.058594 C 0.4375 -4.105469 0.710938 -4.917969 1.25 -5.496094 C 1.789062 -6.074219 2.484375 -6.363281 3.34375 -6.363281 C 4.175781 -6.363281 4.859375 -6.078125 5.382812 -5.515625 C 5.910156 -4.949219 6.175781 -4.148438 6.175781 -3.125 C 6.175781 -3.0625 6.171875 -2.96875 6.171875 -2.84375 L 1.53125 -2.84375 C 1.570312 -2.160156 1.761719 -1.632812 2.109375 -1.273438 C 2.457031 -0.910156 2.890625 -0.726562 3.410156 -0.726562 C 3.796875 -0.726562 4.125 -0.828125 4.398438 -1.03125 C 4.671875 -1.234375 4.890625 -1.558594 5.050781 -2.003906 Z M 1.585938 -3.710938 L 5.0625 -3.710938 C 5.015625 -4.234375 4.882812 -4.625 4.664062 -4.886719 C 4.328125 -5.292969 3.890625 -5.496094 3.359375 -5.496094 C 2.875 -5.496094 2.464844 -5.335938 2.136719 -5.007812 C 1.804688 -4.683594 1.625 -4.25 1.585938 -3.710938 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-11">
-<path style="stroke:none;" d="M 1.042969 0 L 1.042969 -5.402344 L 0.109375 -5.402344 L 0.109375 -6.222656 L 1.042969 -6.222656 L 1.042969 -6.882812 C 1.042969 -7.300781 1.078125 -7.613281 1.15625 -7.816406 C 1.257812 -8.089844 1.433594 -8.3125 1.691406 -8.480469 C 1.945312 -8.652344 2.304688 -8.734375 2.765625 -8.734375 C 3.0625 -8.734375 3.390625 -8.703125 3.75 -8.632812 L 3.59375 -7.710938 C 3.375 -7.75 3.164062 -7.769531 2.96875 -7.769531 C 2.648438 -7.769531 2.421875 -7.703125 2.289062 -7.5625 C 2.15625 -7.425781 2.09375 -7.171875 2.09375 -6.796875 L 2.09375 -6.222656 L 3.304688 -6.222656 L 3.304688 -5.402344 L 2.09375 -5.402344 L 2.09375 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-12">
-<path style="stroke:none;" d="M 4.828125 0 L 4.828125 -0.785156 C 4.433594 -0.167969 3.851562 0.140625 3.085938 0.140625 C 2.589844 0.140625 2.136719 0.00390625 1.71875 -0.269531 C 1.304688 -0.542969 0.980469 -0.925781 0.753906 -1.414062 C 0.523438 -1.90625 0.410156 -2.46875 0.410156 -3.105469 C 0.410156 -3.726562 0.515625 -4.289062 0.71875 -4.796875 C 0.925781 -5.300781 1.238281 -5.6875 1.652344 -5.960938 C 2.066406 -6.230469 2.53125 -6.363281 3.039062 -6.363281 C 3.414062 -6.363281 3.75 -6.285156 4.042969 -6.125 C 4.335938 -5.96875 4.574219 -5.761719 4.757812 -5.507812 L 4.757812 -8.589844 L 5.804688 -8.589844 L 5.804688 0 Z M 1.492188 -3.105469 C 1.492188 -2.308594 1.664062 -1.710938 2 -1.320312 C 2.335938 -0.925781 2.730469 -0.726562 3.1875 -0.726562 C 3.648438 -0.726562 4.039062 -0.914062 4.363281 -1.292969 C 4.683594 -1.667969 4.84375 -2.242188 4.84375 -3.015625 C 4.84375 -3.867188 4.679688 -4.492188 4.351562 -4.890625 C 4.023438 -5.289062 3.621094 -5.492188 3.140625 -5.492188 C 2.671875 -5.492188 2.28125 -5.296875 1.964844 -4.914062 C 1.652344 -4.53125 1.492188 -3.929688 1.492188 -3.105469 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-13">
-<path style="stroke:none;" d="M 4.867188 0 L 4.867188 -0.914062 C 4.382812 -0.210938 3.726562 0.140625 2.894531 0.140625 C 2.527344 0.140625 2.183594 0.0703125 1.867188 -0.0703125 C 1.546875 -0.210938 1.3125 -0.386719 1.15625 -0.601562 C 1.003906 -0.8125 0.894531 -1.074219 0.832031 -1.382812 C 0.789062 -1.589844 0.765625 -1.917969 0.765625 -2.367188 L 0.765625 -6.222656 L 1.820312 -6.222656 L 1.820312 -2.773438 C 1.820312 -2.222656 1.84375 -1.851562 1.886719 -1.65625 C 1.953125 -1.378906 2.09375 -1.164062 2.308594 -1.003906 C 2.523438 -0.847656 2.789062 -0.765625 3.105469 -0.765625 C 3.421875 -0.765625 3.71875 -0.847656 3.996094 -1.011719 C 4.273438 -1.171875 4.46875 -1.394531 4.585938 -1.671875 C 4.699219 -1.953125 4.757812 -2.359375 4.757812 -2.890625 L 4.757812 -6.222656 L 5.8125 -6.222656 L 5.8125 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph3-1">
-<path style="stroke:none;" d="M 0.953125 0 L 0.953125 -9.304688 L 4.445312 -9.304688 C 5.15625 -9.304688 5.722656 -9.210938 6.152344 -9.023438 C 6.582031 -8.835938 6.921875 -8.546875 7.164062 -8.152344 C 7.40625 -7.761719 7.527344 -7.351562 7.527344 -6.925781 C 7.527344 -6.527344 7.421875 -6.152344 7.203125 -5.800781 C 6.988281 -5.449219 6.664062 -5.167969 6.226562 -4.953125 C 6.789062 -4.785156 7.222656 -4.503906 7.523438 -4.105469 C 7.828125 -3.707031 7.980469 -3.238281 7.980469 -2.699219 C 7.980469 -2.261719 7.886719 -1.855469 7.703125 -1.480469 C 7.519531 -1.105469 7.292969 -0.820312 7.019531 -0.617188 C 6.75 -0.414062 6.410156 -0.257812 6 -0.15625 C 5.59375 -0.0507812 5.09375 0 4.5 0 Z M 2.183594 -5.394531 L 4.195312 -5.394531 C 4.742188 -5.394531 5.132812 -5.429688 5.371094 -5.503906 C 5.683594 -5.597656 5.917969 -5.75 6.078125 -5.96875 C 6.238281 -6.183594 6.316406 -6.453125 6.316406 -6.78125 C 6.316406 -7.089844 6.242188 -7.359375 6.09375 -7.59375 C 5.945312 -7.828125 5.734375 -7.992188 5.460938 -8.078125 C 5.183594 -8.164062 4.710938 -8.207031 4.042969 -8.207031 L 2.183594 -8.207031 Z M 2.183594 -1.097656 L 4.5 -1.097656 C 4.898438 -1.097656 5.175781 -1.113281 5.339844 -1.140625 C 5.621094 -1.191406 5.859375 -1.277344 6.050781 -1.398438 C 6.242188 -1.515625 6.394531 -1.6875 6.519531 -1.914062 C 6.640625 -2.140625 6.703125 -2.402344 6.703125 -2.699219 C 6.703125 -3.046875 6.613281 -3.347656 6.4375 -3.601562 C 6.257812 -3.859375 6.011719 -4.039062 5.695312 -4.140625 C 5.382812 -4.246094 4.929688 -4.296875 4.335938 -4.296875 L 2.183594 -4.296875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-2">
-<path style="stroke:none;" d="M 0.429688 -3.371094 C 0.429688 -4.617188 0.777344 -5.542969 1.472656 -6.144531 C 2.050781 -6.644531 2.757812 -6.894531 3.59375 -6.894531 C 4.519531 -6.894531 5.277344 -6.589844 5.867188 -5.984375 C 6.453125 -5.375 6.746094 -4.535156 6.746094 -3.464844 C 6.746094 -2.597656 6.617188 -1.914062 6.355469 -1.417969 C 6.097656 -0.921875 5.71875 -0.535156 5.222656 -0.261719 C 4.722656 0.015625 4.179688 0.152344 3.59375 0.152344 C 2.648438 0.152344 1.886719 -0.148438 1.304688 -0.753906 C 0.722656 -1.359375 0.429688 -2.230469 0.429688 -3.371094 Z M 1.605469 -3.371094 C 1.605469 -2.507812 1.792969 -1.859375 2.171875 -1.429688 C 2.546875 -1 3.023438 -0.789062 3.59375 -0.789062 C 4.160156 -0.789062 4.632812 -1.003906 5.007812 -1.433594 C 5.382812 -1.867188 5.574219 -2.523438 5.574219 -3.410156 C 5.574219 -4.242188 5.382812 -4.875 5.003906 -5.304688 C 4.625 -5.734375 4.15625 -5.949219 3.59375 -5.949219 C 3.023438 -5.949219 2.546875 -5.734375 2.171875 -5.304688 C 1.792969 -4.878906 1.605469 -4.234375 1.605469 -3.371094 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-3">
-<path style="stroke:none;" d="M 0.398438 -2.011719 L 1.53125 -2.191406 C 1.59375 -1.738281 1.769531 -1.390625 2.058594 -1.148438 C 2.347656 -0.90625 2.753906 -0.789062 3.273438 -0.789062 C 3.800781 -0.789062 4.1875 -0.894531 4.445312 -1.109375 C 4.699219 -1.320312 4.824219 -1.570312 4.824219 -1.859375 C 4.824219 -2.117188 4.710938 -2.320312 4.488281 -2.46875 C 4.332031 -2.570312 3.941406 -2.699219 3.320312 -2.855469 C 2.480469 -3.066406 1.902344 -3.25 1.578125 -3.40625 C 1.253906 -3.558594 1.007812 -3.773438 0.839844 -4.046875 C 0.671875 -4.320312 0.589844 -4.621094 0.589844 -4.953125 C 0.589844 -5.253906 0.660156 -5.53125 0.796875 -5.785156 C 0.933594 -6.042969 1.121094 -6.253906 1.359375 -6.421875 C 1.535156 -6.554688 1.777344 -6.667969 2.085938 -6.757812 C 2.390625 -6.847656 2.722656 -6.894531 3.070312 -6.894531 C 3.601562 -6.894531 4.066406 -6.816406 4.464844 -6.664062 C 4.867188 -6.511719 5.160156 -6.304688 5.351562 -6.046875 C 5.542969 -5.785156 5.671875 -5.4375 5.746094 -5 L 4.628906 -4.851562 C 4.578125 -5.195312 4.429688 -5.46875 4.1875 -5.664062 C 3.945312 -5.859375 3.597656 -5.953125 3.15625 -5.953125 C 2.628906 -5.953125 2.253906 -5.867188 2.03125 -5.695312 C 1.808594 -5.519531 1.695312 -5.316406 1.695312 -5.085938 C 1.695312 -4.9375 1.742188 -4.804688 1.835938 -4.683594 C 1.929688 -4.5625 2.074219 -4.460938 2.273438 -4.378906 C 2.386719 -4.335938 2.722656 -4.242188 3.28125 -4.085938 C 4.089844 -3.871094 4.652344 -3.695312 4.972656 -3.558594 C 5.292969 -3.421875 5.542969 -3.21875 5.726562 -2.957031 C 5.90625 -2.695312 6 -2.371094 6 -1.980469 C 6 -1.601562 5.886719 -1.242188 5.664062 -0.90625 C 5.441406 -0.570312 5.121094 -0.308594 4.703125 -0.125 C 4.285156 0.0585938 3.8125 0.152344 3.28125 0.152344 C 2.40625 0.152344 1.738281 -0.03125 1.277344 -0.394531 C 0.820312 -0.757812 0.527344 -1.296875 0.398438 -2.011719 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-4">
-<path style="stroke:none;" d="M 3.351562 -1.023438 L 3.515625 -0.0117188 C 3.195312 0.0546875 2.90625 0.0898438 2.652344 0.0898438 C 2.238281 0.0898438 1.917969 0.0234375 1.6875 -0.109375 C 1.460938 -0.238281 1.300781 -0.410156 1.207031 -0.625 C 1.113281 -0.839844 1.066406 -1.289062 1.066406 -1.972656 L 1.066406 -5.851562 L 0.226562 -5.851562 L 0.226562 -6.742188 L 1.066406 -6.742188 L 1.066406 -8.410156 L 2.203125 -9.097656 L 2.203125 -6.742188 L 3.351562 -6.742188 L 3.351562 -5.851562 L 2.203125 -5.851562 L 2.203125 -1.910156 C 2.203125 -1.585938 2.222656 -1.375 2.261719 -1.28125 C 2.304688 -1.1875 2.367188 -1.113281 2.460938 -1.058594 C 2.550781 -1.003906 2.679688 -0.976562 2.851562 -0.976562 C 2.976562 -0.976562 3.144531 -0.992188 3.351562 -1.023438 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-5">
-<path style="stroke:none;" d="M 1.179688 0 L 1.179688 -1.300781 L 2.480469 -1.300781 L 2.480469 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-6">
-<path style="stroke:none;" d="M 1.003906 0 L 1.003906 -9.304688 L 4.511719 -9.304688 C 5.128906 -9.304688 5.601562 -9.277344 5.929688 -9.21875 C 6.386719 -9.140625 6.769531 -8.996094 7.078125 -8.78125 C 7.386719 -8.566406 7.636719 -8.269531 7.824219 -7.882812 C 8.011719 -7.5 8.105469 -7.074219 8.105469 -6.613281 C 8.105469 -5.824219 7.855469 -5.152344 7.351562 -4.605469 C 6.847656 -4.058594 5.9375 -3.78125 4.621094 -3.78125 L 2.234375 -3.78125 L 2.234375 0 Z M 2.234375 -4.882812 L 4.640625 -4.882812 C 5.4375 -4.882812 6 -5.03125 6.335938 -5.324219 C 6.667969 -5.621094 6.835938 -6.039062 6.835938 -6.578125 C 6.835938 -6.964844 6.738281 -7.296875 6.542969 -7.574219 C 6.34375 -7.851562 6.085938 -8.035156 5.765625 -8.125 C 5.558594 -8.179688 5.171875 -8.207031 4.613281 -8.207031 L 2.234375 -8.207031 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-7">
-<path style="stroke:none;" d="M 0.804688 2.597656 L 0.679688 1.523438 C 0.929688 1.589844 1.148438 1.625 1.332031 1.625 C 1.585938 1.625 1.789062 1.582031 1.941406 1.5 C 2.09375 1.414062 2.21875 1.296875 2.316406 1.140625 C 2.390625 1.027344 2.503906 0.746094 2.664062 0.292969 C 2.6875 0.230469 2.722656 0.136719 2.765625 0.0117188 L 0.210938 -6.742188 L 1.441406 -6.742188 L 2.84375 -2.835938 C 3.027344 -2.34375 3.1875 -1.820312 3.332031 -1.277344 C 3.464844 -1.800781 3.621094 -2.3125 3.800781 -2.8125 L 5.242188 -6.742188 L 6.386719 -6.742188 L 3.820312 0.113281 C 3.546875 0.855469 3.332031 1.363281 3.179688 1.644531 C 2.976562 2.019531 2.746094 2.296875 2.480469 2.472656 C 2.21875 2.648438 1.90625 2.734375 1.542969 2.734375 C 1.324219 2.734375 1.078125 2.6875 0.804688 2.597656 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-8">
-<path style="stroke:none;" d="M 0.855469 0 L 0.855469 -9.304688 L 2 -9.304688 L 2 -5.96875 C 2.53125 -6.585938 3.207031 -6.894531 4.019531 -6.894531 C 4.519531 -6.894531 4.953125 -6.796875 5.320312 -6.597656 C 5.6875 -6.402344 5.949219 -6.128906 6.109375 -5.78125 C 6.269531 -5.433594 6.347656 -4.933594 6.347656 -4.273438 L 6.347656 0 L 5.203125 0 L 5.203125 -4.273438 C 5.203125 -4.84375 5.082031 -5.257812 4.832031 -5.519531 C 4.585938 -5.78125 4.234375 -5.910156 3.78125 -5.910156 C 3.445312 -5.910156 3.125 -5.820312 2.828125 -5.644531 C 2.53125 -5.46875 2.316406 -5.234375 2.191406 -4.933594 C 2.0625 -4.632812 2 -4.21875 2 -3.6875 L 2 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-9">
-<path style="stroke:none;" d="M 0.855469 0 L 0.855469 -6.742188 L 1.886719 -6.742188 L 1.886719 -5.78125 C 2.382812 -6.523438 3.09375 -6.894531 4.03125 -6.894531 C 4.4375 -6.894531 4.808594 -6.820312 5.152344 -6.675781 C 5.492188 -6.527344 5.746094 -6.335938 5.914062 -6.101562 C 6.085938 -5.863281 6.203125 -5.582031 6.273438 -5.257812 C 6.3125 -5.046875 6.335938 -4.675781 6.335938 -4.144531 L 6.335938 0 L 5.191406 0 L 5.191406 -4.101562 C 5.191406 -4.566406 5.148438 -4.914062 5.058594 -5.144531 C 4.96875 -5.375 4.8125 -5.558594 4.585938 -5.695312 C 4.359375 -5.835938 4.09375 -5.902344 3.789062 -5.902344 C 3.304688 -5.902344 2.882812 -5.75 2.53125 -5.441406 C 2.175781 -5.132812 2 -4.546875 2 -3.679688 L 2 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-10">
-<path style="stroke:none;" d="M 0.855469 2.582031 L 0.855469 -6.742188 L 1.898438 -6.742188 L 1.898438 -5.867188 C 2.144531 -6.207031 2.421875 -6.464844 2.730469 -6.636719 C 3.039062 -6.808594 3.414062 -6.894531 3.851562 -6.894531 C 4.429688 -6.894531 4.9375 -6.746094 5.375 -6.449219 C 5.816406 -6.152344 6.148438 -5.734375 6.375 -5.195312 C 6.597656 -4.65625 6.710938 -4.066406 6.710938 -3.421875 C 6.710938 -2.730469 6.585938 -2.109375 6.339844 -1.558594 C 6.089844 -1.007812 5.730469 -0.582031 5.257812 -0.289062 C 4.785156 0.00390625 4.289062 0.152344 3.769531 0.152344 C 3.390625 0.152344 3.046875 0.0703125 2.746094 -0.0898438 C 2.441406 -0.25 2.195312 -0.453125 2 -0.699219 L 2 2.582031 Z M 1.890625 -3.332031 C 1.890625 -2.464844 2.066406 -1.824219 2.417969 -1.410156 C 2.769531 -0.996094 3.195312 -0.789062 3.695312 -0.789062 C 4.203125 -0.789062 4.636719 -1 5 -1.429688 C 5.359375 -1.859375 5.542969 -2.527344 5.542969 -3.429688 C 5.542969 -4.289062 5.363281 -4.929688 5.011719 -5.359375 C 4.65625 -5.785156 4.234375 -6 3.746094 -6 C 3.257812 -6 2.828125 -5.769531 2.453125 -5.316406 C 2.078125 -4.859375 1.890625 -4.199219 1.890625 -3.332031 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-11">
-<path style="stroke:none;" d="M 1.910156 0 L 0.851562 0 L 0.851562 -9.304688 L 1.992188 -9.304688 L 1.992188 -5.984375 C 2.476562 -6.589844 3.089844 -6.894531 3.839844 -6.894531 C 4.253906 -6.894531 4.648438 -6.808594 5.019531 -6.644531 C 5.390625 -6.476562 5.691406 -6.242188 5.933594 -5.9375 C 6.171875 -5.636719 6.359375 -5.269531 6.492188 -4.84375 C 6.628906 -4.414062 6.695312 -3.957031 6.695312 -3.472656 C 6.695312 -2.316406 6.410156 -1.425781 5.839844 -0.792969 C 5.269531 -0.164062 4.582031 0.152344 3.78125 0.152344 C 2.988281 0.152344 2.363281 -0.179688 1.910156 -0.84375 Z M 1.898438 -3.421875 C 1.898438 -2.613281 2.007812 -2.027344 2.226562 -1.667969 C 2.585938 -1.082031 3.074219 -0.789062 3.6875 -0.789062 C 4.1875 -0.789062 4.617188 -1.003906 4.984375 -1.4375 C 5.347656 -1.871094 5.527344 -2.519531 5.527344 -3.375 C 5.527344 -4.257812 5.355469 -4.90625 5.003906 -5.324219 C 4.65625 -5.742188 4.234375 -5.953125 3.738281 -5.953125 C 3.238281 -5.953125 2.808594 -5.738281 2.445312 -5.304688 C 2.082031 -4.871094 1.898438 -4.242188 1.898438 -3.421875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-12">
-<path style="stroke:none;" d="M 0.863281 -7.992188 L 0.863281 -9.304688 L 2.007812 -9.304688 L 2.007812 -7.992188 Z M 0.863281 0 L 0.863281 -6.742188 L 2.007812 -6.742188 L 2.007812 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-13">
-<path style="stroke:none;" d="M 5.230469 0 L 5.230469 -0.851562 C 4.804688 -0.183594 4.175781 0.152344 3.34375 0.152344 C 2.808594 0.152344 2.3125 0.00390625 1.863281 -0.292969 C 1.414062 -0.589844 1.0625 -1 0.816406 -1.53125 C 0.570312 -2.0625 0.445312 -2.675781 0.445312 -3.363281 C 0.445312 -4.035156 0.554688 -4.648438 0.78125 -5.195312 C 1.003906 -5.742188 1.339844 -6.164062 1.789062 -6.457031 C 2.238281 -6.75 2.738281 -6.894531 3.292969 -6.894531 C 3.699219 -6.894531 4.0625 -6.808594 4.378906 -6.636719 C 4.695312 -6.464844 4.957031 -6.242188 5.15625 -5.96875 L 5.15625 -9.304688 L 6.289062 -9.304688 L 6.289062 0 Z M 1.617188 -3.363281 C 1.617188 -2.5 1.800781 -1.855469 2.164062 -1.429688 C 2.527344 -1 2.957031 -0.789062 3.453125 -0.789062 C 3.953125 -0.789062 4.375 -0.992188 4.726562 -1.398438 C 5.074219 -1.808594 5.25 -2.429688 5.25 -3.269531 C 5.25 -4.191406 5.070312 -4.867188 4.714844 -5.300781 C 4.359375 -5.730469 3.921875 -5.949219 3.402344 -5.949219 C 2.894531 -5.949219 2.46875 -5.742188 2.128906 -5.324219 C 1.789062 -4.910156 1.617188 -4.257812 1.617188 -3.363281 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-14">
-<path style="stroke:none;" d="M 4.84375 0 L 3.699219 0 L 3.699219 -7.28125 C 3.425781 -7.019531 3.066406 -6.757812 2.617188 -6.492188 C 2.171875 -6.230469 1.769531 -6.035156 1.414062 -5.902344 L 1.414062 -7.007812 C 2.054688 -7.308594 2.613281 -7.671875 3.089844 -8.101562 C 3.570312 -8.527344 3.90625 -8.941406 4.105469 -9.34375 L 4.84375 -9.34375 Z "/>
-</symbol>
-</g>
-<clipPath id="clip1">
- <path d="M 89 21 L 91 21 L 91 221 L 89 221 Z "/>
-</clipPath>
-<clipPath id="clip2">
- <path d="M 201 21 L 203 21 L 203 221 L 201 221 Z "/>
-</clipPath>
-<clipPath id="clip3">
- <path d="M 313 21 L 315 21 L 315 221 L 313 221 Z "/>
-</clipPath>
-<clipPath id="clip4">
- <path d="M 33 180 L 355 180 L 355 182 L 33 182 Z "/>
-</clipPath>
-<clipPath id="clip5">
- <path d="M 33 146 L 355 146 L 355 148 L 33 148 Z "/>
-</clipPath>
-<clipPath id="clip6">
- <path d="M 33 120 L 355 120 L 355 122 L 33 122 Z "/>
-</clipPath>
-<clipPath id="clip7">
- <path d="M 33 95 L 355 95 L 355 97 L 33 97 Z "/>
-</clipPath>
-<clipPath id="clip8">
- <path d="M 33 61 L 355 61 L 355 63 L 33 63 Z "/>
-</clipPath>
-</defs>
-<g id="surface11">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 90.226562 220.007812 L 90.226562 21 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 201.996094 220.007812 L 201.996094 21 "/>
-</g>
-<g clip-path="url(#clip3)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 313.761719 220.007812 L 313.761719 21 "/>
-</g>
-<g clip-path="url(#clip4)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 33 180.734375 L 355 180.734375 "/>
-</g>
-<g clip-path="url(#clip5)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 33 146.960938 L 355 146.960938 "/>
-</g>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 33 121.410156 L 355 121.410156 "/>
-</g>
-<g clip-path="url(#clip7)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 33 95.859375 L 355 95.859375 "/>
-</g>
-<g clip-path="url(#clip8)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 33 62.082031 L 355 62.082031 "/>
-</g>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 49.128906 169 C 49.128906 168.167969 48.800781 167.375 48.214844 166.785156 C 47.625 166.199219 46.832031 165.871094 46 165.871094 C 45.167969 165.871094 44.375 166.199219 43.785156 166.785156 C 43.199219 167.375 42.871094 168.167969 42.871094 169 C 42.871094 169.832031 43.199219 170.625 43.785156 171.214844 C 44.375 171.800781 45.167969 172.128906 46 172.128906 C 46.832031 172.128906 47.625 171.800781 48.214844 171.214844 C 48.800781 170.625 49.128906 169.832031 49.128906 169 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 82.128906 169 C 82.128906 168.167969 81.800781 167.375 81.214844 166.785156 C 80.625 166.199219 79.832031 165.871094 79 165.871094 C 78.167969 165.871094 77.375 166.199219 76.785156 166.785156 C 76.199219 167.375 75.871094 168.167969 75.871094 169 C 75.871094 169.832031 76.199219 170.625 76.785156 171.214844 C 77.375 171.800781 78.167969 172.128906 79 172.128906 C 79.832031 172.128906 80.625 171.800781 81.214844 171.214844 C 81.800781 170.625 82.128906 169.832031 82.128906 169 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 116.128906 167 C 116.128906 166.167969 115.800781 165.375 115.214844 164.785156 C 114.625 164.199219 113.832031 163.871094 113 163.871094 C 112.167969 163.871094 111.375 164.199219 110.785156 164.785156 C 110.199219 165.375 109.871094 166.167969 109.871094 167 C 109.871094 167.832031 110.199219 168.625 110.785156 169.214844 C 111.375 169.800781 112.167969 170.128906 113 170.128906 C 113.832031 170.128906 114.625 169.800781 115.214844 169.214844 C 115.800781 168.625 116.128906 167.832031 116.128906 167 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 150.128906 159 C 150.128906 158.167969 149.800781 157.375 149.214844 156.785156 C 148.625 156.199219 147.832031 155.871094 147 155.871094 C 146.167969 155.871094 145.375 156.199219 144.785156 156.785156 C 144.199219 157.375 143.871094 158.167969 143.871094 159 C 143.871094 159.832031 144.199219 160.625 144.785156 161.214844 C 145.375 161.800781 146.167969 162.128906 147 162.128906 C 147.832031 162.128906 148.625 161.800781 149.214844 161.214844 C 149.800781 160.625 150.128906 159.832031 150.128906 159 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 183.128906 146 C 183.128906 145.167969 182.800781 144.375 182.214844 143.785156 C 181.625 143.199219 180.832031 142.871094 180 142.871094 C 179.167969 142.871094 178.375 143.199219 177.785156 143.785156 C 177.199219 144.375 176.871094 145.167969 176.871094 146 C 176.871094 146.832031 177.199219 147.625 177.785156 148.214844 C 178.375 148.800781 179.167969 149.128906 180 149.128906 C 180.832031 149.128906 181.625 148.800781 182.214844 148.214844 C 182.800781 147.625 183.128906 146.832031 183.128906 146 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 217.128906 128 C 217.128906 127.167969 216.800781 126.375 216.214844 125.785156 C 215.625 125.199219 214.832031 124.871094 214 124.871094 C 213.167969 124.871094 212.375 125.199219 211.785156 125.785156 C 211.199219 126.375 210.871094 127.167969 210.871094 128 C 210.871094 128.832031 211.199219 129.625 211.785156 130.214844 C 212.375 130.800781 213.167969 131.128906 214 131.128906 C 214.832031 131.128906 215.625 130.800781 216.214844 130.214844 C 216.800781 129.625 217.128906 128.832031 217.128906 128 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 251.128906 108 C 251.128906 107.167969 250.800781 106.375 250.214844 105.785156 C 249.625 105.199219 248.832031 104.871094 248 104.871094 C 247.167969 104.871094 246.375 105.199219 245.785156 105.785156 C 245.199219 106.375 244.871094 107.167969 244.871094 108 C 244.871094 108.832031 245.199219 109.625 245.785156 110.214844 C 246.375 110.800781 247.167969 111.128906 248 111.128906 C 248.832031 111.128906 249.625 110.800781 250.214844 110.214844 C 250.800781 109.625 251.128906 108.832031 251.128906 108 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 284.128906 85 C 284.128906 84.167969 283.800781 83.375 283.214844 82.785156 C 282.625 82.199219 281.832031 81.871094 281 81.871094 C 280.167969 81.871094 279.375 82.199219 278.785156 82.785156 C 278.199219 83.375 277.871094 84.167969 277.871094 85 C 277.871094 85.832031 278.199219 86.625 278.785156 87.214844 C 279.375 87.800781 280.167969 88.128906 281 88.128906 C 281.832031 88.128906 282.625 87.800781 283.214844 87.214844 C 283.800781 86.625 284.128906 85.832031 284.128906 85 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 318.128906 59 C 318.128906 58.167969 317.800781 57.375 317.214844 56.785156 C 316.625 56.199219 315.832031 55.871094 315 55.871094 C 314.167969 55.871094 313.375 56.199219 312.785156 56.785156 C 312.199219 57.375 311.871094 58.167969 311.871094 59 C 311.871094 59.832031 312.199219 60.625 312.785156 61.214844 C 313.375 61.800781 314.167969 62.128906 315 62.128906 C 315.832031 62.128906 316.625 61.800781 317.214844 61.214844 C 317.800781 60.625 318.128906 59.832031 318.128906 59 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 352.128906 31 C 352.128906 30.167969 351.800781 29.375 351.214844 28.785156 C 350.625 28.199219 349.832031 27.871094 349 27.871094 C 348.167969 27.871094 347.375 28.199219 346.785156 28.785156 C 346.199219 29.375 345.871094 30.167969 345.871094 31 C 345.871094 31.832031 346.199219 32.625 346.785156 33.214844 C 347.375 33.800781 348.167969 34.128906 349 34.128906 C 349.832031 34.128906 350.625 33.800781 351.214844 33.214844 C 351.800781 32.625 352.128906 31.832031 352.128906 31 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 49.128906 205 C 49.128906 204.167969 48.800781 203.375 48.214844 202.785156 C 47.625 202.199219 46.832031 201.871094 46 201.871094 C 45.167969 201.871094 44.375 202.199219 43.785156 202.785156 C 43.199219 203.375 42.871094 204.167969 42.871094 205 C 42.871094 205.832031 43.199219 206.625 43.785156 207.214844 C 44.375 207.800781 45.167969 208.128906 46 208.128906 C 46.832031 208.128906 47.625 207.800781 48.214844 207.214844 C 48.800781 206.625 49.128906 205.832031 49.128906 205 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 82.128906 199 C 82.128906 198.167969 81.800781 197.375 81.214844 196.785156 C 80.625 196.199219 79.832031 195.871094 79 195.871094 C 78.167969 195.871094 77.375 196.199219 76.785156 196.785156 C 76.199219 197.375 75.871094 198.167969 75.871094 199 C 75.871094 199.832031 76.199219 200.625 76.785156 201.214844 C 77.375 201.800781 78.167969 202.128906 79 202.128906 C 79.832031 202.128906 80.625 201.800781 81.214844 201.214844 C 81.800781 200.625 82.128906 199.832031 82.128906 199 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 116.128906 190 C 116.128906 189.167969 115.800781 188.375 115.214844 187.785156 C 114.625 187.199219 113.832031 186.871094 113 186.871094 C 112.167969 186.871094 111.375 187.199219 110.785156 187.785156 C 110.199219 188.375 109.871094 189.167969 109.871094 190 C 109.871094 190.832031 110.199219 191.625 110.785156 192.214844 C 111.375 192.800781 112.167969 193.128906 113 193.128906 C 113.832031 193.128906 114.625 192.800781 115.214844 192.214844 C 115.800781 191.625 116.128906 190.832031 116.128906 190 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 150.128906 177 C 150.128906 176.167969 149.800781 175.375 149.214844 174.785156 C 148.625 174.199219 147.832031 173.871094 147 173.871094 C 146.167969 173.871094 145.375 174.199219 144.785156 174.785156 C 144.199219 175.375 143.871094 176.167969 143.871094 177 C 143.871094 177.832031 144.199219 178.625 144.785156 179.214844 C 145.375 179.800781 146.167969 180.128906 147 180.128906 C 147.832031 180.128906 148.625 179.800781 149.214844 179.214844 C 149.800781 178.625 150.128906 177.832031 150.128906 177 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 183.128906 159 C 183.128906 158.167969 182.800781 157.375 182.214844 156.785156 C 181.625 156.199219 180.832031 155.871094 180 155.871094 C 179.167969 155.871094 178.375 156.199219 177.785156 156.785156 C 177.199219 157.375 176.871094 158.167969 176.871094 159 C 176.871094 159.832031 177.199219 160.625 177.785156 161.214844 C 178.375 161.800781 179.167969 162.128906 180 162.128906 C 180.832031 162.128906 181.625 161.800781 182.214844 161.214844 C 182.800781 160.625 183.128906 159.832031 183.128906 159 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 217.128906 138 C 217.128906 137.167969 216.800781 136.375 216.214844 135.785156 C 215.625 135.199219 214.832031 134.871094 214 134.871094 C 213.167969 134.871094 212.375 135.199219 211.785156 135.785156 C 211.199219 136.375 210.871094 137.167969 210.871094 138 C 210.871094 138.832031 211.199219 139.625 211.785156 140.214844 C 212.375 140.800781 213.167969 141.128906 214 141.128906 C 214.832031 141.128906 215.625 140.800781 216.214844 140.214844 C 216.800781 139.625 217.128906 138.832031 217.128906 138 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 251.128906 115 C 251.128906 114.167969 250.800781 113.375 250.214844 112.785156 C 249.625 112.199219 248.832031 111.871094 248 111.871094 C 247.167969 111.871094 246.375 112.199219 245.785156 112.785156 C 245.199219 113.375 244.871094 114.167969 244.871094 115 C 244.871094 115.832031 245.199219 116.625 245.785156 117.214844 C 246.375 117.800781 247.167969 118.128906 248 118.128906 C 248.832031 118.128906 249.625 117.800781 250.214844 117.214844 C 250.800781 116.625 251.128906 115.832031 251.128906 115 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 284.128906 91 C 284.128906 90.167969 283.800781 89.375 283.214844 88.785156 C 282.625 88.199219 281.832031 87.871094 281 87.871094 C 280.167969 87.871094 279.375 88.199219 278.785156 88.785156 C 278.199219 89.375 277.871094 90.167969 277.871094 91 C 277.871094 91.832031 278.199219 92.625 278.785156 93.214844 C 279.375 93.800781 280.167969 94.128906 281 94.128906 C 281.832031 94.128906 282.625 93.800781 283.214844 93.214844 C 283.800781 92.625 284.128906 91.832031 284.128906 91 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 318.128906 65 C 318.128906 64.167969 317.800781 63.375 317.214844 62.785156 C 316.625 62.199219 315.832031 61.871094 315 61.871094 C 314.167969 61.871094 313.375 62.199219 312.785156 62.785156 C 312.199219 63.375 311.871094 64.167969 311.871094 65 C 311.871094 65.832031 312.199219 66.625 312.785156 67.214844 C 313.375 67.800781 314.167969 68.128906 315 68.128906 C 315.832031 68.128906 316.625 67.800781 317.214844 67.214844 C 317.800781 66.625 318.128906 65.832031 318.128906 65 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 352.128906 38 C 352.128906 37.167969 351.800781 36.375 351.214844 35.785156 C 350.625 35.199219 349.832031 34.871094 349 34.871094 C 348.167969 34.871094 347.375 35.199219 346.785156 35.785156 C 346.199219 36.375 345.871094 37.167969 345.871094 38 C 345.871094 38.832031 346.199219 39.625 346.785156 40.214844 C 347.375 40.800781 348.167969 41.128906 349 41.128906 C 349.832031 41.128906 350.625 40.800781 351.214844 40.214844 C 351.800781 39.625 352.128906 38.832031 352.128906 38 Z "/>
-<path style="fill:none;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 220.007812 L 33 220.007812 "/>
-<path style="fill:none;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 220.007812 L 33 21 "/>
-<path style="fill:none;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 21 L 355 21 "/>
-<path style="fill:none;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 21 L 355 220.007812 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 90.226562 220.007812 L 90.226562 216.785156 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="84.725786" y="232.006944"/>
- <use xlink:href="#glyph0-2" x="90.28731" y="232.006944"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 201.996094 220.007812 L 201.996094 216.785156 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="193.49443" y="232.006944"/>
- <use xlink:href="#glyph0-2" x="199.055953" y="232.006944"/>
- <use xlink:href="#glyph0-2" x="204.617477" y="232.006944"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 313.761719 220.007812 L 313.761719 216.785156 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="302.763074" y="232.006944"/>
- <use xlink:href="#glyph0-2" x="308.324597" y="232.006944"/>
- <use xlink:href="#glyph0-2" x="313.88612" y="232.006944"/>
- <use xlink:href="#glyph0-2" x="319.447644" y="232.006944"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 45.75 220.007812 L 45.75 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 56.578125 220.007812 L 56.578125 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 65.429688 220.007812 L 65.429688 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 72.914062 220.007812 L 72.914062 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 79.394531 220.007812 L 79.394531 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 85.113281 220.007812 L 85.113281 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 123.871094 220.007812 L 123.871094 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 143.554688 220.007812 L 143.554688 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 157.515625 220.007812 L 157.515625 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 168.347656 220.007812 L 168.347656 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 177.199219 220.007812 L 177.199219 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 184.679688 220.007812 L 184.679688 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 191.164062 220.007812 L 191.164062 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 196.878906 220.007812 L 196.878906 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 235.640625 220.007812 L 235.640625 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 255.320312 220.007812 L 255.320312 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 269.285156 220.007812 L 269.285156 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 280.117188 220.007812 L 280.117188 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 288.96875 220.007812 L 288.96875 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 296.449219 220.007812 L 296.449219 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 302.929688 220.007812 L 302.929688 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 308.648438 220.007812 L 308.648438 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 347.410156 220.007812 L 347.410156 218.398438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 180.734375 L 36.21875 180.734375 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-3" x="24" y="183.235493"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 146.960938 L 36.21875 146.960938 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-4" x="24" y="149.45964"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 121.410156 L 36.21875 121.410156 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="19" y="123.909193"/>
- <use xlink:href="#glyph0-2" x="24.561523" y="123.909193"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 95.859375 L 36.21875 95.859375 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-3" x="19" y="98.358747"/>
- <use xlink:href="#glyph0-2" x="24.561523" y="98.358747"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 62.082031 L 36.21875 62.082031 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-4" x="19" y="64.582894"/>
- <use xlink:href="#glyph0-2" x="24.561523" y="64.582894"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 206.285156 L 34.609375 206.285156 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 165.789062 L 34.609375 165.789062 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 155.183594 L 34.609375 155.183594 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 140.238281 L 34.609375 140.238281 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 134.558594 L 34.609375 134.558594 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 129.632812 L 34.609375 129.632812 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 125.292969 L 34.609375 125.292969 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 80.914062 L 34.609375 80.914062 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 70.308594 L 34.609375 70.308594 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 33 36.53125 L 34.609375 36.53125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 90.226562 21 L 90.226562 24.21875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 201.996094 21 L 201.996094 24.21875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 313.761719 21 L 313.761719 24.21875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 45.75 21 L 45.75 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 56.578125 21 L 56.578125 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 65.429688 21 L 65.429688 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 72.914062 21 L 72.914062 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 79.394531 21 L 79.394531 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 85.113281 21 L 85.113281 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 123.871094 21 L 123.871094 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 143.554688 21 L 143.554688 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 157.515625 21 L 157.515625 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 168.347656 21 L 168.347656 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 177.199219 21 L 177.199219 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 184.679688 21 L 184.679688 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 191.164062 21 L 191.164062 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 196.878906 21 L 196.878906 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 235.640625 21 L 235.640625 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 255.320312 21 L 255.320312 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 269.285156 21 L 269.285156 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 280.117188 21 L 280.117188 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 288.96875 21 L 288.96875 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 296.449219 21 L 296.449219 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 302.929688 21 L 302.929688 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 308.648438 21 L 308.648438 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 347.410156 21 L 347.410156 22.609375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 180.734375 L 351.78125 180.734375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 146.960938 L 351.78125 146.960938 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 121.410156 L 351.78125 121.410156 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 95.859375 L 351.78125 95.859375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 62.082031 L 351.78125 62.082031 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 206.285156 L 353.390625 206.285156 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 165.789062 L 353.390625 165.789062 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 155.183594 L 353.390625 155.183594 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 140.238281 L 353.390625 140.238281 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 134.558594 L 353.390625 134.558594 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 129.632812 L 353.390625 129.632812 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 125.292969 L 353.390625 125.292969 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 80.914062 L 353.390625 80.914062 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 70.308594 L 353.390625 70.308594 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 36.53125 L 353.390625 36.53125 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-5" x="172.5" y="251.006944"/>
- <use xlink:href="#glyph0-6" x="178.608398" y="251.006944"/>
- <use xlink:href="#glyph0-7" x="184.169922" y="251.006944"/>
- <use xlink:href="#glyph0-8" x="189.731445" y="251.006944"/>
- <use xlink:href="#glyph0-9" x="194.731445" y="251.006944"/>
- <use xlink:href="#glyph0-10" x="197.509766" y="251.006944"/>
- <use xlink:href="#glyph0-11" x="199.731445" y="251.006944"/>
- <use xlink:href="#glyph0-7" x="205.292969" y="251.006944"/>
- <use xlink:href="#glyph0-12" x="210.854492" y="251.006944"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph1-1" x="9" y="140.003472"/>
- <use xlink:href="#glyph1-2" x="9" y="133.33355"/>
- <use xlink:href="#glyph1-3" x="9" y="127.772027"/>
- <use xlink:href="#glyph1-4" x="9" y="122.772027"/>
- <use xlink:href="#glyph1-5" x="9" y="117.210503"/>
- <use xlink:href="#glyph1-6" x="9" y="111.64898"/>
- <use xlink:href="#glyph1-7" x="9" y="106.087457"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph2-1" x="122" y="12"/>
- <use xlink:href="#glyph2-2" x="130.666016" y="12"/>
- <use xlink:href="#glyph2-3" x="137.339844" y="12"/>
- <use xlink:href="#glyph2-4" x="147.335938" y="12"/>
- <use xlink:href="#glyph2-5" x="154.009766" y="12"/>
- <use xlink:href="#glyph2-6" x="156.675781" y="12"/>
- <use xlink:href="#glyph2-7" x="159.341797" y="12"/>
- <use xlink:href="#glyph2-8" x="166.015625" y="12"/>
- <use xlink:href="#glyph2-5" x="169.349609" y="12"/>
- <use xlink:href="#glyph2-2" x="172.015625" y="12"/>
- <use xlink:href="#glyph2-9" x="178.689453" y="12"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph2-8" x="188" y="12"/>
- <use xlink:href="#glyph2-5" x="191.333984" y="12"/>
- <use xlink:href="#glyph2-3" x="194" y="12"/>
- <use xlink:href="#glyph2-10" x="203.996094" y="12"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph2-2" x="214" y="12"/>
- <use xlink:href="#glyph2-11" x="220.673828" y="12"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph2-3" x="227" y="12"/>
- <use xlink:href="#glyph2-2" x="236.996094" y="12"/>
- <use xlink:href="#glyph2-12" x="243.669922" y="12"/>
- <use xlink:href="#glyph2-13" x="250.34375" y="12"/>
- <use xlink:href="#glyph2-6" x="257.017578" y="12"/>
- <use xlink:href="#glyph2-10" x="259.683594" y="12"/>
-</g>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 382.148438 116 C 382.148438 115.164062 381.816406 114.363281 381.226562 113.773438 C 380.636719 113.183594 379.835938 112.851562 379 112.851562 C 378.164062 112.851562 377.363281 113.183594 376.773438 113.773438 C 376.183594 114.363281 375.851562 115.164062 375.851562 116 C 375.851562 116.835938 376.183594 117.636719 376.773438 118.226562 C 377.363281 118.816406 378.164062 119.148438 379 119.148438 C 379.835938 119.148438 380.636719 118.816406 381.226562 118.226562 C 381.816406 117.636719 382.148438 116.835938 382.148438 116 Z "/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph3-1" x="391" y="120.28418"/>
- <use xlink:href="#glyph3-2" x="399.670898" y="120.28418"/>
- <use xlink:href="#glyph3-2" x="406.901367" y="120.28418"/>
- <use xlink:href="#glyph3-3" x="414.131836" y="120.28418"/>
- <use xlink:href="#glyph3-4" x="420.631836" y="120.28418"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph3-5" x="424" y="120.28418"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph3-6" x="428" y="120.28418"/>
- <use xlink:href="#glyph3-7" x="436.670898" y="120.28418"/>
- <use xlink:href="#glyph3-4" x="443.170898" y="120.28418"/>
- <use xlink:href="#glyph3-8" x="446.783203" y="120.28418"/>
- <use xlink:href="#glyph3-2" x="454.013672" y="120.28418"/>
- <use xlink:href="#glyph3-9" x="461.244141" y="120.28418"/>
-</g>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 382.148438 139 C 382.148438 138.164062 381.816406 137.363281 381.226562 136.773438 C 380.636719 136.183594 379.835938 135.851562 379 135.851562 C 378.164062 135.851562 377.363281 136.183594 376.773438 136.773438 C 376.183594 137.363281 375.851562 138.164062 375.851562 139 C 375.851562 139.835938 376.183594 140.636719 376.773438 141.226562 C 377.363281 141.816406 378.164062 142.148438 379 142.148438 C 379.835938 142.148438 380.636719 141.816406 381.226562 141.226562 C 381.816406 140.636719 382.148438 139.835938 382.148438 139 Z "/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph3-10" x="391" y="143.28418"/>
- <use xlink:href="#glyph3-7" x="398.230469" y="143.28418"/>
- <use xlink:href="#glyph3-11" x="404.730469" y="143.28418"/>
- <use xlink:href="#glyph3-12" x="411.960938" y="143.28418"/>
- <use xlink:href="#glyph3-9" x="414.849609" y="143.28418"/>
- <use xlink:href="#glyph3-13" x="422.080078" y="143.28418"/>
- <use xlink:href="#glyph3-14" x="429.310547" y="143.28418"/>
- <use xlink:href="#glyph3-14" x="436.541016" y="143.28418"/>
-</g>
-</g>
-</svg>
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python2.png b/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python2.png
deleted file mode 100644
index 9f17272c50663957d6ae6d8e23fdd5a15757e71f..0000000000000000000000000000000000000000
Binary files a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python2.png and /dev/null differ
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python2.svg b/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python2.svg
deleted file mode 100644
index 5ed6530ca112cbe643d5dd6d6fde385c4edea6b5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/pybind11_vs_boost_python2.svg
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="468pt" height="246pt" viewBox="0 0 468 246" version="1.1">
-<defs>
-<g>
-<symbol overflow="visible" id="glyph0-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph0-1">
-<path style="stroke:none;" d="M 3.726562 0 L 2.847656 0 L 2.847656 -5.601562 C 2.636719 -5.398438 2.359375 -5.195312 2.015625 -4.996094 C 1.671875 -4.792969 1.363281 -4.640625 1.089844 -4.539062 L 1.089844 -5.390625 C 1.582031 -5.621094 2.011719 -5.902344 2.378906 -6.230469 C 2.746094 -6.558594 3.007812 -6.878906 3.160156 -7.1875 L 3.726562 -7.1875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-2">
-<path style="stroke:none;" d="M 0.414062 -3.53125 C 0.414062 -4.375 0.503906 -5.058594 0.675781 -5.574219 C 0.851562 -6.089844 1.109375 -6.488281 1.453125 -6.765625 C 1.796875 -7.046875 2.226562 -7.1875 2.75 -7.1875 C 3.132812 -7.1875 3.46875 -7.109375 3.757812 -6.957031 C 4.046875 -6.800781 4.289062 -6.578125 4.476562 -6.285156 C 4.664062 -5.996094 4.8125 -5.640625 4.921875 -5.222656 C 5.03125 -4.804688 5.082031 -4.238281 5.082031 -3.53125 C 5.082031 -2.691406 4.996094 -2.011719 4.824219 -1.496094 C 4.652344 -0.980469 4.394531 -0.582031 4.050781 -0.300781 C 3.707031 -0.0195312 3.273438 0.121094 2.75 0.121094 C 2.058594 0.121094 1.515625 -0.125 1.125 -0.621094 C 0.652344 -1.214844 0.414062 -2.1875 0.414062 -3.53125 Z M 1.320312 -3.53125 C 1.320312 -2.355469 1.457031 -1.574219 1.730469 -1.183594 C 2.007812 -0.796875 2.34375 -0.601562 2.75 -0.601562 C 3.152344 -0.601562 3.492188 -0.796875 3.765625 -1.1875 C 4.042969 -1.578125 4.179688 -2.359375 4.179688 -3.53125 C 4.179688 -4.710938 4.042969 -5.492188 3.765625 -5.878906 C 3.492188 -6.265625 3.148438 -6.460938 2.738281 -6.460938 C 2.335938 -6.460938 2.011719 -6.289062 1.773438 -5.945312 C 1.46875 -5.511719 1.320312 -4.707031 1.320312 -3.53125 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-3">
-<path style="stroke:none;" d="M 0.820312 0 L 0.820312 -7.15625 L 5.648438 -7.15625 L 5.648438 -6.3125 L 1.765625 -6.3125 L 1.765625 -4.097656 L 5.125 -4.097656 L 5.125 -3.25 L 1.765625 -3.25 L 1.765625 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-4">
-<path style="stroke:none;" d="M 4.058594 0 L 4.058594 -0.761719 C 3.65625 -0.175781 3.105469 0.117188 2.414062 0.117188 C 2.105469 0.117188 1.820312 0.0585938 1.554688 -0.0585938 C 1.289062 -0.175781 1.09375 -0.324219 0.964844 -0.5 C 0.835938 -0.679688 0.746094 -0.894531 0.695312 -1.152344 C 0.65625 -1.324219 0.640625 -1.597656 0.640625 -1.972656 L 0.640625 -5.1875 L 1.519531 -5.1875 L 1.519531 -2.308594 C 1.519531 -1.851562 1.535156 -1.542969 1.570312 -1.382812 C 1.625 -1.152344 1.746094 -0.96875 1.921875 -0.835938 C 2.101562 -0.703125 2.324219 -0.640625 2.585938 -0.640625 C 2.851562 -0.640625 3.097656 -0.707031 3.328125 -0.84375 C 3.5625 -0.976562 3.726562 -1.160156 3.820312 -1.394531 C 3.917969 -1.625 3.964844 -1.964844 3.964844 -2.40625 L 3.964844 -5.1875 L 4.84375 -5.1875 L 4.84375 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-5">
-<path style="stroke:none;" d="M 0.660156 0 L 0.660156 -5.1875 L 1.449219 -5.1875 L 1.449219 -4.449219 C 1.832031 -5.019531 2.382812 -5.304688 3.101562 -5.304688 C 3.414062 -5.304688 3.699219 -5.246094 3.960938 -5.132812 C 4.222656 -5.023438 4.421875 -4.875 4.550781 -4.691406 C 4.679688 -4.507812 4.773438 -4.292969 4.824219 -4.042969 C 4.855469 -3.878906 4.875 -3.59375 4.875 -3.1875 L 4.875 0 L 3.992188 0 L 3.992188 -3.15625 C 3.992188 -3.511719 3.960938 -3.78125 3.890625 -3.957031 C 3.824219 -4.132812 3.703125 -4.277344 3.527344 -4.382812 C 3.351562 -4.488281 3.148438 -4.539062 2.914062 -4.539062 C 2.539062 -4.539062 2.21875 -4.421875 1.945312 -4.183594 C 1.671875 -3.945312 1.539062 -3.496094 1.539062 -2.832031 L 1.539062 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-6">
-<path style="stroke:none;" d="M 4.042969 -1.898438 L 4.90625 -1.789062 C 4.8125 -1.191406 4.570312 -0.726562 4.183594 -0.386719 C 3.792969 -0.0507812 3.316406 0.117188 2.75 0.117188 C 2.039062 0.117188 1.46875 -0.113281 1.039062 -0.578125 C 0.605469 -1.042969 0.390625 -1.707031 0.390625 -2.574219 C 0.390625 -3.132812 0.484375 -3.625 0.667969 -4.042969 C 0.855469 -4.460938 1.136719 -4.777344 1.515625 -4.988281 C 1.894531 -5.199219 2.308594 -5.304688 2.753906 -5.304688 C 3.316406 -5.304688 3.777344 -5.160156 4.136719 -4.875 C 4.492188 -4.589844 4.722656 -4.1875 4.824219 -3.664062 L 3.96875 -3.53125 C 3.886719 -3.878906 3.746094 -4.140625 3.539062 -4.316406 C 3.332031 -4.492188 3.082031 -4.578125 2.789062 -4.578125 C 2.34375 -4.578125 1.984375 -4.421875 1.710938 -4.105469 C 1.433594 -3.789062 1.292969 -3.285156 1.292969 -2.597656 C 1.292969 -1.902344 1.425781 -1.394531 1.695312 -1.078125 C 1.960938 -0.761719 2.308594 -0.605469 2.738281 -0.605469 C 3.085938 -0.605469 3.371094 -0.710938 3.601562 -0.921875 C 3.835938 -1.132812 3.980469 -1.460938 4.042969 -1.898438 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-7">
-<path style="stroke:none;" d="M 2.578125 -0.785156 L 2.703125 -0.0078125 C 2.457031 0.0429688 2.234375 0.0703125 2.039062 0.0703125 C 1.722656 0.0703125 1.476562 0.0195312 1.296875 -0.0820312 C 1.121094 -0.183594 1 -0.316406 0.929688 -0.480469 C 0.855469 -0.644531 0.820312 -0.992188 0.820312 -1.519531 L 0.820312 -4.5 L 0.175781 -4.5 L 0.175781 -5.1875 L 0.820312 -5.1875 L 0.820312 -6.46875 L 1.695312 -6.996094 L 1.695312 -5.1875 L 2.578125 -5.1875 L 2.578125 -4.5 L 1.695312 -4.5 L 1.695312 -1.46875 C 1.695312 -1.21875 1.710938 -1.058594 1.742188 -0.984375 C 1.773438 -0.914062 1.820312 -0.859375 1.890625 -0.816406 C 1.960938 -0.773438 2.0625 -0.75 2.191406 -0.75 C 2.289062 -0.75 2.417969 -0.761719 2.578125 -0.785156 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-8">
-<path style="stroke:none;" d="M 0.664062 -6.148438 L 0.664062 -7.15625 L 1.542969 -7.15625 L 1.542969 -6.148438 Z M 0.664062 0 L 0.664062 -5.1875 L 1.542969 -5.1875 L 1.542969 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-9">
-<path style="stroke:none;" d="M 0.332031 -2.59375 C 0.332031 -3.554688 0.597656 -4.265625 1.132812 -4.726562 C 1.578125 -5.109375 2.121094 -5.304688 2.765625 -5.304688 C 3.476562 -5.304688 4.058594 -5.070312 4.511719 -4.601562 C 4.964844 -4.132812 5.191406 -3.488281 5.191406 -2.664062 C 5.191406 -2 5.089844 -1.472656 4.890625 -1.089844 C 4.691406 -0.707031 4.398438 -0.410156 4.015625 -0.199219 C 3.632812 0.0117188 3.214844 0.117188 2.765625 0.117188 C 2.039062 0.117188 1.449219 -0.117188 1.003906 -0.582031 C 0.554688 -1.046875 0.332031 -1.71875 0.332031 -2.59375 Z M 1.234375 -2.59375 C 1.234375 -1.929688 1.378906 -1.429688 1.671875 -1.101562 C 1.960938 -0.769531 2.324219 -0.605469 2.765625 -0.605469 C 3.199219 -0.605469 3.5625 -0.773438 3.851562 -1.101562 C 4.140625 -1.433594 4.289062 -1.941406 4.289062 -2.621094 C 4.289062 -3.261719 4.140625 -3.75 3.851562 -4.078125 C 3.558594 -4.410156 3.195312 -4.574219 2.765625 -4.574219 C 2.324219 -4.574219 1.960938 -4.410156 1.671875 -4.082031 C 1.382812 -3.753906 1.234375 -3.257812 1.234375 -2.59375 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-10">
-<path style="stroke:none;" d="M 0.308594 -1.546875 L 1.175781 -1.683594 C 1.226562 -1.335938 1.363281 -1.070312 1.585938 -0.882812 C 1.808594 -0.699219 2.117188 -0.605469 2.519531 -0.605469 C 2.921875 -0.605469 3.222656 -0.6875 3.417969 -0.851562 C 3.613281 -1.015625 3.710938 -1.210938 3.710938 -1.429688 C 3.710938 -1.628906 3.625 -1.785156 3.453125 -1.898438 C 3.332031 -1.976562 3.03125 -2.078125 2.554688 -2.195312 C 1.910156 -2.359375 1.460938 -2.5 1.214844 -2.621094 C 0.964844 -2.738281 0.777344 -2.902344 0.648438 -3.113281 C 0.519531 -3.324219 0.453125 -3.554688 0.453125 -3.808594 C 0.453125 -4.039062 0.507812 -4.253906 0.613281 -4.449219 C 0.71875 -4.648438 0.863281 -4.8125 1.046875 -4.941406 C 1.183594 -5.042969 1.367188 -5.128906 1.605469 -5.199219 C 1.839844 -5.269531 2.09375 -5.304688 2.363281 -5.304688 C 2.769531 -5.304688 3.128906 -5.242188 3.433594 -5.125 C 3.742188 -5.007812 3.96875 -4.851562 4.117188 -4.652344 C 4.261719 -4.453125 4.363281 -4.183594 4.417969 -3.847656 L 3.558594 -3.730469 C 3.519531 -3.996094 3.40625 -4.207031 3.21875 -4.355469 C 3.03125 -4.503906 2.769531 -4.578125 2.425781 -4.578125 C 2.023438 -4.578125 1.734375 -4.511719 1.5625 -4.378906 C 1.390625 -4.246094 1.304688 -4.089844 1.304688 -3.910156 C 1.304688 -3.796875 1.339844 -3.695312 1.410156 -3.601562 C 1.484375 -3.507812 1.59375 -3.429688 1.75 -3.367188 C 1.835938 -3.335938 2.09375 -3.261719 2.523438 -3.144531 C 3.144531 -2.976562 3.578125 -2.84375 3.824219 -2.738281 C 4.070312 -2.632812 4.265625 -2.476562 4.40625 -2.273438 C 4.546875 -2.074219 4.613281 -1.824219 4.613281 -1.523438 C 4.613281 -1.230469 4.527344 -0.953125 4.359375 -0.695312 C 4.1875 -0.4375 3.941406 -0.238281 3.617188 -0.09375 C 3.296875 0.046875 2.929688 0.117188 2.523438 0.117188 C 1.851562 0.117188 1.335938 -0.0234375 0.984375 -0.304688 C 0.632812 -0.582031 0.40625 -0.996094 0.308594 -1.546875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph1-1">
-<path style="stroke:none;" d="M 0.375 -1.6875 L 1.203125 -1.757812 C 1.265625 -1.351562 1.410156 -1.050781 1.632812 -0.847656 C 1.855469 -0.644531 2.125 -0.539062 2.445312 -0.539062 C 2.824219 -0.539062 3.148438 -0.683594 3.410156 -0.972656 C 3.671875 -1.257812 3.804688 -1.640625 3.804688 -2.113281 C 3.804688 -2.566406 3.679688 -2.921875 3.425781 -3.179688 C 3.171875 -3.441406 2.839844 -3.574219 2.429688 -3.574219 C 2.175781 -3.574219 1.945312 -3.515625 1.742188 -3.398438 C 1.535156 -3.28125 1.375 -3.132812 1.257812 -2.949219 L 0.515625 -3.046875 L 1.136719 -6.355469 L 4.34375 -6.355469 L 4.34375 -5.597656 L 1.769531 -5.597656 L 1.421875 -3.867188 C 1.808594 -4.136719 2.214844 -4.273438 2.640625 -4.273438 C 3.203125 -4.273438 3.679688 -4.078125 4.066406 -3.6875 C 4.453125 -3.296875 4.644531 -2.796875 4.644531 -2.183594 C 4.644531 -1.601562 4.476562 -1.097656 4.136719 -0.671875 C 3.722656 -0.152344 3.15625 0.109375 2.445312 0.109375 C 1.859375 0.109375 1.378906 -0.0546875 1.007812 -0.382812 C 0.636719 -0.710938 0.425781 -1.144531 0.375 -1.6875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-2">
-<path style="stroke:none;" d="M 4.476562 -4.863281 L 3.691406 -4.804688 C 3.621094 -5.113281 3.523438 -5.339844 3.390625 -5.480469 C 3.179688 -5.707031 2.914062 -5.820312 2.601562 -5.820312 C 2.351562 -5.820312 2.128906 -5.75 1.9375 -5.609375 C 1.6875 -5.425781 1.492188 -5.160156 1.347656 -4.8125 C 1.203125 -4.464844 1.132812 -3.96875 1.125 -3.320312 C 1.316406 -3.613281 1.546875 -3.828125 1.824219 -3.96875 C 2.097656 -4.109375 2.386719 -4.179688 2.6875 -4.179688 C 3.214844 -4.179688 3.664062 -3.984375 4.035156 -3.597656 C 4.40625 -3.210938 4.59375 -2.707031 4.59375 -2.09375 C 4.59375 -1.6875 4.503906 -1.3125 4.332031 -0.964844 C 4.15625 -0.617188 3.917969 -0.351562 3.613281 -0.167969 C 3.308594 0.015625 2.960938 0.109375 2.574219 0.109375 C 1.914062 0.109375 1.378906 -0.132812 0.960938 -0.617188 C 0.546875 -1.101562 0.339844 -1.902344 0.339844 -3.015625 C 0.339844 -4.261719 0.570312 -5.164062 1.027344 -5.730469 C 1.429688 -6.222656 1.96875 -6.46875 2.648438 -6.46875 C 3.15625 -6.46875 3.570312 -6.328125 3.894531 -6.042969 C 4.21875 -5.757812 4.414062 -5.367188 4.476562 -4.863281 Z M 1.25 -2.085938 C 1.25 -1.8125 1.304688 -1.554688 1.421875 -1.304688 C 1.539062 -1.054688 1.699219 -0.867188 1.90625 -0.734375 C 2.113281 -0.605469 2.332031 -0.539062 2.5625 -0.539062 C 2.894531 -0.539062 3.183594 -0.675781 3.421875 -0.945312 C 3.664062 -1.214844 3.785156 -1.582031 3.785156 -2.042969 C 3.785156 -2.488281 3.664062 -2.839844 3.429688 -3.097656 C 3.191406 -3.351562 2.890625 -3.480469 2.53125 -3.480469 C 2.171875 -3.480469 1.871094 -3.351562 1.621094 -3.097656 C 1.371094 -2.839844 1.25 -2.503906 1.25 -2.085938 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-3">
-<path style="stroke:none;" d="M 0.425781 -5.597656 L 0.425781 -6.359375 L 4.597656 -6.359375 L 4.597656 -5.742188 C 4.1875 -5.304688 3.78125 -4.726562 3.378906 -4.003906 C 2.976562 -3.28125 2.664062 -2.535156 2.445312 -1.769531 C 2.285156 -1.230469 2.183594 -0.640625 2.140625 0 L 1.328125 0 C 1.335938 -0.507812 1.4375 -1.117188 1.625 -1.835938 C 1.816406 -2.554688 2.089844 -3.246094 2.445312 -3.914062 C 2.800781 -4.578125 3.179688 -5.140625 3.582031 -5.597656 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph2-1">
-<path style="stroke:none;" d="M 0 -0.734375 L -7.15625 -0.734375 L -7.15625 -3.417969 C -7.15625 -3.964844 -7.085938 -4.402344 -6.941406 -4.734375 C -6.796875 -5.0625 -6.574219 -5.324219 -6.273438 -5.511719 C -5.972656 -5.699219 -5.65625 -5.789062 -5.328125 -5.789062 C -5.023438 -5.789062 -4.734375 -5.707031 -4.460938 -5.542969 C -4.191406 -5.375 -3.976562 -5.125 -3.808594 -4.789062 C -3.679688 -5.222656 -3.464844 -5.554688 -3.160156 -5.789062 C -2.851562 -6.023438 -2.492188 -6.136719 -2.074219 -6.136719 C -1.738281 -6.136719 -1.429688 -6.066406 -1.140625 -5.925781 C -0.851562 -5.785156 -0.628906 -5.609375 -0.472656 -5.398438 C -0.316406 -5.191406 -0.199219 -4.929688 -0.121094 -4.617188 C -0.0390625 -4.304688 0 -3.917969 0 -3.460938 Z M -4.148438 -1.679688 L -4.148438 -3.226562 C -4.148438 -3.648438 -4.179688 -3.949219 -4.234375 -4.132812 C -4.304688 -4.371094 -4.421875 -4.554688 -4.589844 -4.675781 C -4.757812 -4.796875 -4.964844 -4.859375 -5.214844 -4.859375 C -5.453125 -4.859375 -5.660156 -4.800781 -5.84375 -4.6875 C -6.023438 -4.574219 -6.148438 -4.410156 -6.214844 -4.199219 C -6.28125 -3.988281 -6.3125 -3.625 -6.3125 -3.109375 L -6.3125 -1.679688 Z M -0.84375 -1.679688 L -0.84375 -3.460938 C -0.84375 -3.765625 -0.855469 -3.984375 -0.878906 -4.105469 C -0.917969 -4.324219 -0.984375 -4.507812 -1.074219 -4.652344 C -1.164062 -4.800781 -1.296875 -4.921875 -1.472656 -5.015625 C -1.648438 -5.109375 -1.847656 -5.15625 -2.074219 -5.15625 C -2.34375 -5.15625 -2.574219 -5.085938 -2.769531 -4.953125 C -2.96875 -4.816406 -3.105469 -4.625 -3.1875 -4.382812 C -3.265625 -4.140625 -3.304688 -3.789062 -3.304688 -3.335938 L -3.304688 -1.679688 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-2">
-<path style="stroke:none;" d="M 1.996094 -0.621094 L 1.171875 -0.523438 C 1.222656 -0.714844 1.25 -0.882812 1.25 -1.023438 C 1.25 -1.21875 1.21875 -1.375 1.152344 -1.492188 C 1.085938 -1.609375 0.996094 -1.707031 0.878906 -1.78125 C 0.789062 -1.835938 0.574219 -1.925781 0.226562 -2.050781 C 0.175781 -2.066406 0.105469 -2.09375 0.0078125 -2.128906 L -5.1875 -0.160156 L -5.1875 -1.109375 L -2.183594 -2.1875 C -1.800781 -2.328125 -1.402344 -2.453125 -0.980469 -2.5625 C -1.382812 -2.664062 -1.777344 -2.785156 -2.164062 -2.925781 L -5.1875 -4.03125 L -5.1875 -4.914062 L 0.0859375 -2.9375 C 0.65625 -2.726562 1.050781 -2.5625 1.265625 -2.445312 C 1.554688 -2.289062 1.765625 -2.109375 1.902344 -1.910156 C 2.039062 -1.707031 2.105469 -1.464844 2.105469 -1.1875 C 2.105469 -1.015625 2.070312 -0.828125 1.996094 -0.621094 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-3">
-<path style="stroke:none;" d="M -0.785156 -2.578125 L -0.0078125 -2.703125 C 0.0429688 -2.457031 0.0703125 -2.234375 0.0703125 -2.039062 C 0.0703125 -1.722656 0.0195312 -1.476562 -0.0820312 -1.296875 C -0.183594 -1.121094 -0.316406 -1 -0.480469 -0.929688 C -0.644531 -0.855469 -0.992188 -0.820312 -1.519531 -0.820312 L -4.5 -0.820312 L -4.5 -0.175781 L -5.1875 -0.175781 L -5.1875 -0.820312 L -6.46875 -0.820312 L -6.996094 -1.695312 L -5.1875 -1.695312 L -5.1875 -2.578125 L -4.5 -2.578125 L -4.5 -1.695312 L -1.46875 -1.695312 C -1.21875 -1.695312 -1.058594 -1.710938 -0.984375 -1.742188 C -0.914062 -1.773438 -0.859375 -1.820312 -0.816406 -1.890625 C -0.773438 -1.960938 -0.75 -2.0625 -0.75 -2.191406 C -0.75 -2.289062 -0.761719 -2.417969 -0.785156 -2.578125 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-4">
-<path style="stroke:none;" d="M -1.671875 -4.210938 L -1.558594 -5.117188 C -1.027344 -4.972656 -0.617188 -4.707031 -0.320312 -4.320312 C -0.0273438 -3.933594 0.117188 -3.4375 0.117188 -2.835938 C 0.117188 -2.078125 -0.117188 -1.476562 -0.582031 -1.03125 C -1.050781 -0.585938 -1.707031 -0.367188 -2.546875 -0.367188 C -3.421875 -0.367188 -4.097656 -0.589844 -4.578125 -1.039062 C -5.0625 -1.488281 -5.304688 -2.070312 -5.304688 -2.789062 C -5.304688 -3.480469 -5.066406 -4.046875 -4.59375 -4.488281 C -4.121094 -4.925781 -3.457031 -5.148438 -2.601562 -5.148438 C -2.550781 -5.148438 -2.472656 -5.144531 -2.367188 -5.140625 L -2.367188 -1.273438 C -1.796875 -1.304688 -1.363281 -1.46875 -1.058594 -1.757812 C -0.757812 -2.046875 -0.605469 -2.410156 -0.605469 -2.84375 C -0.605469 -3.164062 -0.691406 -3.4375 -0.859375 -3.667969 C -1.027344 -3.894531 -1.296875 -4.074219 -1.671875 -4.210938 Z M -3.089844 -1.324219 L -3.089844 -4.21875 C -3.527344 -4.179688 -3.855469 -4.070312 -4.070312 -3.886719 C -4.410156 -3.605469 -4.578125 -3.242188 -4.578125 -2.796875 C -4.578125 -2.394531 -4.445312 -2.054688 -4.175781 -1.78125 C -3.90625 -1.503906 -3.542969 -1.351562 -3.089844 -1.324219 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-5">
-<path style="stroke:none;" d="M -1.546875 -0.308594 L -1.683594 -1.175781 C -1.335938 -1.226562 -1.070312 -1.363281 -0.882812 -1.585938 C -0.699219 -1.808594 -0.605469 -2.117188 -0.605469 -2.519531 C -0.605469 -2.921875 -0.6875 -3.222656 -0.851562 -3.417969 C -1.015625 -3.613281 -1.210938 -3.710938 -1.429688 -3.710938 C -1.628906 -3.710938 -1.785156 -3.625 -1.898438 -3.453125 C -1.976562 -3.332031 -2.078125 -3.03125 -2.195312 -2.554688 C -2.359375 -1.910156 -2.5 -1.460938 -2.621094 -1.214844 C -2.738281 -0.964844 -2.902344 -0.777344 -3.113281 -0.648438 C -3.324219 -0.519531 -3.554688 -0.453125 -3.808594 -0.453125 C -4.039062 -0.453125 -4.253906 -0.507812 -4.449219 -0.613281 C -4.648438 -0.71875 -4.8125 -0.863281 -4.941406 -1.046875 C -5.042969 -1.183594 -5.128906 -1.367188 -5.199219 -1.605469 C -5.269531 -1.839844 -5.304688 -2.09375 -5.304688 -2.363281 C -5.304688 -2.769531 -5.242188 -3.128906 -5.125 -3.433594 C -5.007812 -3.742188 -4.851562 -3.96875 -4.652344 -4.117188 C -4.453125 -4.261719 -4.183594 -4.363281 -3.847656 -4.417969 L -3.730469 -3.558594 C -3.996094 -3.519531 -4.207031 -3.40625 -4.355469 -3.21875 C -4.503906 -3.03125 -4.578125 -2.769531 -4.578125 -2.425781 C -4.578125 -2.023438 -4.511719 -1.734375 -4.378906 -1.5625 C -4.246094 -1.390625 -4.089844 -1.304688 -3.910156 -1.304688 C -3.796875 -1.304688 -3.695312 -1.339844 -3.601562 -1.410156 C -3.507812 -1.484375 -3.429688 -1.59375 -3.367188 -1.75 C -3.335938 -1.835938 -3.261719 -2.09375 -3.144531 -2.523438 C -2.976562 -3.144531 -2.84375 -3.578125 -2.738281 -3.824219 C -2.632812 -4.070312 -2.476562 -4.265625 -2.273438 -4.40625 C -2.074219 -4.546875 -1.824219 -4.613281 -1.523438 -4.613281 C -1.230469 -4.613281 -0.953125 -4.527344 -0.695312 -4.359375 C -0.4375 -4.1875 -0.238281 -3.941406 -0.09375 -3.617188 C 0.046875 -3.296875 0.117188 -2.929688 0.117188 -2.523438 C 0.117188 -1.851562 -0.0234375 -1.335938 -0.304688 -0.984375 C -0.582031 -0.632812 -0.996094 -0.40625 -1.546875 -0.308594 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph3-1">
-<path style="stroke:none;" d="M 0.984375 0 L 0.984375 -8.589844 L 6.78125 -8.589844 L 6.78125 -7.578125 L 2.121094 -7.578125 L 2.121094 -4.914062 L 6.152344 -4.914062 L 6.152344 -3.902344 L 2.121094 -3.902344 L 2.121094 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-2">
-<path style="stroke:none;" d="M 0.796875 -7.375 L 0.796875 -8.589844 L 1.851562 -8.589844 L 1.851562 -7.375 Z M 0.796875 0 L 0.796875 -6.222656 L 1.851562 -6.222656 L 1.851562 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-3">
-<path style="stroke:none;" d="M 0.765625 0 L 0.765625 -8.589844 L 1.820312 -8.589844 L 1.820312 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-4">
-<path style="stroke:none;" d="M 5.050781 -2.003906 L 6.140625 -1.867188 C 5.96875 -1.230469 5.648438 -0.738281 5.1875 -0.386719 C 4.722656 -0.0351562 4.125 0.140625 3.40625 0.140625 C 2.496094 0.140625 1.773438 -0.140625 1.238281 -0.699219 C 0.707031 -1.261719 0.4375 -2.046875 0.4375 -3.058594 C 0.4375 -4.105469 0.710938 -4.917969 1.25 -5.496094 C 1.789062 -6.074219 2.484375 -6.363281 3.34375 -6.363281 C 4.175781 -6.363281 4.859375 -6.078125 5.382812 -5.515625 C 5.910156 -4.949219 6.175781 -4.148438 6.175781 -3.125 C 6.175781 -3.0625 6.171875 -2.96875 6.171875 -2.84375 L 1.53125 -2.84375 C 1.570312 -2.160156 1.761719 -1.632812 2.109375 -1.273438 C 2.457031 -0.910156 2.890625 -0.726562 3.410156 -0.726562 C 3.796875 -0.726562 4.125 -0.828125 4.398438 -1.03125 C 4.671875 -1.234375 4.890625 -1.558594 5.050781 -2.003906 Z M 1.585938 -3.710938 L 5.0625 -3.710938 C 5.015625 -4.234375 4.882812 -4.625 4.664062 -4.886719 C 4.328125 -5.292969 3.890625 -5.496094 3.359375 -5.496094 C 2.875 -5.496094 2.464844 -5.335938 2.136719 -5.007812 C 1.804688 -4.683594 1.625 -4.25 1.585938 -3.710938 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-5">
-<path style="stroke:none;" d="M 0.367188 -1.859375 L 1.414062 -2.023438 C 1.472656 -1.605469 1.632812 -1.28125 1.902344 -1.0625 C 2.167969 -0.839844 2.542969 -0.726562 3.023438 -0.726562 C 3.507812 -0.726562 3.867188 -0.824219 4.101562 -1.023438 C 4.335938 -1.21875 4.453125 -1.453125 4.453125 -1.71875 C 4.453125 -1.957031 4.351562 -2.140625 4.140625 -2.28125 C 3.996094 -2.375 3.640625 -2.492188 3.0625 -2.636719 C 2.289062 -2.832031 1.753906 -3 1.457031 -3.144531 C 1.15625 -3.285156 0.929688 -3.484375 0.777344 -3.734375 C 0.621094 -3.988281 0.546875 -4.265625 0.546875 -4.570312 C 0.546875 -4.847656 0.609375 -5.105469 0.734375 -5.339844 C 0.863281 -5.578125 1.035156 -5.773438 1.253906 -5.929688 C 1.417969 -6.050781 1.640625 -6.152344 1.925781 -6.238281 C 2.207031 -6.320312 2.511719 -6.363281 2.835938 -6.363281 C 3.324219 -6.363281 3.753906 -6.292969 4.121094 -6.152344 C 4.492188 -6.011719 4.765625 -5.820312 4.9375 -5.582031 C 5.113281 -5.339844 5.234375 -5.019531 5.304688 -4.617188 L 4.273438 -4.476562 C 4.226562 -4.796875 4.089844 -5.046875 3.863281 -5.226562 C 3.640625 -5.40625 3.320312 -5.496094 2.914062 -5.496094 C 2.429688 -5.496094 2.082031 -5.414062 1.875 -5.257812 C 1.667969 -5.097656 1.5625 -4.90625 1.5625 -4.695312 C 1.5625 -4.558594 1.609375 -4.433594 1.695312 -4.324219 C 1.78125 -4.210938 1.914062 -4.117188 2.097656 -4.042969 C 2.203125 -4.003906 2.515625 -3.914062 3.03125 -3.773438 C 3.777344 -3.574219 4.296875 -3.410156 4.589844 -3.285156 C 4.886719 -3.15625 5.117188 -2.972656 5.285156 -2.730469 C 5.453125 -2.488281 5.539062 -2.1875 5.539062 -1.828125 C 5.539062 -1.476562 5.433594 -1.144531 5.230469 -0.835938 C 5.023438 -0.523438 4.726562 -0.285156 4.34375 -0.113281 C 3.957031 0.0546875 3.515625 0.140625 3.03125 0.140625 C 2.222656 0.140625 1.605469 -0.0273438 1.179688 -0.363281 C 0.757812 -0.699219 0.484375 -1.195312 0.367188 -1.859375 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-6">
-<path style="stroke:none;" d="M 0.234375 0 L 0.234375 -0.855469 L 4.195312 -5.402344 C 3.746094 -5.378906 3.351562 -5.367188 3.007812 -5.367188 L 0.46875 -5.367188 L 0.46875 -6.222656 L 5.554688 -6.222656 L 5.554688 -5.523438 L 2.1875 -1.578125 L 1.535156 -0.855469 C 2.007812 -0.890625 2.453125 -0.90625 2.867188 -0.90625 L 5.742188 -0.90625 L 5.742188 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-7">
-<path style="stroke:none;" d="M 0.398438 -3.109375 C 0.398438 -4.261719 0.71875 -5.117188 1.359375 -5.671875 C 1.894531 -6.132812 2.546875 -6.363281 3.316406 -6.363281 C 4.171875 -6.363281 4.871094 -6.082031 5.414062 -5.523438 C 5.957031 -4.960938 6.226562 -4.1875 6.226562 -3.199219 C 6.226562 -2.398438 6.109375 -1.769531 5.867188 -1.308594 C 5.628906 -0.851562 5.277344 -0.492188 4.820312 -0.242188 C 4.359375 0.0117188 3.859375 0.140625 3.316406 0.140625 C 2.445312 0.140625 1.742188 -0.140625 1.203125 -0.695312 C 0.667969 -1.253906 0.398438 -2.0625 0.398438 -3.109375 Z M 1.484375 -3.109375 C 1.484375 -2.3125 1.65625 -1.71875 2.003906 -1.320312 C 2.351562 -0.925781 2.789062 -0.726562 3.316406 -0.726562 C 3.839844 -0.726562 4.273438 -0.925781 4.625 -1.324219 C 4.972656 -1.722656 5.144531 -2.328125 5.144531 -3.148438 C 5.144531 -3.917969 4.96875 -4.5 4.621094 -4.894531 C 4.269531 -5.292969 3.835938 -5.492188 3.316406 -5.492188 C 2.789062 -5.492188 2.351562 -5.292969 2.003906 -4.898438 C 1.65625 -4.503906 1.484375 -3.90625 1.484375 -3.109375 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-8">
-<path style="stroke:none;" d="M 1.042969 0 L 1.042969 -5.402344 L 0.109375 -5.402344 L 0.109375 -6.222656 L 1.042969 -6.222656 L 1.042969 -6.882812 C 1.042969 -7.300781 1.078125 -7.613281 1.15625 -7.816406 C 1.257812 -8.089844 1.433594 -8.3125 1.691406 -8.480469 C 1.945312 -8.652344 2.304688 -8.734375 2.765625 -8.734375 C 3.0625 -8.734375 3.390625 -8.703125 3.75 -8.632812 L 3.59375 -7.710938 C 3.375 -7.75 3.164062 -7.769531 2.96875 -7.769531 C 2.648438 -7.769531 2.421875 -7.703125 2.289062 -7.5625 C 2.15625 -7.425781 2.09375 -7.171875 2.09375 -6.796875 L 2.09375 -6.222656 L 3.304688 -6.222656 L 3.304688 -5.402344 L 2.09375 -5.402344 L 2.09375 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-9">
-<path style="stroke:none;" d="M 0.789062 0 L 0.789062 -6.222656 L 1.734375 -6.222656 L 1.734375 -5.351562 C 1.929688 -5.65625 2.1875 -5.898438 2.515625 -6.085938 C 2.839844 -6.269531 3.207031 -6.363281 3.621094 -6.363281 C 4.082031 -6.363281 4.460938 -6.265625 4.753906 -6.078125 C 5.050781 -5.886719 5.257812 -5.617188 5.378906 -5.273438 C 5.871094 -6 6.511719 -6.363281 7.300781 -6.363281 C 7.917969 -6.363281 8.390625 -6.191406 8.726562 -5.851562 C 9.058594 -5.507812 9.222656 -4.984375 9.222656 -4.273438 L 9.222656 0 L 8.171875 0 L 8.171875 -3.921875 C 8.171875 -4.34375 8.140625 -4.644531 8.070312 -4.832031 C 8.003906 -5.015625 7.878906 -5.164062 7.699219 -5.28125 C 7.519531 -5.394531 7.308594 -5.449219 7.066406 -5.449219 C 6.628906 -5.449219 6.265625 -5.304688 5.976562 -5.011719 C 5.6875 -4.722656 5.542969 -4.257812 5.542969 -3.617188 L 5.542969 0 L 4.488281 0 L 4.488281 -4.042969 C 4.488281 -4.511719 4.402344 -4.863281 4.230469 -5.097656 C 4.058594 -5.332031 3.777344 -5.449219 3.386719 -5.449219 C 3.089844 -5.449219 2.816406 -5.371094 2.5625 -5.214844 C 2.3125 -5.058594 2.128906 -4.828125 2.015625 -4.53125 C 1.902344 -4.230469 1.84375 -3.796875 1.84375 -3.226562 L 1.84375 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-10">
-<path style="stroke:none;" d="M 4.828125 0 L 4.828125 -0.785156 C 4.433594 -0.167969 3.851562 0.140625 3.085938 0.140625 C 2.589844 0.140625 2.136719 0.00390625 1.71875 -0.269531 C 1.304688 -0.542969 0.980469 -0.925781 0.753906 -1.414062 C 0.523438 -1.90625 0.410156 -2.46875 0.410156 -3.105469 C 0.410156 -3.726562 0.515625 -4.289062 0.71875 -4.796875 C 0.925781 -5.300781 1.238281 -5.6875 1.652344 -5.960938 C 2.066406 -6.230469 2.53125 -6.363281 3.039062 -6.363281 C 3.414062 -6.363281 3.75 -6.285156 4.042969 -6.125 C 4.335938 -5.96875 4.574219 -5.761719 4.757812 -5.507812 L 4.757812 -8.589844 L 5.804688 -8.589844 L 5.804688 0 Z M 1.492188 -3.105469 C 1.492188 -2.308594 1.664062 -1.710938 2 -1.320312 C 2.335938 -0.925781 2.730469 -0.726562 3.1875 -0.726562 C 3.648438 -0.726562 4.039062 -0.914062 4.363281 -1.292969 C 4.683594 -1.667969 4.84375 -2.242188 4.84375 -3.015625 C 4.84375 -3.867188 4.679688 -4.492188 4.351562 -4.890625 C 4.023438 -5.289062 3.621094 -5.492188 3.140625 -5.492188 C 2.671875 -5.492188 2.28125 -5.296875 1.964844 -4.914062 C 1.652344 -4.53125 1.492188 -3.929688 1.492188 -3.105469 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph3-11">
-<path style="stroke:none;" d="M 4.867188 0 L 4.867188 -0.914062 C 4.382812 -0.210938 3.726562 0.140625 2.894531 0.140625 C 2.527344 0.140625 2.183594 0.0703125 1.867188 -0.0703125 C 1.546875 -0.210938 1.3125 -0.386719 1.15625 -0.601562 C 1.003906 -0.8125 0.894531 -1.074219 0.832031 -1.382812 C 0.789062 -1.589844 0.765625 -1.917969 0.765625 -2.367188 L 0.765625 -6.222656 L 1.820312 -6.222656 L 1.820312 -2.773438 C 1.820312 -2.222656 1.84375 -1.851562 1.886719 -1.65625 C 1.953125 -1.378906 2.09375 -1.164062 2.308594 -1.003906 C 2.523438 -0.847656 2.789062 -0.765625 3.105469 -0.765625 C 3.421875 -0.765625 3.71875 -0.847656 3.996094 -1.011719 C 4.273438 -1.171875 4.46875 -1.394531 4.585938 -1.671875 C 4.699219 -1.953125 4.757812 -2.359375 4.757812 -2.890625 L 4.757812 -6.222656 L 5.8125 -6.222656 L 5.8125 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph4-1">
-<path style="stroke:none;" d="M 0.953125 0 L 0.953125 -9.304688 L 4.445312 -9.304688 C 5.15625 -9.304688 5.722656 -9.210938 6.152344 -9.023438 C 6.582031 -8.835938 6.921875 -8.546875 7.164062 -8.152344 C 7.40625 -7.761719 7.527344 -7.351562 7.527344 -6.925781 C 7.527344 -6.527344 7.421875 -6.152344 7.203125 -5.800781 C 6.988281 -5.449219 6.664062 -5.167969 6.226562 -4.953125 C 6.789062 -4.785156 7.222656 -4.503906 7.523438 -4.105469 C 7.828125 -3.707031 7.980469 -3.238281 7.980469 -2.699219 C 7.980469 -2.261719 7.886719 -1.855469 7.703125 -1.480469 C 7.519531 -1.105469 7.292969 -0.820312 7.019531 -0.617188 C 6.75 -0.414062 6.410156 -0.257812 6 -0.15625 C 5.59375 -0.0507812 5.09375 0 4.5 0 Z M 2.183594 -5.394531 L 4.195312 -5.394531 C 4.742188 -5.394531 5.132812 -5.429688 5.371094 -5.503906 C 5.683594 -5.597656 5.917969 -5.75 6.078125 -5.96875 C 6.238281 -6.183594 6.316406 -6.453125 6.316406 -6.78125 C 6.316406 -7.089844 6.242188 -7.359375 6.09375 -7.59375 C 5.945312 -7.828125 5.734375 -7.992188 5.460938 -8.078125 C 5.183594 -8.164062 4.710938 -8.207031 4.042969 -8.207031 L 2.183594 -8.207031 Z M 2.183594 -1.097656 L 4.5 -1.097656 C 4.898438 -1.097656 5.175781 -1.113281 5.339844 -1.140625 C 5.621094 -1.191406 5.859375 -1.277344 6.050781 -1.398438 C 6.242188 -1.515625 6.394531 -1.6875 6.519531 -1.914062 C 6.640625 -2.140625 6.703125 -2.402344 6.703125 -2.699219 C 6.703125 -3.046875 6.613281 -3.347656 6.4375 -3.601562 C 6.257812 -3.859375 6.011719 -4.039062 5.695312 -4.140625 C 5.382812 -4.246094 4.929688 -4.296875 4.335938 -4.296875 L 2.183594 -4.296875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-2">
-<path style="stroke:none;" d="M 0.429688 -3.371094 C 0.429688 -4.617188 0.777344 -5.542969 1.472656 -6.144531 C 2.050781 -6.644531 2.757812 -6.894531 3.59375 -6.894531 C 4.519531 -6.894531 5.277344 -6.589844 5.867188 -5.984375 C 6.453125 -5.375 6.746094 -4.535156 6.746094 -3.464844 C 6.746094 -2.597656 6.617188 -1.914062 6.355469 -1.417969 C 6.097656 -0.921875 5.71875 -0.535156 5.222656 -0.261719 C 4.722656 0.015625 4.179688 0.152344 3.59375 0.152344 C 2.648438 0.152344 1.886719 -0.148438 1.304688 -0.753906 C 0.722656 -1.359375 0.429688 -2.230469 0.429688 -3.371094 Z M 1.605469 -3.371094 C 1.605469 -2.507812 1.792969 -1.859375 2.171875 -1.429688 C 2.546875 -1 3.023438 -0.789062 3.59375 -0.789062 C 4.160156 -0.789062 4.632812 -1.003906 5.007812 -1.433594 C 5.382812 -1.867188 5.574219 -2.523438 5.574219 -3.410156 C 5.574219 -4.242188 5.382812 -4.875 5.003906 -5.304688 C 4.625 -5.734375 4.15625 -5.949219 3.59375 -5.949219 C 3.023438 -5.949219 2.546875 -5.734375 2.171875 -5.304688 C 1.792969 -4.878906 1.605469 -4.234375 1.605469 -3.371094 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-3">
-<path style="stroke:none;" d="M 0.398438 -2.011719 L 1.53125 -2.191406 C 1.59375 -1.738281 1.769531 -1.390625 2.058594 -1.148438 C 2.347656 -0.90625 2.753906 -0.789062 3.273438 -0.789062 C 3.800781 -0.789062 4.1875 -0.894531 4.445312 -1.109375 C 4.699219 -1.320312 4.824219 -1.570312 4.824219 -1.859375 C 4.824219 -2.117188 4.710938 -2.320312 4.488281 -2.46875 C 4.332031 -2.570312 3.941406 -2.699219 3.320312 -2.855469 C 2.480469 -3.066406 1.902344 -3.25 1.578125 -3.40625 C 1.253906 -3.558594 1.007812 -3.773438 0.839844 -4.046875 C 0.671875 -4.320312 0.589844 -4.621094 0.589844 -4.953125 C 0.589844 -5.253906 0.660156 -5.53125 0.796875 -5.785156 C 0.933594 -6.042969 1.121094 -6.253906 1.359375 -6.421875 C 1.535156 -6.554688 1.777344 -6.667969 2.085938 -6.757812 C 2.390625 -6.847656 2.722656 -6.894531 3.070312 -6.894531 C 3.601562 -6.894531 4.066406 -6.816406 4.464844 -6.664062 C 4.867188 -6.511719 5.160156 -6.304688 5.351562 -6.046875 C 5.542969 -5.785156 5.671875 -5.4375 5.746094 -5 L 4.628906 -4.851562 C 4.578125 -5.195312 4.429688 -5.46875 4.1875 -5.664062 C 3.945312 -5.859375 3.597656 -5.953125 3.15625 -5.953125 C 2.628906 -5.953125 2.253906 -5.867188 2.03125 -5.695312 C 1.808594 -5.519531 1.695312 -5.316406 1.695312 -5.085938 C 1.695312 -4.9375 1.742188 -4.804688 1.835938 -4.683594 C 1.929688 -4.5625 2.074219 -4.460938 2.273438 -4.378906 C 2.386719 -4.335938 2.722656 -4.242188 3.28125 -4.085938 C 4.089844 -3.871094 4.652344 -3.695312 4.972656 -3.558594 C 5.292969 -3.421875 5.542969 -3.21875 5.726562 -2.957031 C 5.90625 -2.695312 6 -2.371094 6 -1.980469 C 6 -1.601562 5.886719 -1.242188 5.664062 -0.90625 C 5.441406 -0.570312 5.121094 -0.308594 4.703125 -0.125 C 4.285156 0.0585938 3.8125 0.152344 3.28125 0.152344 C 2.40625 0.152344 1.738281 -0.03125 1.277344 -0.394531 C 0.820312 -0.757812 0.527344 -1.296875 0.398438 -2.011719 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-4">
-<path style="stroke:none;" d="M 3.351562 -1.023438 L 3.515625 -0.0117188 C 3.195312 0.0546875 2.90625 0.0898438 2.652344 0.0898438 C 2.238281 0.0898438 1.917969 0.0234375 1.6875 -0.109375 C 1.460938 -0.238281 1.300781 -0.410156 1.207031 -0.625 C 1.113281 -0.839844 1.066406 -1.289062 1.066406 -1.972656 L 1.066406 -5.851562 L 0.226562 -5.851562 L 0.226562 -6.742188 L 1.066406 -6.742188 L 1.066406 -8.410156 L 2.203125 -9.097656 L 2.203125 -6.742188 L 3.351562 -6.742188 L 3.351562 -5.851562 L 2.203125 -5.851562 L 2.203125 -1.910156 C 2.203125 -1.585938 2.222656 -1.375 2.261719 -1.28125 C 2.304688 -1.1875 2.367188 -1.113281 2.460938 -1.058594 C 2.550781 -1.003906 2.679688 -0.976562 2.851562 -0.976562 C 2.976562 -0.976562 3.144531 -0.992188 3.351562 -1.023438 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-5">
-<path style="stroke:none;" d="M 1.179688 0 L 1.179688 -1.300781 L 2.480469 -1.300781 L 2.480469 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-6">
-<path style="stroke:none;" d="M 1.003906 0 L 1.003906 -9.304688 L 4.511719 -9.304688 C 5.128906 -9.304688 5.601562 -9.277344 5.929688 -9.21875 C 6.386719 -9.140625 6.769531 -8.996094 7.078125 -8.78125 C 7.386719 -8.566406 7.636719 -8.269531 7.824219 -7.882812 C 8.011719 -7.5 8.105469 -7.074219 8.105469 -6.613281 C 8.105469 -5.824219 7.855469 -5.152344 7.351562 -4.605469 C 6.847656 -4.058594 5.9375 -3.78125 4.621094 -3.78125 L 2.234375 -3.78125 L 2.234375 0 Z M 2.234375 -4.882812 L 4.640625 -4.882812 C 5.4375 -4.882812 6 -5.03125 6.335938 -5.324219 C 6.667969 -5.621094 6.835938 -6.039062 6.835938 -6.578125 C 6.835938 -6.964844 6.738281 -7.296875 6.542969 -7.574219 C 6.34375 -7.851562 6.085938 -8.035156 5.765625 -8.125 C 5.558594 -8.179688 5.171875 -8.207031 4.613281 -8.207031 L 2.234375 -8.207031 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-7">
-<path style="stroke:none;" d="M 0.804688 2.597656 L 0.679688 1.523438 C 0.929688 1.589844 1.148438 1.625 1.332031 1.625 C 1.585938 1.625 1.789062 1.582031 1.941406 1.5 C 2.09375 1.414062 2.21875 1.296875 2.316406 1.140625 C 2.390625 1.027344 2.503906 0.746094 2.664062 0.292969 C 2.6875 0.230469 2.722656 0.136719 2.765625 0.0117188 L 0.210938 -6.742188 L 1.441406 -6.742188 L 2.84375 -2.835938 C 3.027344 -2.34375 3.1875 -1.820312 3.332031 -1.277344 C 3.464844 -1.800781 3.621094 -2.3125 3.800781 -2.8125 L 5.242188 -6.742188 L 6.386719 -6.742188 L 3.820312 0.113281 C 3.546875 0.855469 3.332031 1.363281 3.179688 1.644531 C 2.976562 2.019531 2.746094 2.296875 2.480469 2.472656 C 2.21875 2.648438 1.90625 2.734375 1.542969 2.734375 C 1.324219 2.734375 1.078125 2.6875 0.804688 2.597656 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-8">
-<path style="stroke:none;" d="M 0.855469 0 L 0.855469 -9.304688 L 2 -9.304688 L 2 -5.96875 C 2.53125 -6.585938 3.207031 -6.894531 4.019531 -6.894531 C 4.519531 -6.894531 4.953125 -6.796875 5.320312 -6.597656 C 5.6875 -6.402344 5.949219 -6.128906 6.109375 -5.78125 C 6.269531 -5.433594 6.347656 -4.933594 6.347656 -4.273438 L 6.347656 0 L 5.203125 0 L 5.203125 -4.273438 C 5.203125 -4.84375 5.082031 -5.257812 4.832031 -5.519531 C 4.585938 -5.78125 4.234375 -5.910156 3.78125 -5.910156 C 3.445312 -5.910156 3.125 -5.820312 2.828125 -5.644531 C 2.53125 -5.46875 2.316406 -5.234375 2.191406 -4.933594 C 2.0625 -4.632812 2 -4.21875 2 -3.6875 L 2 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-9">
-<path style="stroke:none;" d="M 0.855469 0 L 0.855469 -6.742188 L 1.886719 -6.742188 L 1.886719 -5.78125 C 2.382812 -6.523438 3.09375 -6.894531 4.03125 -6.894531 C 4.4375 -6.894531 4.808594 -6.820312 5.152344 -6.675781 C 5.492188 -6.527344 5.746094 -6.335938 5.914062 -6.101562 C 6.085938 -5.863281 6.203125 -5.582031 6.273438 -5.257812 C 6.3125 -5.046875 6.335938 -4.675781 6.335938 -4.144531 L 6.335938 0 L 5.191406 0 L 5.191406 -4.101562 C 5.191406 -4.566406 5.148438 -4.914062 5.058594 -5.144531 C 4.96875 -5.375 4.8125 -5.558594 4.585938 -5.695312 C 4.359375 -5.835938 4.09375 -5.902344 3.789062 -5.902344 C 3.304688 -5.902344 2.882812 -5.75 2.53125 -5.441406 C 2.175781 -5.132812 2 -4.546875 2 -3.679688 L 2 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-10">
-<path style="stroke:none;" d="M 0.855469 2.582031 L 0.855469 -6.742188 L 1.898438 -6.742188 L 1.898438 -5.867188 C 2.144531 -6.207031 2.421875 -6.464844 2.730469 -6.636719 C 3.039062 -6.808594 3.414062 -6.894531 3.851562 -6.894531 C 4.429688 -6.894531 4.9375 -6.746094 5.375 -6.449219 C 5.816406 -6.152344 6.148438 -5.734375 6.375 -5.195312 C 6.597656 -4.65625 6.710938 -4.066406 6.710938 -3.421875 C 6.710938 -2.730469 6.585938 -2.109375 6.339844 -1.558594 C 6.089844 -1.007812 5.730469 -0.582031 5.257812 -0.289062 C 4.785156 0.00390625 4.289062 0.152344 3.769531 0.152344 C 3.390625 0.152344 3.046875 0.0703125 2.746094 -0.0898438 C 2.441406 -0.25 2.195312 -0.453125 2 -0.699219 L 2 2.582031 Z M 1.890625 -3.332031 C 1.890625 -2.464844 2.066406 -1.824219 2.417969 -1.410156 C 2.769531 -0.996094 3.195312 -0.789062 3.695312 -0.789062 C 4.203125 -0.789062 4.636719 -1 5 -1.429688 C 5.359375 -1.859375 5.542969 -2.527344 5.542969 -3.429688 C 5.542969 -4.289062 5.363281 -4.929688 5.011719 -5.359375 C 4.65625 -5.785156 4.234375 -6 3.746094 -6 C 3.257812 -6 2.828125 -5.769531 2.453125 -5.316406 C 2.078125 -4.859375 1.890625 -4.199219 1.890625 -3.332031 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-11">
-<path style="stroke:none;" d="M 1.910156 0 L 0.851562 0 L 0.851562 -9.304688 L 1.992188 -9.304688 L 1.992188 -5.984375 C 2.476562 -6.589844 3.089844 -6.894531 3.839844 -6.894531 C 4.253906 -6.894531 4.648438 -6.808594 5.019531 -6.644531 C 5.390625 -6.476562 5.691406 -6.242188 5.933594 -5.9375 C 6.171875 -5.636719 6.359375 -5.269531 6.492188 -4.84375 C 6.628906 -4.414062 6.695312 -3.957031 6.695312 -3.472656 C 6.695312 -2.316406 6.410156 -1.425781 5.839844 -0.792969 C 5.269531 -0.164062 4.582031 0.152344 3.78125 0.152344 C 2.988281 0.152344 2.363281 -0.179688 1.910156 -0.84375 Z M 1.898438 -3.421875 C 1.898438 -2.613281 2.007812 -2.027344 2.226562 -1.667969 C 2.585938 -1.082031 3.074219 -0.789062 3.6875 -0.789062 C 4.1875 -0.789062 4.617188 -1.003906 4.984375 -1.4375 C 5.347656 -1.871094 5.527344 -2.519531 5.527344 -3.375 C 5.527344 -4.257812 5.355469 -4.90625 5.003906 -5.324219 C 4.65625 -5.742188 4.234375 -5.953125 3.738281 -5.953125 C 3.238281 -5.953125 2.808594 -5.738281 2.445312 -5.304688 C 2.082031 -4.871094 1.898438 -4.242188 1.898438 -3.421875 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-12">
-<path style="stroke:none;" d="M 0.863281 -7.992188 L 0.863281 -9.304688 L 2.007812 -9.304688 L 2.007812 -7.992188 Z M 0.863281 0 L 0.863281 -6.742188 L 2.007812 -6.742188 L 2.007812 0 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-13">
-<path style="stroke:none;" d="M 5.230469 0 L 5.230469 -0.851562 C 4.804688 -0.183594 4.175781 0.152344 3.34375 0.152344 C 2.808594 0.152344 2.3125 0.00390625 1.863281 -0.292969 C 1.414062 -0.589844 1.0625 -1 0.816406 -1.53125 C 0.570312 -2.0625 0.445312 -2.675781 0.445312 -3.363281 C 0.445312 -4.035156 0.554688 -4.648438 0.78125 -5.195312 C 1.003906 -5.742188 1.339844 -6.164062 1.789062 -6.457031 C 2.238281 -6.75 2.738281 -6.894531 3.292969 -6.894531 C 3.699219 -6.894531 4.0625 -6.808594 4.378906 -6.636719 C 4.695312 -6.464844 4.957031 -6.242188 5.15625 -5.96875 L 5.15625 -9.304688 L 6.289062 -9.304688 L 6.289062 0 Z M 1.617188 -3.363281 C 1.617188 -2.5 1.800781 -1.855469 2.164062 -1.429688 C 2.527344 -1 2.957031 -0.789062 3.453125 -0.789062 C 3.953125 -0.789062 4.375 -0.992188 4.726562 -1.398438 C 5.074219 -1.808594 5.25 -2.429688 5.25 -3.269531 C 5.25 -4.191406 5.070312 -4.867188 4.714844 -5.300781 C 4.359375 -5.730469 3.921875 -5.949219 3.402344 -5.949219 C 2.894531 -5.949219 2.46875 -5.742188 2.128906 -5.324219 C 1.789062 -4.910156 1.617188 -4.257812 1.617188 -3.363281 Z "/>
-</symbol>
-<symbol overflow="visible" id="glyph4-14">
-<path style="stroke:none;" d="M 4.84375 0 L 3.699219 0 L 3.699219 -7.28125 C 3.425781 -7.019531 3.066406 -6.757812 2.617188 -6.492188 C 2.171875 -6.230469 1.769531 -6.035156 1.414062 -5.902344 L 1.414062 -7.007812 C 2.054688 -7.308594 2.613281 -7.671875 3.089844 -8.101562 C 3.570312 -8.527344 3.90625 -8.941406 4.105469 -9.34375 L 4.84375 -9.34375 Z "/>
-</symbol>
-</g>
-<clipPath id="clip1">
- <path d="M 94 19 L 96 19 L 96 215 L 94 215 Z "/>
-</clipPath>
-<clipPath id="clip2">
- <path d="M 204 19 L 206 19 L 206 215 L 204 215 Z "/>
-</clipPath>
-<clipPath id="clip3">
- <path d="M 314 19 L 316 19 L 316 215 L 314 215 Z "/>
-</clipPath>
-<clipPath id="clip4">
- <path d="M 39 171 L 355 171 L 355 173 L 39 173 Z "/>
-</clipPath>
-<clipPath id="clip5">
- <path d="M 39 107 L 355 107 L 355 109 L 39 109 Z "/>
-</clipPath>
-<clipPath id="clip6">
- <path d="M 39 44 L 355 44 L 355 46 L 39 46 Z "/>
-</clipPath>
-</defs>
-<g id="surface18">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 95.160156 214.296875 L 95.160156 19 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 204.84375 214.296875 L 204.84375 19 "/>
-</g>
-<g clip-path="url(#clip3)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 314.53125 214.296875 L 314.53125 19 "/>
-</g>
-<g clip-path="url(#clip4)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 39 171.960938 L 355 171.960938 "/>
-</g>
-<g clip-path="url(#clip5)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 39 108.234375 L 355 108.234375 "/>
-</g>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:0.5;stroke-dasharray:1,2;stroke-miterlimit:3.25;" d="M 39 44.511719 L 355 44.511719 "/>
-</g>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 55.070312 201 C 55.070312 200.183594 54.75 199.402344 54.171875 198.828125 C 53.597656 198.25 52.816406 197.929688 52 197.929688 C 51.183594 197.929688 50.402344 198.25 49.828125 198.828125 C 49.25 199.402344 48.929688 200.183594 48.929688 201 C 48.929688 201.816406 49.25 202.597656 49.828125 203.171875 C 50.402344 203.75 51.183594 204.070312 52 204.070312 C 52.816406 204.070312 53.597656 203.75 54.171875 203.171875 C 54.75 202.597656 55.070312 201.816406 55.070312 201 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 88.070312 176 C 88.070312 175.183594 87.75 174.402344 87.171875 173.828125 C 86.597656 173.25 85.816406 172.929688 85 172.929688 C 84.183594 172.929688 83.402344 173.25 82.828125 173.828125 C 82.25 174.402344 81.929688 175.183594 81.929688 176 C 81.929688 176.816406 82.25 177.597656 82.828125 178.171875 C 83.402344 178.75 84.183594 179.070312 85 179.070312 C 85.816406 179.070312 86.597656 178.75 87.171875 178.171875 C 87.75 177.597656 88.070312 176.816406 88.070312 176 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 121.070312 160 C 121.070312 159.183594 120.75 158.402344 120.171875 157.828125 C 119.597656 157.25 118.816406 156.929688 118 156.929688 C 117.183594 156.929688 116.402344 157.25 115.828125 157.828125 C 115.25 158.402344 114.929688 159.183594 114.929688 160 C 114.929688 160.816406 115.25 161.597656 115.828125 162.171875 C 116.402344 162.75 117.183594 163.070312 118 163.070312 C 118.816406 163.070312 119.597656 162.75 120.171875 162.171875 C 120.75 161.597656 121.070312 160.816406 121.070312 160 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 154.070312 142 C 154.070312 141.183594 153.75 140.402344 153.171875 139.828125 C 152.597656 139.25 151.816406 138.929688 151 138.929688 C 150.183594 138.929688 149.402344 139.25 148.828125 139.828125 C 148.25 140.402344 147.929688 141.183594 147.929688 142 C 147.929688 142.816406 148.25 143.597656 148.828125 144.171875 C 149.402344 144.75 150.183594 145.070312 151 145.070312 C 151.816406 145.070312 152.597656 144.75 153.171875 144.171875 C 153.75 143.597656 154.070312 142.816406 154.070312 142 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 187.070312 124 C 187.070312 123.183594 186.75 122.402344 186.171875 121.828125 C 185.597656 121.25 184.816406 120.929688 184 120.929688 C 183.183594 120.929688 182.402344 121.25 181.828125 121.828125 C 181.25 122.402344 180.929688 123.183594 180.929688 124 C 180.929688 124.816406 181.25 125.597656 181.828125 126.171875 C 182.402344 126.75 183.183594 127.070312 184 127.070312 C 184.816406 127.070312 185.597656 126.75 186.171875 126.171875 C 186.75 125.597656 187.070312 124.816406 187.070312 124 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 220.070312 105 C 220.070312 104.183594 219.75 103.402344 219.171875 102.828125 C 218.597656 102.25 217.816406 101.929688 217 101.929688 C 216.183594 101.929688 215.402344 102.25 214.828125 102.828125 C 214.25 103.402344 213.929688 104.183594 213.929688 105 C 213.929688 105.816406 214.25 106.597656 214.828125 107.171875 C 215.402344 107.75 216.183594 108.070312 217 108.070312 C 217.816406 108.070312 218.597656 107.75 219.171875 107.171875 C 219.75 106.597656 220.070312 105.816406 220.070312 105 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 253.070312 86 C 253.070312 85.183594 252.75 84.402344 252.171875 83.828125 C 251.597656 83.25 250.816406 82.929688 250 82.929688 C 249.183594 82.929688 248.402344 83.25 247.828125 83.828125 C 247.25 84.402344 246.929688 85.183594 246.929688 86 C 246.929688 86.816406 247.25 87.597656 247.828125 88.171875 C 248.402344 88.75 249.183594 89.070312 250 89.070312 C 250.816406 89.070312 251.597656 88.75 252.171875 88.171875 C 252.75 87.597656 253.070312 86.816406 253.070312 86 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 286.070312 67 C 286.070312 66.183594 285.75 65.402344 285.171875 64.828125 C 284.597656 64.25 283.816406 63.929688 283 63.929688 C 282.183594 63.929688 281.402344 64.25 280.828125 64.828125 C 280.25 65.402344 279.929688 66.183594 279.929688 67 C 279.929688 67.816406 280.25 68.597656 280.828125 69.171875 C 281.402344 69.75 282.183594 70.070312 283 70.070312 C 283.816406 70.070312 284.597656 69.75 285.171875 69.171875 C 285.75 68.597656 286.070312 67.816406 286.070312 67 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 319.070312 48 C 319.070312 47.183594 318.75 46.402344 318.171875 45.828125 C 317.597656 45.25 316.816406 44.929688 316 44.929688 C 315.183594 44.929688 314.402344 45.25 313.828125 45.828125 C 313.25 46.402344 312.929688 47.183594 312.929688 48 C 312.929688 48.816406 313.25 49.597656 313.828125 50.171875 C 314.402344 50.75 315.183594 51.070312 316 51.070312 C 316.816406 51.070312 317.597656 50.75 318.171875 50.171875 C 318.75 49.597656 319.070312 48.816406 319.070312 48 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 352.070312 29 C 352.070312 28.183594 351.75 27.402344 351.171875 26.828125 C 350.597656 26.25 349.816406 25.929688 349 25.929688 C 348.183594 25.929688 347.402344 26.25 346.828125 26.828125 C 346.25 27.402344 345.929688 28.183594 345.929688 29 C 345.929688 29.816406 346.25 30.597656 346.828125 31.171875 C 347.402344 31.75 348.183594 32.070312 349 32.070312 C 349.816406 32.070312 350.597656 31.75 351.171875 31.171875 C 351.75 30.597656 352.070312 29.816406 352.070312 29 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 55.070312 191 C 55.070312 190.183594 54.75 189.402344 54.171875 188.828125 C 53.597656 188.25 52.816406 187.929688 52 187.929688 C 51.183594 187.929688 50.402344 188.25 49.828125 188.828125 C 49.25 189.402344 48.929688 190.183594 48.929688 191 C 48.929688 191.816406 49.25 192.597656 49.828125 193.171875 C 50.402344 193.75 51.183594 194.070312 52 194.070312 C 52.816406 194.070312 53.597656 193.75 54.171875 193.171875 C 54.75 192.597656 55.070312 191.816406 55.070312 191 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 88.070312 181 C 88.070312 180.183594 87.75 179.402344 87.171875 178.828125 C 86.597656 178.25 85.816406 177.929688 85 177.929688 C 84.183594 177.929688 83.402344 178.25 82.828125 178.828125 C 82.25 179.402344 81.929688 180.183594 81.929688 181 C 81.929688 181.816406 82.25 182.597656 82.828125 183.171875 C 83.402344 183.75 84.183594 184.070312 85 184.070312 C 85.816406 184.070312 86.597656 183.75 87.171875 183.171875 C 87.75 182.597656 88.070312 181.816406 88.070312 181 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 121.070312 170 C 121.070312 169.183594 120.75 168.402344 120.171875 167.828125 C 119.597656 167.25 118.816406 166.929688 118 166.929688 C 117.183594 166.929688 116.402344 167.25 115.828125 167.828125 C 115.25 168.402344 114.929688 169.183594 114.929688 170 C 114.929688 170.816406 115.25 171.597656 115.828125 172.171875 C 116.402344 172.75 117.183594 173.070312 118 173.070312 C 118.816406 173.070312 119.597656 172.75 120.171875 172.171875 C 120.75 171.597656 121.070312 170.816406 121.070312 170 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 154.070312 157 C 154.070312 156.183594 153.75 155.402344 153.171875 154.828125 C 152.597656 154.25 151.816406 153.929688 151 153.929688 C 150.183594 153.929688 149.402344 154.25 148.828125 154.828125 C 148.25 155.402344 147.929688 156.183594 147.929688 157 C 147.929688 157.816406 148.25 158.597656 148.828125 159.171875 C 149.402344 159.75 150.183594 160.070312 151 160.070312 C 151.816406 160.070312 152.597656 159.75 153.171875 159.171875 C 153.75 158.597656 154.070312 157.816406 154.070312 157 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 187.070312 142 C 187.070312 141.183594 186.75 140.402344 186.171875 139.828125 C 185.597656 139.25 184.816406 138.929688 184 138.929688 C 183.183594 138.929688 182.402344 139.25 181.828125 139.828125 C 181.25 140.402344 180.929688 141.183594 180.929688 142 C 180.929688 142.816406 181.25 143.597656 181.828125 144.171875 C 182.402344 144.75 183.183594 145.070312 184 145.070312 C 184.816406 145.070312 185.597656 144.75 186.171875 144.171875 C 186.75 143.597656 187.070312 142.816406 187.070312 142 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 220.070312 125 C 220.070312 124.183594 219.75 123.402344 219.171875 122.828125 C 218.597656 122.25 217.816406 121.929688 217 121.929688 C 216.183594 121.929688 215.402344 122.25 214.828125 122.828125 C 214.25 123.402344 213.929688 124.183594 213.929688 125 C 213.929688 125.816406 214.25 126.597656 214.828125 127.171875 C 215.402344 127.75 216.183594 128.070312 217 128.070312 C 217.816406 128.070312 218.597656 127.75 219.171875 127.171875 C 219.75 126.597656 220.070312 125.816406 220.070312 125 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 253.070312 107 C 253.070312 106.183594 252.75 105.402344 252.171875 104.828125 C 251.597656 104.25 250.816406 103.929688 250 103.929688 C 249.183594 103.929688 248.402344 104.25 247.828125 104.828125 C 247.25 105.402344 246.929688 106.183594 246.929688 107 C 246.929688 107.816406 247.25 108.597656 247.828125 109.171875 C 248.402344 109.75 249.183594 110.070312 250 110.070312 C 250.816406 110.070312 251.597656 109.75 252.171875 109.171875 C 252.75 108.597656 253.070312 107.816406 253.070312 107 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 286.070312 88 C 286.070312 87.183594 285.75 86.402344 285.171875 85.828125 C 284.597656 85.25 283.816406 84.929688 283 84.929688 C 282.183594 84.929688 281.402344 85.25 280.828125 85.828125 C 280.25 86.402344 279.929688 87.183594 279.929688 88 C 279.929688 88.816406 280.25 89.597656 280.828125 90.171875 C 281.402344 90.75 282.183594 91.070312 283 91.070312 C 283.816406 91.070312 284.597656 90.75 285.171875 90.171875 C 285.75 89.597656 286.070312 88.816406 286.070312 88 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 319.070312 69 C 319.070312 68.183594 318.75 67.402344 318.171875 66.828125 C 317.597656 66.25 316.816406 65.929688 316 65.929688 C 315.183594 65.929688 314.402344 66.25 313.828125 66.828125 C 313.25 67.402344 312.929688 68.183594 312.929688 69 C 312.929688 69.816406 313.25 70.597656 313.828125 71.171875 C 314.402344 71.75 315.183594 72.070312 316 72.070312 C 316.816406 72.070312 317.597656 71.75 318.171875 71.171875 C 318.75 70.597656 319.070312 69.816406 319.070312 69 Z "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 352.070312 50 C 352.070312 49.183594 351.75 48.402344 351.171875 47.828125 C 350.597656 47.25 349.816406 46.929688 349 46.929688 C 348.183594 46.929688 347.402344 47.25 346.828125 47.828125 C 346.25 48.402344 345.929688 49.183594 345.929688 50 C 345.929688 50.816406 346.25 51.597656 346.828125 52.171875 C 347.402344 52.75 348.183594 53.070312 349 53.070312 C 349.816406 53.070312 350.597656 52.75 351.171875 52.171875 C 351.75 51.597656 352.070312 50.816406 352.070312 50 Z "/>
-<path style="fill:none;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 214.296875 L 39 214.296875 "/>
-<path style="fill:none;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 214.296875 L 39 19 "/>
-<path style="fill:none;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 19 L 355 19 "/>
-<path style="fill:none;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 19 L 355 214.296875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 95.160156 214.296875 L 95.160156 211.140625 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="89.659467" y="226.29874"/>
- <use xlink:href="#glyph0-2" x="95.220991" y="226.29874"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 204.84375 214.296875 L 204.84375 211.140625 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="196.345465" y="226.29874"/>
- <use xlink:href="#glyph0-2" x="201.906989" y="226.29874"/>
- <use xlink:href="#glyph0-2" x="207.468512" y="226.29874"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 314.53125 214.296875 L 314.53125 211.140625 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="303.531463" y="226.29874"/>
- <use xlink:href="#glyph0-2" x="309.092987" y="226.29874"/>
- <use xlink:href="#glyph0-2" x="314.65451" y="226.29874"/>
- <use xlink:href="#glyph0-2" x="320.216034" y="226.29874"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 51.511719 214.296875 L 51.511719 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 62.140625 214.296875 L 62.140625 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 70.824219 214.296875 L 70.824219 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 78.167969 214.296875 L 78.167969 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 84.53125 214.296875 L 84.53125 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 90.140625 214.296875 L 90.140625 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 128.179688 214.296875 L 128.179688 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 147.492188 214.296875 L 147.492188 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 161.195312 214.296875 L 161.195312 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 171.828125 214.296875 L 171.828125 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 180.511719 214.296875 L 180.511719 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 187.855469 214.296875 L 187.855469 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 194.214844 214.296875 L 194.214844 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 199.828125 214.296875 L 199.828125 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 237.863281 214.296875 L 237.863281 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 257.179688 214.296875 L 257.179688 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 270.882812 214.296875 L 270.882812 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 281.511719 214.296875 L 281.511719 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 290.199219 214.296875 L 290.199219 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 297.539062 214.296875 L 297.539062 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 303.902344 214.296875 L 303.902344 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 309.511719 214.296875 L 309.511719 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 347.550781 214.296875 L 347.550781 212.71875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 171.960938 L 42.160156 171.960938 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="19" y="176.961688"/>
- <use xlink:href="#glyph0-2" x="24.561523" y="176.961688"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph1-1" x="30" y="172.81325"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 108.234375 L 42.160156 108.234375 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="19" y="113.23603"/>
- <use xlink:href="#glyph0-2" x="24.561523" y="113.23603"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph1-2" x="30" y="109.087593"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 44.511719 L 42.160156 44.511719 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="19" y="49.510373"/>
- <use xlink:href="#glyph0-2" x="24.561523" y="49.510373"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph1-3" x="30" y="45.361936"/>
-</g>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 205.28125 L 40.578125 205.28125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 197.320312 L 40.578125 197.320312 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 191.144531 L 40.578125 191.144531 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 186.097656 L 40.578125 186.097656 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 181.832031 L 40.578125 181.832031 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 178.136719 L 40.578125 178.136719 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 174.878906 L 40.578125 174.878906 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 152.777344 L 40.578125 152.777344 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 141.558594 L 40.578125 141.558594 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 133.59375 L 40.578125 133.59375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 127.417969 L 40.578125 127.417969 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 122.375 L 40.578125 122.375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 118.105469 L 40.578125 118.105469 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 114.410156 L 40.578125 114.410156 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 111.152344 L 40.578125 111.152344 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 89.050781 L 40.578125 89.050781 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 77.832031 L 40.578125 77.832031 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 69.871094 L 40.578125 69.871094 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 63.695312 L 40.578125 63.695312 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 58.648438 L 40.578125 58.648438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 54.382812 L 40.578125 54.382812 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 50.6875 L 40.578125 50.6875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 47.425781 L 40.578125 47.425781 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 39 25.328125 L 40.578125 25.328125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 95.160156 19 L 95.160156 22.160156 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 204.84375 19 L 204.84375 22.160156 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 314.53125 19 L 314.53125 22.160156 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 51.511719 19 L 51.511719 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 62.140625 19 L 62.140625 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 70.824219 19 L 70.824219 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 78.167969 19 L 78.167969 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 84.53125 19 L 84.53125 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 90.140625 19 L 90.140625 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 128.179688 19 L 128.179688 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 147.492188 19 L 147.492188 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 161.195312 19 L 161.195312 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 171.828125 19 L 171.828125 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 180.511719 19 L 180.511719 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 187.855469 19 L 187.855469 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 194.214844 19 L 194.214844 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 199.828125 19 L 199.828125 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 237.863281 19 L 237.863281 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 257.179688 19 L 257.179688 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 270.882812 19 L 270.882812 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 281.511719 19 L 281.511719 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 290.199219 19 L 290.199219 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 297.539062 19 L 297.539062 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 303.902344 19 L 303.902344 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 309.511719 19 L 309.511719 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 347.550781 19 L 347.550781 20.578125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 171.960938 L 351.839844 171.960938 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 108.234375 L 351.839844 108.234375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 44.511719 L 351.839844 44.511719 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 205.28125 L 353.421875 205.28125 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 197.320312 L 353.421875 197.320312 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 191.144531 L 353.421875 191.144531 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 186.097656 L 353.421875 186.097656 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 181.832031 L 353.421875 181.832031 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 178.136719 L 353.421875 178.136719 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 174.878906 L 353.421875 174.878906 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 152.777344 L 353.421875 152.777344 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 141.558594 L 353.421875 141.558594 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 133.59375 L 353.421875 133.59375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 127.417969 L 353.421875 127.417969 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 122.375 L 353.421875 122.375 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 118.105469 L 353.421875 118.105469 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 114.410156 L 353.421875 114.410156 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 111.152344 L 353.421875 111.152344 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 89.050781 L 353.421875 89.050781 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 77.832031 L 353.421875 77.832031 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 69.871094 L 353.421875 69.871094 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 63.695312 L 353.421875 63.695312 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 58.648438 L 353.421875 58.648438 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 54.382812 L 353.421875 54.382812 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 50.6875 L 353.421875 50.6875 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 47.425781 L 353.421875 47.425781 "/>
-<path style="fill:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(39.99939%,39.99939%,39.99939%);stroke-opacity:1;stroke-miterlimit:3.25;" d="M 355 25.328125 L 353.421875 25.328125 "/>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph0-3" x="175.5" y="245.29874"/>
- <use xlink:href="#glyph0-4" x="181.608398" y="245.29874"/>
- <use xlink:href="#glyph0-5" x="187.169922" y="245.29874"/>
- <use xlink:href="#glyph0-6" x="192.731445" y="245.29874"/>
- <use xlink:href="#glyph0-7" x="197.731445" y="245.29874"/>
- <use xlink:href="#glyph0-8" x="200.509766" y="245.29874"/>
- <use xlink:href="#glyph0-9" x="202.731445" y="245.29874"/>
- <use xlink:href="#glyph0-5" x="208.292969" y="245.29874"/>
- <use xlink:href="#glyph0-10" x="213.854492" y="245.29874"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph2-1" x="9" y="129.14937"/>
- <use xlink:href="#glyph2-2" x="9" y="122.479448"/>
- <use xlink:href="#glyph2-3" x="9" y="117.479448"/>
- <use xlink:href="#glyph2-4" x="9" y="114.701128"/>
- <use xlink:href="#glyph2-5" x="9" y="109.139605"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph3-1" x="148" y="12"/>
- <use xlink:href="#glyph3-2" x="155.330078" y="12"/>
- <use xlink:href="#glyph3-3" x="157.996094" y="12"/>
- <use xlink:href="#glyph3-4" x="160.662109" y="12"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph3-5" x="170" y="12"/>
- <use xlink:href="#glyph3-2" x="176" y="12"/>
- <use xlink:href="#glyph3-6" x="178.666016" y="12"/>
- <use xlink:href="#glyph3-4" x="184.666016" y="12"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph3-7" x="194" y="12"/>
- <use xlink:href="#glyph3-8" x="200.673828" y="12"/>
-</g>
-<g style="fill:rgb(39.99939%,39.99939%,39.99939%);fill-opacity:1;">
- <use xlink:href="#glyph3-9" x="207" y="12"/>
- <use xlink:href="#glyph3-7" x="216.996094" y="12"/>
- <use xlink:href="#glyph3-10" x="223.669922" y="12"/>
- <use xlink:href="#glyph3-11" x="230.34375" y="12"/>
- <use xlink:href="#glyph3-3" x="237.017578" y="12"/>
- <use xlink:href="#glyph3-4" x="239.683594" y="12"/>
-</g>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(36.84082%,50.67749%,70.979309%);fill-opacity:1;" d="M 382.148438 113 C 382.148438 112.164062 381.816406 111.363281 381.226562 110.773438 C 380.636719 110.183594 379.835938 109.851562 379 109.851562 C 378.164062 109.851562 377.363281 110.183594 376.773438 110.773438 C 376.183594 111.363281 375.851562 112.164062 375.851562 113 C 375.851562 113.835938 376.183594 114.636719 376.773438 115.226562 C 377.363281 115.816406 378.164062 116.148438 379 116.148438 C 379.835938 116.148438 380.636719 115.816406 381.226562 115.226562 C 381.816406 114.636719 382.148438 113.835938 382.148438 113 Z "/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph4-1" x="391" y="117.28418"/>
- <use xlink:href="#glyph4-2" x="399.670898" y="117.28418"/>
- <use xlink:href="#glyph4-2" x="406.901367" y="117.28418"/>
- <use xlink:href="#glyph4-3" x="414.131836" y="117.28418"/>
- <use xlink:href="#glyph4-4" x="420.631836" y="117.28418"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph4-5" x="424" y="117.28418"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph4-6" x="428" y="117.28418"/>
- <use xlink:href="#glyph4-7" x="436.670898" y="117.28418"/>
- <use xlink:href="#glyph4-4" x="443.170898" y="117.28418"/>
- <use xlink:href="#glyph4-8" x="446.783203" y="117.28418"/>
- <use xlink:href="#glyph4-2" x="454.013672" y="117.28418"/>
- <use xlink:href="#glyph4-9" x="461.244141" y="117.28418"/>
-</g>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.070679%,61.103821%,14.204407%);fill-opacity:1;" d="M 382.148438 136 C 382.148438 135.164062 381.816406 134.363281 381.226562 133.773438 C 380.636719 133.183594 379.835938 132.851562 379 132.851562 C 378.164062 132.851562 377.363281 133.183594 376.773438 133.773438 C 376.183594 134.363281 375.851562 135.164062 375.851562 136 C 375.851562 136.835938 376.183594 137.636719 376.773438 138.226562 C 377.363281 138.816406 378.164062 139.148438 379 139.148438 C 379.835938 139.148438 380.636719 138.816406 381.226562 138.226562 C 381.816406 137.636719 382.148438 136.835938 382.148438 136 Z "/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph4-10" x="391" y="140.28418"/>
- <use xlink:href="#glyph4-7" x="398.230469" y="140.28418"/>
- <use xlink:href="#glyph4-11" x="404.730469" y="140.28418"/>
- <use xlink:href="#glyph4-12" x="411.960938" y="140.28418"/>
- <use xlink:href="#glyph4-9" x="414.849609" y="140.28418"/>
- <use xlink:href="#glyph4-13" x="422.080078" y="140.28418"/>
- <use xlink:href="#glyph4-14" x="429.310547" y="140.28418"/>
- <use xlink:href="#glyph4-14" x="436.541016" y="140.28418"/>
-</g>
-</g>
-</svg>
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/reference.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/reference.rst
deleted file mode 100644
index e3a61afb6b5f3af168bc2956444ac6c34b4ee897..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/reference.rst
+++ /dev/null
@@ -1,117 +0,0 @@
-.. _reference:
-
-.. warning::
-
- Please be advised that the reference documentation discussing pybind11
- internals is currently incomplete. Please refer to the previous sections
- and the pybind11 header files for the nitty gritty details.
-
-Reference
-#########
-
-.. _macros:
-
-Macros
-======
-
-.. doxygendefine:: PYBIND11_MODULE
-
-.. _core_types:
-
-Convenience classes for arbitrary Python types
-==============================================
-
-Common member functions
------------------------
-
-.. doxygenclass:: object_api
- :members:
-
-Without reference counting
---------------------------
-
-.. doxygenclass:: handle
- :members:
-
-With reference counting
------------------------
-
-.. doxygenclass:: object
- :members:
-
-.. doxygenfunction:: reinterpret_borrow
-
-.. doxygenfunction:: reinterpret_steal
-
-Convenience classes for specific Python types
-=============================================
-
-.. doxygenclass:: module_
- :members:
-
-.. doxygengroup:: pytypes
- :members:
-
-.. _extras:
-
-Passing extra arguments to ``def`` or ``class_``
-================================================
-
-.. doxygengroup:: annotations
- :members:
-
-Embedding the interpreter
-=========================
-
-.. doxygendefine:: PYBIND11_EMBEDDED_MODULE
-
-.. doxygenfunction:: initialize_interpreter
-
-.. doxygenfunction:: finalize_interpreter
-
-.. doxygenclass:: scoped_interpreter
-
-Redirecting C++ streams
-=======================
-
-.. doxygenclass:: scoped_ostream_redirect
-
-.. doxygenclass:: scoped_estream_redirect
-
-.. doxygenfunction:: add_ostream_redirect
-
-Python built-in functions
-=========================
-
-.. doxygengroup:: python_builtins
- :members:
-
-Inheritance
-===========
-
-See :doc:`/classes` and :doc:`/advanced/classes` for more detail.
-
-.. doxygendefine:: PYBIND11_OVERRIDE
-
-.. doxygendefine:: PYBIND11_OVERRIDE_PURE
-
-.. doxygendefine:: PYBIND11_OVERRIDE_NAME
-
-.. doxygendefine:: PYBIND11_OVERRIDE_PURE_NAME
-
-.. doxygenfunction:: get_override
-
-Exceptions
-==========
-
-.. doxygenclass:: error_already_set
- :members:
-
-.. doxygenclass:: builtin_exception
- :members:
-
-
-Literals
-========
-
-.. doxygennamespace:: literals
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/release.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/release.rst
deleted file mode 100644
index f73c4ac963f19d9e4f6256317e950643649a07ef..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/release.rst
+++ /dev/null
@@ -1,77 +0,0 @@
-On version numbers
-^^^^^^^^^^^^^^^^^^
-
-The two version numbers (C++ and Python) must match when combined (checked when
-you build the PyPI package), and must be a valid `PEP 440
-<https://www.python.org/dev/peps/pep-0440>`_ version when combined.
-
-For example:
-
-.. code-block:: C++
-
- #define PYBIND11_VERSION_MAJOR X
- #define PYBIND11_VERSION_MINOR Y
- #define PYBIND11_VERSION_PATCH Z.dev1
-
-For beta, ``PYBIND11_VERSION_PATCH`` should be ``Z.b1``. RC's can be ``Z.rc1``.
-Always include the dot (even though PEP 440 allows it to be dropped). For a
-final release, this must be a simple integer.
-
-
-To release a new version of pybind11:
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- Update the version number
- - Update ``PYBIND11_VERSION_MAJOR`` etc. in
- ``include/pybind11/detail/common.h``. PATCH should be a simple integer.
- - Update ``pybind11/_version.py`` (match above)
- - Ensure that all the information in ``setup.py`` is up-to-date.
- - Add release date in ``docs/changelog.rst``.
- - ``git add`` and ``git commit``, ``git push``. **Ensure CI passes**. (If it
- fails due to a known flake issue, either ignore or restart CI.)
-- Add a release branch if this is a new minor version
- - ``git checkout -b vX.Y``, ``git push -u origin vX.Y``
-- Update tags (optional; if you skip this, the GitHub release makes a
- non-annotated tag for you)
- - ``git tag -a vX.Y.Z -m 'vX.Y.Z release'``.
- - ``git push --tags``.
-- Update stable
- - ``git checkout stable``
- - ``git merge master``
- - ``git push``
-- Make a GitHub release (this shows up in the UI, sends new release
- notifications to users watching releases, and also uploads PyPI packages).
- (Note: if you do not use an existing tag, this creates a new lightweight tag
- for you, so you could skip the above step).
- - GUI method: click "Create a new release" on the far right, fill in the tag
- name (if you didn't tag above, it will be made here), fill in a release
- name like "Version X.Y.Z", and optionally copy-and-paste the changelog into
- the description (processed as markdown by Pandoc). Check "pre-release" if
- this is a beta/RC.
- - CLI method: with ``gh`` installed, run ``gh release create vX.Y.Z -t "Version X.Y.Z"``
- If this is a pre-release, add ``-p``.
-
-- Get back to work
- - Make sure you are on master, not somewhere else: ``git checkout master``
- - Update version macros in ``include/pybind11/common.h`` (set PATCH to
- ``0.dev1`` and increment MINOR).
- - Update ``_version.py`` to match
- - Add a plot for in-development updates in ``docs/changelog.rst``.
- - ``git add``, ``git commit``, ``git push``
-
-If a version branch is updated, remember to set PATCH to ``1.dev1``.
-
-
-Manual packaging
-^^^^^^^^^^^^^^^^
-
-If you need to manually upload releases, you can download the releases from the job artifacts and upload them with twine. You can also make the files locally (not recommended in general, as your local directory is more likely to be "dirty" and SDists love picking up random unrelated/hidden files); this is the procedure:
-
-.. code-block:: bash
-
- python3 -m pip install build
- python3 -m build
- PYBIND11_SDIST_GLOBAL=1 python3 -m build
- twine upload dist/*
-
-This makes SDists and wheels, and the final line uploads them.
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/requirements.txt b/3rdParty/pybind11/pybind11-2.6.0/docs/requirements.txt
deleted file mode 100644
index 35366e3c8a8f30b0ad036d0270575877f6efbb4d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-breathe==4.20.0
-commonmark==0.9.1
-recommonmark==0.6.0
-sphinx==3.2.1
-sphinx_rtd_theme==0.5.0
-sphinxcontrib-moderncmakedomain==3.13
-sphinxcontrib-svg2pdfconverter==1.1.0
diff --git a/3rdParty/pybind11/pybind11-2.6.0/docs/upgrade.rst b/3rdParty/pybind11/pybind11-2.6.0/docs/upgrade.rst
deleted file mode 100644
index 87bcebee2c410f9b4ae623a71a9bd10eedf65137..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/docs/upgrade.rst
+++ /dev/null
@@ -1,512 +0,0 @@
-Upgrade guide
-#############
-
-This is a companion guide to the :doc:`changelog`. While the changelog briefly
-lists all of the new features, improvements and bug fixes, this upgrade guide
-focuses only the subset which directly impacts your experience when upgrading
-to a new version. But it goes into more detail. This includes things like
-deprecated APIs and their replacements, build system changes, general code
-modernization and other useful information.
-
-.. _upgrade-guide-2.6:
-
-v2.6
-====
-
-Usage of the ``PYBIND11_OVERLOAD*`` macros and ``get_overload`` function should
-be replaced by ``PYBIND11_OVERRIDE*`` and ``get_override``. In the future, the
-old macros may be deprecated and removed.
-
-``py::module`` has been renamed ``py::module_``, but a backward compatible
-typedef has been included. This change was to avoid a language change in C++20
-that requires unqualified ``module`` not be placed at the start of a logical
-line. Qualified usage is unaffected and the typedef will remain unless the
-C++ language rules change again.
-
-The public constructors of ``py::module_`` have been deprecated. Use
-``PYBIND11_MODULE`` or ``module_::create_extension_module`` instead.
-
-An error is now thrown when ``__init__`` is forgotten on subclasses. This was
-incorrect before, but was not checked. Add a call to ``__init__`` if it is
-missing.
-
-A ``py::type_error`` is now thrown when casting to a subclass (like
-``py::bytes`` from ``py::object``) if the conversion is not valid. Make a valid
-conversion instead.
-
-The undocumented ``h.get_type()`` method has been deprecated and replaced by
-``py::type::of(h)``.
-
-Enums now have a ``__str__`` method pre-defined; if you want to override it,
-the simplest fix is to add the new ``py::prepend()`` tag when defining
-``"__str__"``.
-
-If ``__eq__`` defined but not ``__hash__``, ``__hash__`` is now set to
-``None``, as in normal CPython. You should add ``__hash__`` if you intended the
-class to be hashable, possibly using the new ``py::hash`` shortcut.
-
-The constructors for ``py::array`` now always take signed integers for size,
-for consistency. This may lead to compiler warnings on some systems. Cast to
-``py::ssize_t`` instead of ``std::size_t``.
-
-The ``tools/clang`` submodule and ``tools/mkdoc.py`` have been moved to a
-standalone package, `pybind11-mkdoc`_. If you were using those tools, please
-use them via a pip install from the new location.
-
-The ``pybind11`` package on PyPI no longer fills the wheel "headers" slot - if
-you were using the headers from this slot, they are available by requesting the
-``global`` extra, that is, ``pip install "pybind11[global]"``. (Most users will
-be unaffected, as the ``pybind11/include`` location is reported by ``python -m
-pybind11 --includes`` and ``pybind11.get_include()`` is still correct and has
-not changed since 2.5).
-
-.. _pybind11-mkdoc: https://github.com/pybind/pybind11-mkdoc
-
-CMake support:
---------------
-
-The minimum required version of CMake is now 3.4. Several details of the CMake
-support have been deprecated; warnings will be shown if you need to change
-something. The changes are:
-
-* ``PYBIND11_CPP_STANDARD=<platform-flag>`` is deprecated, please use
- ``CMAKE_CXX_STANDARD=<number>`` instead, or any other valid CMake CXX or CUDA
- standard selection method, like ``target_compile_features``.
-
-* If you do not request a standard, pybind11 targets will compile with the
- compiler default, but not less than C++11, instead of forcing C++14 always.
- If you depend on the old behavior, please use ``set(CMAKE_CXX_STANDARD 14 CACHE STRING "")``
- instead.
-
-* Direct ``pybind11::module`` usage should always be accompanied by at least
- ``set(CMAKE_CXX_VISIBILITY_PRESET hidden)`` or similar - it used to try to
- manually force this compiler flag (but not correctly on all compilers or with
- CUDA).
-
-* ``pybind11_add_module``'s ``SYSTEM`` argument is deprecated and does nothing;
- linking now behaves like other imported libraries consistently in both
- config and submodule mode, and behaves like a ``SYSTEM`` library by
- default.
-
-* If ``PYTHON_EXECUTABLE`` is not set, virtual environments (``venv``,
- ``virtualenv``, and ``conda``) are prioritized over the standard search
- (similar to the new FindPython mode).
-
-In addition, the following changes may be of interest:
-
-* ``CMAKE_INTERPROCEDURAL_OPTIMIZATION`` will be respected by
- ``pybind11_add_module`` if set instead of linking to ``pybind11::lto`` or
- ``pybind11::thin_lto``.
-
-* Using ``find_package(Python COMPONENTS Interpreter Development)`` before
- pybind11 will cause pybind11 to use the new Python mechanisms instead of its
- own custom search, based on a patched version of classic ``FindPythonInterp``
- / ``FindPythonLibs``. In the future, this may become the default. A recent
- (3.15+ or 3.18.2+) version of CMake is recommended.
-
-
-
-v2.5
-====
-
-The Python package now includes the headers as data in the package itself, as
-well as in the "headers" wheel slot. ``pybind11 --includes`` and
-``pybind11.get_include()`` report the new location, which is always correct
-regardless of how pybind11 was installed, making the old ``user=`` argument
-meaningless. If you are not using the function to get the location already, you
-are encouraged to switch to the package location.
-
-
-v2.2
-====
-
-Deprecation of the ``PYBIND11_PLUGIN`` macro
---------------------------------------------
-
-``PYBIND11_MODULE`` is now the preferred way to create module entry points.
-The old macro emits a compile-time deprecation warning.
-
-.. code-block:: cpp
-
- // old
- PYBIND11_PLUGIN(example) {
- py::module m("example", "documentation string");
-
- m.def("add", [](int a, int b) { return a + b; });
-
- return m.ptr();
- }
-
- // new
- PYBIND11_MODULE(example, m) {
- m.doc() = "documentation string"; // optional
-
- m.def("add", [](int a, int b) { return a + b; });
- }
-
-
-New API for defining custom constructors and pickling functions
----------------------------------------------------------------
-
-The old placement-new custom constructors have been deprecated. The new approach
-uses ``py::init()`` and factory functions to greatly improve type safety.
-
-Placement-new can be called accidentally with an incompatible type (without any
-compiler errors or warnings), or it can initialize the same object multiple times
-if not careful with the Python-side ``__init__`` calls. The new-style custom
-constructors prevent such mistakes. See :ref:`custom_constructors` for details.
-
-.. code-block:: cpp
-
- // old -- deprecated (runtime warning shown only in debug mode)
- py::class<Foo>(m, "Foo")
- .def("__init__", [](Foo &self, ...) {
- new (&self) Foo(...); // uses placement-new
- });
-
- // new
- py::class<Foo>(m, "Foo")
- .def(py::init([](...) { // Note: no `self` argument
- return new Foo(...); // return by raw pointer
- // or: return std::make_unique<Foo>(...); // return by holder
- // or: return Foo(...); // return by value (move constructor)
- }));
-
-Mirroring the custom constructor changes, ``py::pickle()`` is now the preferred
-way to get and set object state. See :ref:`pickling` for details.
-
-.. code-block:: cpp
-
- // old -- deprecated (runtime warning shown only in debug mode)
- py::class<Foo>(m, "Foo")
- ...
- .def("__getstate__", [](const Foo &self) {
- return py::make_tuple(self.value1(), self.value2(), ...);
- })
- .def("__setstate__", [](Foo &self, py::tuple t) {
- new (&self) Foo(t[0].cast<std::string>(), ...);
- });
-
- // new
- py::class<Foo>(m, "Foo")
- ...
- .def(py::pickle(
- [](const Foo &self) { // __getstate__
- return py::make_tuple(f.value1(), f.value2(), ...); // unchanged
- },
- [](py::tuple t) { // __setstate__, note: no `self` argument
- return new Foo(t[0].cast<std::string>(), ...);
- // or: return std::make_unique<Foo>(...); // return by holder
- // or: return Foo(...); // return by value (move constructor)
- }
- ));
-
-For both the constructors and pickling, warnings are shown at module
-initialization time (on import, not when the functions are called).
-They're only visible when compiled in debug mode. Sample warning:
-
-.. code-block:: none
-
- pybind11-bound class 'mymodule.Foo' is using an old-style placement-new '__init__'
- which has been deprecated. See the upgrade guide in pybind11's docs.
-
-
-Stricter enforcement of hidden symbol visibility for pybind11 modules
----------------------------------------------------------------------
-
-pybind11 now tries to actively enforce hidden symbol visibility for modules.
-If you're using either one of pybind11's :doc:`CMake or Python build systems
-<compiling>` (the two example repositories) and you haven't been exporting any
-symbols, there's nothing to be concerned about. All the changes have been done
-transparently in the background. If you were building manually or relied on
-specific default visibility, read on.
-
-Setting default symbol visibility to *hidden* has always been recommended for
-pybind11 (see :ref:`faq:symhidden`). On Linux and macOS, hidden symbol
-visibility (in conjunction with the ``strip`` utility) yields much smaller
-module binaries. `CPython's extension docs`_ also recommend hiding symbols
-by default, with the goal of avoiding symbol name clashes between modules.
-Starting with v2.2, pybind11 enforces this more strictly: (1) by declaring
-all symbols inside the ``pybind11`` namespace as hidden and (2) by including
-the ``-fvisibility=hidden`` flag on Linux and macOS (only for extension
-modules, not for embedding the interpreter).
-
-.. _CPython's extension docs: https://docs.python.org/3/extending/extending.html#providing-a-c-api-for-an-extension-module
-
-The namespace-scope hidden visibility is done automatically in pybind11's
-headers and it's generally transparent to users. It ensures that:
-
-* Modules compiled with different pybind11 versions don't clash with each other.
-
-* Some new features, like ``py::module_local`` bindings, can work as intended.
-
-The ``-fvisibility=hidden`` flag applies the same visibility to user bindings
-outside of the ``pybind11`` namespace. It's now set automatic by pybind11's
-CMake and Python build systems, but this needs to be done manually by users
-of other build systems. Adding this flag:
-
-* Minimizes the chances of symbol conflicts between modules. E.g. if two
- unrelated modules were statically linked to different (ABI-incompatible)
- versions of the same third-party library, a symbol clash would be likely
- (and would end with unpredictable results).
-
-* Produces smaller binaries on Linux and macOS, as pointed out previously.
-
-Within pybind11's CMake build system, ``pybind11_add_module`` has always been
-setting the ``-fvisibility=hidden`` flag in release mode. From now on, it's
-being applied unconditionally, even in debug mode and it can no longer be opted
-out of with the ``NO_EXTRAS`` option. The ``pybind11::module`` target now also
-adds this flag to it's interface. The ``pybind11::embed`` target is unchanged.
-
-The most significant change here is for the ``pybind11::module`` target. If you
-were previously relying on default visibility, i.e. if your Python module was
-doubling as a shared library with dependents, you'll need to either export
-symbols manually (recommended for cross-platform libraries) or factor out the
-shared library (and have the Python module link to it like the other
-dependents). As a temporary workaround, you can also restore default visibility
-using the CMake code below, but this is not recommended in the long run:
-
-.. code-block:: cmake
-
- target_link_libraries(mymodule PRIVATE pybind11::module)
-
- add_library(restore_default_visibility INTERFACE)
- target_compile_options(restore_default_visibility INTERFACE -fvisibility=default)
- target_link_libraries(mymodule PRIVATE restore_default_visibility)
-
-
-Local STL container bindings
-----------------------------
-
-Previous pybind11 versions could only bind types globally -- all pybind11
-modules, even unrelated ones, would have access to the same exported types.
-However, this would also result in a conflict if two modules exported the
-same C++ type, which is especially problematic for very common types, e.g.
-``std::vector<int>``. :ref:`module_local` were added to resolve this (see
-that section for a complete usage guide).
-
-``py::class_`` still defaults to global bindings (because these types are
-usually unique across modules), however in order to avoid clashes of opaque
-types, ``py::bind_vector`` and ``py::bind_map`` will now bind STL containers
-as ``py::module_local`` if their elements are: builtins (``int``, ``float``,
-etc.), not bound using ``py::class_``, or bound as ``py::module_local``. For
-example, this change allows multiple modules to bind ``std::vector<int>``
-without causing conflicts. See :ref:`stl_bind` for more details.
-
-When upgrading to this version, if you have multiple modules which depend on
-a single global binding of an STL container, note that all modules can still
-accept foreign ``py::module_local`` types in the direction of Python-to-C++.
-The locality only affects the C++-to-Python direction. If this is needed in
-multiple modules, you'll need to either:
-
-* Add a copy of the same STL binding to all of the modules which need it.
-
-* Restore the global status of that single binding by marking it
- ``py::module_local(false)``.
-
-The latter is an easy workaround, but in the long run it would be best to
-localize all common type bindings in order to avoid conflicts with
-third-party modules.
-
-
-Negative strides for Python buffer objects and numpy arrays
------------------------------------------------------------
-
-Support for negative strides required changing the integer type from unsigned
-to signed in the interfaces of ``py::buffer_info`` and ``py::array``. If you
-have compiler warnings enabled, you may notice some new conversion warnings
-after upgrading. These can be resolved using ``static_cast``.
-
-
-Deprecation of some ``py::object`` APIs
----------------------------------------
-
-To compare ``py::object`` instances by pointer, you should now use
-``obj1.is(obj2)`` which is equivalent to ``obj1 is obj2`` in Python.
-Previously, pybind11 used ``operator==`` for this (``obj1 == obj2``), but
-that could be confusing and is now deprecated (so that it can eventually
-be replaced with proper rich object comparison in a future release).
-
-For classes which inherit from ``py::object``, ``borrowed`` and ``stolen``
-were previously available as protected constructor tags. Now the types
-should be used directly instead: ``borrowed_t{}`` and ``stolen_t{}``
-(`#771 <https://github.com/pybind/pybind11/pull/771>`_).
-
-
-Stricter compile-time error checking
-------------------------------------
-
-Some error checks have been moved from run time to compile time. Notably,
-automatic conversion of ``std::shared_ptr<T>`` is not possible when ``T`` is
-not directly registered with ``py::class_<T>`` (e.g. ``std::shared_ptr<int>``
-or ``std::shared_ptr<std::vector<T>>`` are not automatically convertible).
-Attempting to bind a function with such arguments now results in a compile-time
-error instead of waiting to fail at run time.
-
-``py::init<...>()`` constructor definitions are also stricter and now prevent
-bindings which could cause unexpected behavior:
-
-.. code-block:: cpp
-
- struct Example {
- Example(int &);
- };
-
- py::class_<Example>(m, "Example")
- .def(py::init<int &>()); // OK, exact match
- // .def(py::init<int>()); // compile-time error, mismatch
-
-A non-``const`` lvalue reference is not allowed to bind to an rvalue. However,
-note that a constructor taking ``const T &`` can still be registered using
-``py::init<T>()`` because a ``const`` lvalue reference can bind to an rvalue.
-
-v2.1
-====
-
-Minimum compiler versions are enforced at compile time
-------------------------------------------------------
-
-The minimums also apply to v2.0 but the check is now explicit and a compile-time
-error is raised if the compiler does not meet the requirements:
-
-* GCC >= 4.8
-* clang >= 3.3 (appleclang >= 5.0)
-* MSVC >= 2015u3
-* Intel C++ >= 15.0
-
-
-The ``py::metaclass`` attribute is not required for static properties
----------------------------------------------------------------------
-
-Binding classes with static properties is now possible by default. The
-zero-parameter version of ``py::metaclass()`` is deprecated. However, a new
-one-parameter ``py::metaclass(python_type)`` version was added for rare
-cases when a custom metaclass is needed to override pybind11's default.
-
-.. code-block:: cpp
-
- // old -- emits a deprecation warning
- py::class_<Foo>(m, "Foo", py::metaclass())
- .def_property_readonly_static("foo", ...);
-
- // new -- static properties work without the attribute
- py::class_<Foo>(m, "Foo")
- .def_property_readonly_static("foo", ...);
-
- // new -- advanced feature, override pybind11's default metaclass
- py::class_<Bar>(m, "Bar", py::metaclass(custom_python_type))
- ...
-
-
-v2.0
-====
-
-Breaking changes in ``py::class_``
-----------------------------------
-
-These changes were necessary to make type definitions in pybind11
-future-proof, to support PyPy via its ``cpyext`` mechanism (`#527
-<https://github.com/pybind/pybind11/pull/527>`_), and to improve efficiency
-(`rev. 86d825 <https://github.com/pybind/pybind11/commit/86d825>`_).
-
-1. Declarations of types that provide access via the buffer protocol must
- now include the ``py::buffer_protocol()`` annotation as an argument to
- the ``py::class_`` constructor.
-
- .. code-block:: cpp
-
- py::class_<Matrix>("Matrix", py::buffer_protocol())
- .def(py::init<...>())
- .def_buffer(...);
-
-2. Classes which include static properties (e.g. ``def_readwrite_static()``)
- must now include the ``py::metaclass()`` attribute. Note: this requirement
- has since been removed in v2.1. If you're upgrading from 1.x, it's
- recommended to skip directly to v2.1 or newer.
-
-3. This version of pybind11 uses a redesigned mechanism for instantiating
- trampoline classes that are used to override virtual methods from within
- Python. This led to the following user-visible syntax change:
-
- .. code-block:: cpp
-
- // old v1.x syntax
- py::class_<TrampolineClass>("MyClass")
- .alias<MyClass>()
- ...
-
- // new v2.x syntax
- py::class_<MyClass, TrampolineClass>("MyClass")
- ...
-
- Importantly, both the original and the trampoline class are now specified
- as arguments to the ``py::class_`` template, and the ``alias<..>()`` call
- is gone. The new scheme has zero overhead in cases when Python doesn't
- override any functions of the underlying C++ class.
- `rev. 86d825 <https://github.com/pybind/pybind11/commit/86d825>`_.
-
- The class type must be the first template argument given to ``py::class_``
- while the trampoline can be mixed in arbitrary order with other arguments
- (see the following section).
-
-
-Deprecation of the ``py::base<T>()`` attribute
-----------------------------------------------
-
-``py::base<T>()`` was deprecated in favor of specifying ``T`` as a template
-argument to ``py::class_``. This new syntax also supports multiple inheritance.
-Note that, while the type being exported must be the first argument in the
-``py::class_<Class, ...>`` template, the order of the following types (bases,
-holder and/or trampoline) is not important.
-
-.. code-block:: cpp
-
- // old v1.x
- py::class_<Derived>("Derived", py::base<Base>());
-
- // new v2.x
- py::class_<Derived, Base>("Derived");
-
- // new -- multiple inheritance
- py::class_<Derived, Base1, Base2>("Derived");
-
- // new -- apart from `Derived` the argument order can be arbitrary
- py::class_<Derived, Base1, Holder, Base2, Trampoline>("Derived");
-
-
-Out-of-the-box support for ``std::shared_ptr``
-----------------------------------------------
-
-The relevant type caster is now built in, so it's no longer necessary to
-include a declaration of the form:
-
-.. code-block:: cpp
-
- PYBIND11_DECLARE_HOLDER_TYPE(T, std::shared_ptr<T>)
-
-Continuing to do so won’t cause an error or even a deprecation warning,
-but it's completely redundant.
-
-
-Deprecation of a few ``py::object`` APIs
-----------------------------------------
-
-All of the old-style calls emit deprecation warnings.
-
-+---------------------------------------+---------------------------------------------+
-| Old syntax | New syntax |
-+=======================================+=============================================+
-| ``obj.call(args...)`` | ``obj(args...)`` |
-+---------------------------------------+---------------------------------------------+
-| ``obj.str()`` | ``py::str(obj)`` |
-+---------------------------------------+---------------------------------------------+
-| ``auto l = py::list(obj); l.check()`` | ``py::isinstance<py::list>(obj)`` |
-+---------------------------------------+---------------------------------------------+
-| ``py::object(ptr, true)`` | ``py::reinterpret_borrow<py::object>(ptr)`` |
-+---------------------------------------+---------------------------------------------+
-| ``py::object(ptr, false)`` | ``py::reinterpret_steal<py::object>(ptr)`` |
-+---------------------------------------+---------------------------------------------+
-| ``if (obj.attr("foo"))`` | ``if (py::hasattr(obj, "foo"))`` |
-+---------------------------------------+---------------------------------------------+
-| ``if (obj["bar"])`` | ``if (obj.contains("bar"))`` |
-+---------------------------------------+---------------------------------------------+
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/attr.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/attr.h
deleted file mode 100644
index 0c416709260e9f53f585a57ccb3ce3267d62a6e1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/attr.h
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
- pybind11/attr.h: Infrastructure for processing custom
- type and function attributes
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "cast.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-/// \addtogroup annotations
-/// @{
-
-/// Annotation for methods
-struct is_method { handle class_; is_method(const handle &c) : class_(c) { } };
-
-/// Annotation for operators
-struct is_operator { };
-
-/// Annotation for classes that cannot be subclassed
-struct is_final { };
-
-/// Annotation for parent scope
-struct scope { handle value; scope(const handle &s) : value(s) { } };
-
-/// Annotation for documentation
-struct doc { const char *value; doc(const char *value) : value(value) { } };
-
-/// Annotation for function names
-struct name { const char *value; name(const char *value) : value(value) { } };
-
-/// Annotation indicating that a function is an overload associated with a given "sibling"
-struct sibling { handle value; sibling(const handle &value) : value(value.ptr()) { } };
-
-/// Annotation indicating that a class derives from another given type
-template <typename T> struct base {
-
- PYBIND11_DEPRECATED("base<T>() was deprecated in favor of specifying 'T' as a template argument to class_")
- base() { } // NOLINT(modernize-use-equals-default): breaks MSVC 2015 when adding an attribute
-};
-
-/// Keep patient alive while nurse lives
-template <size_t Nurse, size_t Patient> struct keep_alive { };
-
-/// Annotation indicating that a class is involved in a multiple inheritance relationship
-struct multiple_inheritance { };
-
-/// Annotation which enables dynamic attributes, i.e. adds `__dict__` to a class
-struct dynamic_attr { };
-
-/// Annotation which enables the buffer protocol for a type
-struct buffer_protocol { };
-
-/// Annotation which requests that a special metaclass is created for a type
-struct metaclass {
- handle value;
-
- PYBIND11_DEPRECATED("py::metaclass() is no longer required. It's turned on by default now.")
- metaclass() { } // NOLINT(modernize-use-equals-default): breaks MSVC 2015 when adding an attribute
-
- /// Override pybind11's default metaclass
- explicit metaclass(handle value) : value(value) { }
-};
-
-/// Annotation that marks a class as local to the module:
-struct module_local { const bool value; constexpr module_local(bool v = true) : value(v) { } };
-
-/// Annotation to mark enums as an arithmetic type
-struct arithmetic { };
-
-/// Mark a function for addition at the beginning of the existing overload chain instead of the end
-struct prepend { };
-
-/** \rst
- A call policy which places one or more guard variables (``Ts...``) around the function call.
-
- For example, this definition:
-
- .. code-block:: cpp
-
- m.def("foo", foo, py::call_guard<T>());
-
- is equivalent to the following pseudocode:
-
- .. code-block:: cpp
-
- m.def("foo", [](args...) {
- T scope_guard;
- return foo(args...); // forwarded arguments
- });
- \endrst */
-template <typename... Ts> struct call_guard;
-
-template <> struct call_guard<> { using type = detail::void_type; };
-
-template <typename T>
-struct call_guard<T> {
- static_assert(std::is_default_constructible<T>::value,
- "The guard type must be default constructible");
-
- using type = T;
-};
-
-template <typename T, typename... Ts>
-struct call_guard<T, Ts...> {
- struct type {
- T guard{}; // Compose multiple guard types with left-to-right default-constructor order
- typename call_guard<Ts...>::type next{};
- };
-};
-
-/// @} annotations
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-/* Forward declarations */
-enum op_id : int;
-enum op_type : int;
-struct undefined_t;
-template <op_id id, op_type ot, typename L = undefined_t, typename R = undefined_t> struct op_;
-inline void keep_alive_impl(size_t Nurse, size_t Patient, function_call &call, handle ret);
-
-/// Internal data structure which holds metadata about a keyword argument
-struct argument_record {
- const char *name; ///< Argument name
- const char *descr; ///< Human-readable version of the argument value
- handle value; ///< Associated Python object
- bool convert : 1; ///< True if the argument is allowed to convert when loading
- bool none : 1; ///< True if None is allowed when loading
-
- argument_record(const char *name, const char *descr, handle value, bool convert, bool none)
- : name(name), descr(descr), value(value), convert(convert), none(none) { }
-};
-
-/// Internal data structure which holds metadata about a bound function (signature, overloads, etc.)
-struct function_record {
- function_record()
- : is_constructor(false), is_new_style_constructor(false), is_stateless(false),
- is_operator(false), is_method(false), has_args(false),
- has_kwargs(false), has_kw_only_args(false), prepend(false) { }
-
- /// Function name
- char *name = nullptr; /* why no C++ strings? They generate heavier code.. */
-
- // User-specified documentation string
- char *doc = nullptr;
-
- /// Human-readable version of the function signature
- char *signature = nullptr;
-
- /// List of registered keyword arguments
- std::vector<argument_record> args;
-
- /// Pointer to lambda function which converts arguments and performs the actual call
- handle (*impl) (function_call &) = nullptr;
-
- /// Storage for the wrapped function pointer and captured data, if any
- void *data[3] = { };
-
- /// Pointer to custom destructor for 'data' (if needed)
- void (*free_data) (function_record *ptr) = nullptr;
-
- /// Return value policy associated with this function
- return_value_policy policy = return_value_policy::automatic;
-
- /// True if name == '__init__'
- bool is_constructor : 1;
-
- /// True if this is a new-style `__init__` defined in `detail/init.h`
- bool is_new_style_constructor : 1;
-
- /// True if this is a stateless function pointer
- bool is_stateless : 1;
-
- /// True if this is an operator (__add__), etc.
- bool is_operator : 1;
-
- /// True if this is a method
- bool is_method : 1;
-
- /// True if the function has a '*args' argument
- bool has_args : 1;
-
- /// True if the function has a '**kwargs' argument
- bool has_kwargs : 1;
-
- /// True once a 'py::kw_only' is encountered (any following args are keyword-only)
- bool has_kw_only_args : 1;
-
- /// True if this function is to be inserted at the beginning of the overload resolution chain
- bool prepend : 1;
-
- /// Number of arguments (including py::args and/or py::kwargs, if present)
- std::uint16_t nargs;
-
- /// Number of trailing arguments (counted in `nargs`) that are keyword-only
- std::uint16_t nargs_kw_only = 0;
-
- /// Number of leading arguments (counted in `nargs`) that are positional-only
- std::uint16_t nargs_pos_only = 0;
-
- /// Python method object
- PyMethodDef *def = nullptr;
-
- /// Python handle to the parent scope (a class or a module)
- handle scope;
-
- /// Python handle to the sibling function representing an overload chain
- handle sibling;
-
- /// Pointer to next overload
- function_record *next = nullptr;
-};
-
-/// Special data structure which (temporarily) holds metadata about a bound class
-struct type_record {
- PYBIND11_NOINLINE type_record()
- : multiple_inheritance(false), dynamic_attr(false), buffer_protocol(false),
- default_holder(true), module_local(false), is_final(false) { }
-
- /// Handle to the parent scope
- handle scope;
-
- /// Name of the class
- const char *name = nullptr;
-
- // Pointer to RTTI type_info data structure
- const std::type_info *type = nullptr;
-
- /// How large is the underlying C++ type?
- size_t type_size = 0;
-
- /// What is the alignment of the underlying C++ type?
- size_t type_align = 0;
-
- /// How large is the type's holder?
- size_t holder_size = 0;
-
- /// The global operator new can be overridden with a class-specific variant
- void *(*operator_new)(size_t) = nullptr;
-
- /// Function pointer to class_<..>::init_instance
- void (*init_instance)(instance *, const void *) = nullptr;
-
- /// Function pointer to class_<..>::dealloc
- void (*dealloc)(detail::value_and_holder &) = nullptr;
-
- /// List of base classes of the newly created type
- list bases;
-
- /// Optional docstring
- const char *doc = nullptr;
-
- /// Custom metaclass (optional)
- handle metaclass;
-
- /// Multiple inheritance marker
- bool multiple_inheritance : 1;
-
- /// Does the class manage a __dict__?
- bool dynamic_attr : 1;
-
- /// Does the class implement the buffer protocol?
- bool buffer_protocol : 1;
-
- /// Is the default (unique_ptr) holder type used?
- bool default_holder : 1;
-
- /// Is the class definition local to the module shared object?
- bool module_local : 1;
-
- /// Is the class inheritable from python classes?
- bool is_final : 1;
-
- PYBIND11_NOINLINE void add_base(const std::type_info &base, void *(*caster)(void *)) {
- auto base_info = detail::get_type_info(base, false);
- if (!base_info) {
- std::string tname(base.name());
- detail::clean_type_id(tname);
- pybind11_fail("generic_type: type \"" + std::string(name) +
- "\" referenced unknown base type \"" + tname + "\"");
- }
-
- if (default_holder != base_info->default_holder) {
- std::string tname(base.name());
- detail::clean_type_id(tname);
- pybind11_fail("generic_type: type \"" + std::string(name) + "\" " +
- (default_holder ? "does not have" : "has") +
- " a non-default holder type while its base \"" + tname + "\" " +
- (base_info->default_holder ? "does not" : "does"));
- }
-
- bases.append((PyObject *) base_info->type);
-
- if (base_info->type->tp_dictoffset != 0)
- dynamic_attr = true;
-
- if (caster)
- base_info->implicit_casts.emplace_back(type, caster);
- }
-};
-
-inline function_call::function_call(const function_record &f, handle p) :
- func(f), parent(p) {
- args.reserve(f.nargs);
- args_convert.reserve(f.nargs);
-}
-
-/// Tag for a new-style `__init__` defined in `detail/init.h`
-struct is_new_style_constructor { };
-
-/**
- * Partial template specializations to process custom attributes provided to
- * cpp_function_ and class_. These are either used to initialize the respective
- * fields in the type_record and function_record data structures or executed at
- * runtime to deal with custom call policies (e.g. keep_alive).
- */
-template <typename T, typename SFINAE = void> struct process_attribute;
-
-template <typename T> struct process_attribute_default {
- /// Default implementation: do nothing
- static void init(const T &, function_record *) { }
- static void init(const T &, type_record *) { }
- static void precall(function_call &) { }
- static void postcall(function_call &, handle) { }
-};
-
-/// Process an attribute specifying the function's name
-template <> struct process_attribute<name> : process_attribute_default<name> {
- static void init(const name &n, function_record *r) { r->name = const_cast<char *>(n.value); }
-};
-
-/// Process an attribute specifying the function's docstring
-template <> struct process_attribute<doc> : process_attribute_default<doc> {
- static void init(const doc &n, function_record *r) { r->doc = const_cast<char *>(n.value); }
-};
-
-/// Process an attribute specifying the function's docstring (provided as a C-style string)
-template <> struct process_attribute<const char *> : process_attribute_default<const char *> {
- static void init(const char *d, function_record *r) { r->doc = const_cast<char *>(d); }
- static void init(const char *d, type_record *r) { r->doc = const_cast<char *>(d); }
-};
-template <> struct process_attribute<char *> : process_attribute<const char *> { };
-
-/// Process an attribute indicating the function's return value policy
-template <> struct process_attribute<return_value_policy> : process_attribute_default<return_value_policy> {
- static void init(const return_value_policy &p, function_record *r) { r->policy = p; }
-};
-
-/// Process an attribute which indicates that this is an overloaded function associated with a given sibling
-template <> struct process_attribute<sibling> : process_attribute_default<sibling> {
- static void init(const sibling &s, function_record *r) { r->sibling = s.value; }
-};
-
-/// Process an attribute which indicates that this function is a method
-template <> struct process_attribute<is_method> : process_attribute_default<is_method> {
- static void init(const is_method &s, function_record *r) { r->is_method = true; r->scope = s.class_; }
-};
-
-/// Process an attribute which indicates the parent scope of a method
-template <> struct process_attribute<scope> : process_attribute_default<scope> {
- static void init(const scope &s, function_record *r) { r->scope = s.value; }
-};
-
-/// Process an attribute which indicates that this function is an operator
-template <> struct process_attribute<is_operator> : process_attribute_default<is_operator> {
- static void init(const is_operator &, function_record *r) { r->is_operator = true; }
-};
-
-template <> struct process_attribute<is_new_style_constructor> : process_attribute_default<is_new_style_constructor> {
- static void init(const is_new_style_constructor &, function_record *r) { r->is_new_style_constructor = true; }
-};
-
-inline void process_kw_only_arg(const arg &a, function_record *r) {
- if (!a.name || strlen(a.name) == 0)
- pybind11_fail("arg(): cannot specify an unnamed argument after an kw_only() annotation");
- ++r->nargs_kw_only;
-}
-
-/// Process a keyword argument attribute (*without* a default value)
-template <> struct process_attribute<arg> : process_attribute_default<arg> {
- static void init(const arg &a, function_record *r) {
- if (r->is_method && r->args.empty())
- r->args.emplace_back("self", nullptr, handle(), true /*convert*/, false /*none not allowed*/);
- r->args.emplace_back(a.name, nullptr, handle(), !a.flag_noconvert, a.flag_none);
-
- if (r->has_kw_only_args) process_kw_only_arg(a, r);
- }
-};
-
-/// Process a keyword argument attribute (*with* a default value)
-template <> struct process_attribute<arg_v> : process_attribute_default<arg_v> {
- static void init(const arg_v &a, function_record *r) {
- if (r->is_method && r->args.empty())
- r->args.emplace_back("self", nullptr /*descr*/, handle() /*parent*/, true /*convert*/, false /*none not allowed*/);
-
- if (!a.value) {
-#if !defined(NDEBUG)
- std::string descr("'");
- if (a.name) descr += std::string(a.name) + ": ";
- descr += a.type + "'";
- if (r->is_method) {
- if (r->name)
- descr += " in method '" + (std::string) str(r->scope) + "." + (std::string) r->name + "'";
- else
- descr += " in method of '" + (std::string) str(r->scope) + "'";
- } else if (r->name) {
- descr += " in function '" + (std::string) r->name + "'";
- }
- pybind11_fail("arg(): could not convert default argument "
- + descr + " into a Python object (type not registered yet?)");
-#else
- pybind11_fail("arg(): could not convert default argument "
- "into a Python object (type not registered yet?). "
- "Compile in debug mode for more information.");
-#endif
- }
- r->args.emplace_back(a.name, a.descr, a.value.inc_ref(), !a.flag_noconvert, a.flag_none);
-
- if (r->has_kw_only_args) process_kw_only_arg(a, r);
- }
-};
-
-/// Process a keyword-only-arguments-follow pseudo argument
-template <> struct process_attribute<kw_only> : process_attribute_default<kw_only> {
- static void init(const kw_only &, function_record *r) {
- r->has_kw_only_args = true;
- }
-};
-
-/// Process a positional-only-argument maker
-template <> struct process_attribute<pos_only> : process_attribute_default<pos_only> {
- static void init(const pos_only &, function_record *r) {
- r->nargs_pos_only = static_cast<std::uint16_t>(r->args.size());
- }
-};
-
-/// Process a parent class attribute. Single inheritance only (class_ itself already guarantees that)
-template <typename T>
-struct process_attribute<T, enable_if_t<is_pyobject<T>::value>> : process_attribute_default<handle> {
- static void init(const handle &h, type_record *r) { r->bases.append(h); }
-};
-
-/// Process a parent class attribute (deprecated, does not support multiple inheritance)
-template <typename T>
-struct process_attribute<base<T>> : process_attribute_default<base<T>> {
- static void init(const base<T> &, type_record *r) { r->add_base(typeid(T), nullptr); }
-};
-
-/// Process a multiple inheritance attribute
-template <>
-struct process_attribute<multiple_inheritance> : process_attribute_default<multiple_inheritance> {
- static void init(const multiple_inheritance &, type_record *r) { r->multiple_inheritance = true; }
-};
-
-template <>
-struct process_attribute<dynamic_attr> : process_attribute_default<dynamic_attr> {
- static void init(const dynamic_attr &, type_record *r) { r->dynamic_attr = true; }
-};
-
-template <>
-struct process_attribute<is_final> : process_attribute_default<is_final> {
- static void init(const is_final &, type_record *r) { r->is_final = true; }
-};
-
-template <>
-struct process_attribute<buffer_protocol> : process_attribute_default<buffer_protocol> {
- static void init(const buffer_protocol &, type_record *r) { r->buffer_protocol = true; }
-};
-
-template <>
-struct process_attribute<metaclass> : process_attribute_default<metaclass> {
- static void init(const metaclass &m, type_record *r) { r->metaclass = m.value; }
-};
-
-template <>
-struct process_attribute<module_local> : process_attribute_default<module_local> {
- static void init(const module_local &l, type_record *r) { r->module_local = l.value; }
-};
-
-/// Process a 'prepend' attribute, putting this at the beginning of the overload chain
-template <>
-struct process_attribute<prepend> : process_attribute_default<prepend> {
- static void init(const prepend &, function_record *r) { r->prepend = true; }
-};
-
-/// Process an 'arithmetic' attribute for enums (does nothing here)
-template <>
-struct process_attribute<arithmetic> : process_attribute_default<arithmetic> {};
-
-template <typename... Ts>
-struct process_attribute<call_guard<Ts...>> : process_attribute_default<call_guard<Ts...>> { };
-
-/**
- * Process a keep_alive call policy -- invokes keep_alive_impl during the
- * pre-call handler if both Nurse, Patient != 0 and use the post-call handler
- * otherwise
- */
-template <size_t Nurse, size_t Patient> struct process_attribute<keep_alive<Nurse, Patient>> : public process_attribute_default<keep_alive<Nurse, Patient>> {
- template <size_t N = Nurse, size_t P = Patient, enable_if_t<N != 0 && P != 0, int> = 0>
- static void precall(function_call &call) { keep_alive_impl(Nurse, Patient, call, handle()); }
- template <size_t N = Nurse, size_t P = Patient, enable_if_t<N != 0 && P != 0, int> = 0>
- static void postcall(function_call &, handle) { }
- template <size_t N = Nurse, size_t P = Patient, enable_if_t<N == 0 || P == 0, int> = 0>
- static void precall(function_call &) { }
- template <size_t N = Nurse, size_t P = Patient, enable_if_t<N == 0 || P == 0, int> = 0>
- static void postcall(function_call &call, handle ret) { keep_alive_impl(Nurse, Patient, call, ret); }
-};
-
-/// Recursively iterate over variadic template arguments
-template <typename... Args> struct process_attributes {
- static void init(const Args&... args, function_record *r) {
- int unused[] = { 0, (process_attribute<typename std::decay<Args>::type>::init(args, r), 0) ... };
- ignore_unused(unused);
- }
- static void init(const Args&... args, type_record *r) {
- int unused[] = { 0, (process_attribute<typename std::decay<Args>::type>::init(args, r), 0) ... };
- ignore_unused(unused);
- }
- static void precall(function_call &call) {
- int unused[] = { 0, (process_attribute<typename std::decay<Args>::type>::precall(call), 0) ... };
- ignore_unused(unused);
- }
- static void postcall(function_call &call, handle fn_ret) {
- int unused[] = { 0, (process_attribute<typename std::decay<Args>::type>::postcall(call, fn_ret), 0) ... };
- ignore_unused(unused);
- }
-};
-
-template <typename T>
-using is_call_guard = is_instantiation<call_guard, T>;
-
-/// Extract the ``type`` from the first `call_guard` in `Extras...` (or `void_type` if none found)
-template <typename... Extra>
-using extract_guard_t = typename exactly_one_t<is_call_guard, call_guard<>, Extra...>::type;
-
-/// Check the number of named arguments at compile time
-template <typename... Extra,
- size_t named = constexpr_sum(std::is_base_of<arg, Extra>::value...),
- size_t self = constexpr_sum(std::is_same<is_method, Extra>::value...)>
-constexpr bool expected_num_args(size_t nargs, bool has_args, bool has_kwargs) {
- return named == 0 || (self + named + has_args + has_kwargs) == nargs;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/buffer_info.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/buffer_info.h
deleted file mode 100644
index d803004a102f4150778f0f7a70b8b0865bd4c245..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/buffer_info.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- pybind11/buffer_info.h: Python buffer object interface
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Default, C-style strides
-inline std::vector<ssize_t> c_strides(const std::vector<ssize_t> &shape, ssize_t itemsize) {
- auto ndim = shape.size();
- std::vector<ssize_t> strides(ndim, itemsize);
- if (ndim > 0)
- for (size_t i = ndim - 1; i > 0; --i)
- strides[i - 1] = strides[i] * shape[i];
- return strides;
-}
-
-// F-style strides; default when constructing an array_t with `ExtraFlags & f_style`
-inline std::vector<ssize_t> f_strides(const std::vector<ssize_t> &shape, ssize_t itemsize) {
- auto ndim = shape.size();
- std::vector<ssize_t> strides(ndim, itemsize);
- for (size_t i = 1; i < ndim; ++i)
- strides[i] = strides[i - 1] * shape[i - 1];
- return strides;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Information record describing a Python buffer object
-struct buffer_info {
- void *ptr = nullptr; // Pointer to the underlying storage
- ssize_t itemsize = 0; // Size of individual items in bytes
- ssize_t size = 0; // Total number of entries
- std::string format; // For homogeneous buffers, this should be set to format_descriptor<T>::format()
- ssize_t ndim = 0; // Number of dimensions
- std::vector<ssize_t> shape; // Shape of the tensor (1 entry per dimension)
- std::vector<ssize_t> strides; // Number of bytes between adjacent entries (for each per dimension)
- bool readonly = false; // flag to indicate if the underlying storage may be written to
-
- buffer_info() = default;
-
- buffer_info(void *ptr, ssize_t itemsize, const std::string &format, ssize_t ndim,
- detail::any_container<ssize_t> shape_in, detail::any_container<ssize_t> strides_in, bool readonly=false)
- : ptr(ptr), itemsize(itemsize), size(1), format(format), ndim(ndim),
- shape(std::move(shape_in)), strides(std::move(strides_in)), readonly(readonly) {
- if (ndim != (ssize_t) shape.size() || ndim != (ssize_t) strides.size())
- pybind11_fail("buffer_info: ndim doesn't match shape and/or strides length");
- for (size_t i = 0; i < (size_t) ndim; ++i)
- size *= shape[i];
- }
-
- template <typename T>
- buffer_info(T *ptr, detail::any_container<ssize_t> shape_in, detail::any_container<ssize_t> strides_in, bool readonly=false)
- : buffer_info(private_ctr_tag(), ptr, sizeof(T), format_descriptor<T>::format(), static_cast<ssize_t>(shape_in->size()), std::move(shape_in), std::move(strides_in), readonly) { }
-
- buffer_info(void *ptr, ssize_t itemsize, const std::string &format, ssize_t size, bool readonly=false)
- : buffer_info(ptr, itemsize, format, 1, {size}, {itemsize}, readonly) { }
-
- template <typename T>
- buffer_info(T *ptr, ssize_t size, bool readonly=false)
- : buffer_info(ptr, sizeof(T), format_descriptor<T>::format(), size, readonly) { }
-
- template <typename T>
- buffer_info(const T *ptr, ssize_t size, bool readonly=true)
- : buffer_info(const_cast<T*>(ptr), sizeof(T), format_descriptor<T>::format(), size, readonly) { }
-
- explicit buffer_info(Py_buffer *view, bool ownview = true)
- : buffer_info(view->buf, view->itemsize, view->format, view->ndim,
- {view->shape, view->shape + view->ndim},
- /* Though buffer::request() requests PyBUF_STRIDES, ctypes objects
- * ignore this flag and return a view with NULL strides.
- * When strides are NULL, build them manually. */
- view->strides
- ? std::vector<ssize_t>(view->strides, view->strides + view->ndim)
- : detail::c_strides({view->shape, view->shape + view->ndim}, view->itemsize),
- view->readonly) {
- this->m_view = view;
- this->ownview = ownview;
- }
-
- buffer_info(const buffer_info &) = delete;
- buffer_info& operator=(const buffer_info &) = delete;
-
- buffer_info(buffer_info &&other) {
- (*this) = std::move(other);
- }
-
- buffer_info& operator=(buffer_info &&rhs) {
- ptr = rhs.ptr;
- itemsize = rhs.itemsize;
- size = rhs.size;
- format = std::move(rhs.format);
- ndim = rhs.ndim;
- shape = std::move(rhs.shape);
- strides = std::move(rhs.strides);
- std::swap(m_view, rhs.m_view);
- std::swap(ownview, rhs.ownview);
- readonly = rhs.readonly;
- return *this;
- }
-
- ~buffer_info() {
- if (m_view && ownview) { PyBuffer_Release(m_view); delete m_view; }
- }
-
- Py_buffer *view() const { return m_view; }
- Py_buffer *&view() { return m_view; }
-private:
- struct private_ctr_tag { };
-
- buffer_info(private_ctr_tag, void *ptr, ssize_t itemsize, const std::string &format, ssize_t ndim,
- detail::any_container<ssize_t> &&shape_in, detail::any_container<ssize_t> &&strides_in, bool readonly)
- : buffer_info(ptr, itemsize, format, ndim, std::move(shape_in), std::move(strides_in), readonly) { }
-
- Py_buffer *m_view = nullptr;
- bool ownview = false;
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename T, typename SFINAE = void> struct compare_buffer_info {
- static bool compare(const buffer_info& b) {
- return b.format == format_descriptor<T>::format() && b.itemsize == (ssize_t) sizeof(T);
- }
-};
-
-template <typename T> struct compare_buffer_info<T, detail::enable_if_t<std::is_integral<T>::value>> {
- static bool compare(const buffer_info& b) {
- return (size_t) b.itemsize == sizeof(T) && (b.format == format_descriptor<T>::value ||
- ((sizeof(T) == sizeof(long)) && b.format == (std::is_unsigned<T>::value ? "L" : "l")) ||
- ((sizeof(T) == sizeof(size_t)) && b.format == (std::is_unsigned<T>::value ? "N" : "n")));
- }
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/cast.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/cast.h
deleted file mode 100644
index d6e440f787f2abb5bea2be33e727ef5d21e24518..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/cast.h
+++ /dev/null
@@ -1,2219 +0,0 @@
-/*
- pybind11/cast.h: Partial template specializations to cast between
- C++ and Python types
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pytypes.h"
-#include "detail/typeid.h"
-#include "detail/descr.h"
-#include "detail/internals.h"
-#include <array>
-#include <limits>
-#include <tuple>
-#include <type_traits>
-
-#if defined(PYBIND11_CPP17)
-# if defined(__has_include)
-# if __has_include(<string_view>)
-# define PYBIND11_HAS_STRING_VIEW
-# endif
-# elif defined(_MSC_VER)
-# define PYBIND11_HAS_STRING_VIEW
-# endif
-#endif
-#ifdef PYBIND11_HAS_STRING_VIEW
-#include <string_view>
-#endif
-
-#if defined(__cpp_lib_char8_t) && __cpp_lib_char8_t >= 201811L
-# define PYBIND11_HAS_U8STRING
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// A life support system for temporary objects created by `type_caster::load()`.
-/// Adding a patient will keep it alive up until the enclosing function returns.
-class loader_life_support {
-public:
- /// A new patient frame is created when a function is entered
- loader_life_support() {
- get_internals().loader_patient_stack.push_back(nullptr);
- }
-
- /// ... and destroyed after it returns
- ~loader_life_support() {
- auto &stack = get_internals().loader_patient_stack;
- if (stack.empty())
- pybind11_fail("loader_life_support: internal error");
-
- auto ptr = stack.back();
- stack.pop_back();
- Py_CLEAR(ptr);
-
- // A heuristic to reduce the stack's capacity (e.g. after long recursive calls)
- if (stack.capacity() > 16 && !stack.empty() && stack.capacity() / stack.size() > 2)
- stack.shrink_to_fit();
- }
-
- /// This can only be used inside a pybind11-bound function, either by `argument_loader`
- /// at argument preparation time or by `py::cast()` at execution time.
- PYBIND11_NOINLINE static void add_patient(handle h) {
- auto &stack = get_internals().loader_patient_stack;
- if (stack.empty())
- throw cast_error("When called outside a bound function, py::cast() cannot "
- "do Python -> C++ conversions which require the creation "
- "of temporary values");
-
- auto &list_ptr = stack.back();
- if (list_ptr == nullptr) {
- list_ptr = PyList_New(1);
- if (!list_ptr)
- pybind11_fail("loader_life_support: error allocating list");
- PyList_SET_ITEM(list_ptr, 0, h.inc_ref().ptr());
- } else {
- auto result = PyList_Append(list_ptr, h.ptr());
- if (result == -1)
- pybind11_fail("loader_life_support: error adding patient");
- }
- }
-};
-
-// Gets the cache entry for the given type, creating it if necessary. The return value is the pair
-// returned by emplace, i.e. an iterator for the entry and a bool set to `true` if the entry was
-// just created.
-inline std::pair<decltype(internals::registered_types_py)::iterator, bool> all_type_info_get_cache(PyTypeObject *type);
-
-// Populates a just-created cache entry.
-PYBIND11_NOINLINE inline void all_type_info_populate(PyTypeObject *t, std::vector<type_info *> &bases) {
- std::vector<PyTypeObject *> check;
- for (handle parent : reinterpret_borrow<tuple>(t->tp_bases))
- check.push_back((PyTypeObject *) parent.ptr());
-
- auto const &type_dict = get_internals().registered_types_py;
- for (size_t i = 0; i < check.size(); i++) {
- auto type = check[i];
- // Ignore Python2 old-style class super type:
- if (!PyType_Check((PyObject *) type)) continue;
-
- // Check `type` in the current set of registered python types:
- auto it = type_dict.find(type);
- if (it != type_dict.end()) {
- // We found a cache entry for it, so it's either pybind-registered or has pre-computed
- // pybind bases, but we have to make sure we haven't already seen the type(s) before: we
- // want to follow Python/virtual C++ rules that there should only be one instance of a
- // common base.
- for (auto *tinfo : it->second) {
- // NB: Could use a second set here, rather than doing a linear search, but since
- // having a large number of immediate pybind11-registered types seems fairly
- // unlikely, that probably isn't worthwhile.
- bool found = false;
- for (auto *known : bases) {
- if (known == tinfo) { found = true; break; }
- }
- if (!found) bases.push_back(tinfo);
- }
- }
- else if (type->tp_bases) {
- // It's some python type, so keep follow its bases classes to look for one or more
- // registered types
- if (i + 1 == check.size()) {
- // When we're at the end, we can pop off the current element to avoid growing
- // `check` when adding just one base (which is typical--i.e. when there is no
- // multiple inheritance)
- check.pop_back();
- i--;
- }
- for (handle parent : reinterpret_borrow<tuple>(type->tp_bases))
- check.push_back((PyTypeObject *) parent.ptr());
- }
- }
-}
-
-/**
- * Extracts vector of type_info pointers of pybind-registered roots of the given Python type. Will
- * be just 1 pybind type for the Python type of a pybind-registered class, or for any Python-side
- * derived class that uses single inheritance. Will contain as many types as required for a Python
- * class that uses multiple inheritance to inherit (directly or indirectly) from multiple
- * pybind-registered classes. Will be empty if neither the type nor any base classes are
- * pybind-registered.
- *
- * The value is cached for the lifetime of the Python type.
- */
-inline const std::vector<detail::type_info *> &all_type_info(PyTypeObject *type) {
- auto ins = all_type_info_get_cache(type);
- if (ins.second)
- // New cache entry: populate it
- all_type_info_populate(type, ins.first->second);
-
- return ins.first->second;
-}
-
-/**
- * Gets a single pybind11 type info for a python type. Returns nullptr if neither the type nor any
- * ancestors are pybind11-registered. Throws an exception if there are multiple bases--use
- * `all_type_info` instead if you want to support multiple bases.
- */
-PYBIND11_NOINLINE inline detail::type_info* get_type_info(PyTypeObject *type) {
- auto &bases = all_type_info(type);
- if (bases.empty())
- return nullptr;
- if (bases.size() > 1)
- pybind11_fail("pybind11::detail::get_type_info: type has multiple pybind11-registered bases");
- return bases.front();
-}
-
-inline detail::type_info *get_local_type_info(const std::type_index &tp) {
- auto &locals = registered_local_types_cpp();
- auto it = locals.find(tp);
- if (it != locals.end())
- return it->second;
- return nullptr;
-}
-
-inline detail::type_info *get_global_type_info(const std::type_index &tp) {
- auto &types = get_internals().registered_types_cpp;
- auto it = types.find(tp);
- if (it != types.end())
- return it->second;
- return nullptr;
-}
-
-/// Return the type info for a given C++ type; on lookup failure can either throw or return nullptr.
-PYBIND11_NOINLINE inline detail::type_info *get_type_info(const std::type_index &tp,
- bool throw_if_missing = false) {
- if (auto ltype = get_local_type_info(tp))
- return ltype;
- if (auto gtype = get_global_type_info(tp))
- return gtype;
-
- if (throw_if_missing) {
- std::string tname = tp.name();
- detail::clean_type_id(tname);
- pybind11_fail("pybind11::detail::get_type_info: unable to find type info for \"" + tname + "\"");
- }
- return nullptr;
-}
-
-PYBIND11_NOINLINE inline handle get_type_handle(const std::type_info &tp, bool throw_if_missing) {
- detail::type_info *type_info = get_type_info(tp, throw_if_missing);
- return handle(type_info ? ((PyObject *) type_info->type) : nullptr);
-}
-
-struct value_and_holder {
- instance *inst = nullptr;
- size_t index = 0u;
- const detail::type_info *type = nullptr;
- void **vh = nullptr;
-
- // Main constructor for a found value/holder:
- value_and_holder(instance *i, const detail::type_info *type, size_t vpos, size_t index) :
- inst{i}, index{index}, type{type},
- vh{inst->simple_layout ? inst->simple_value_holder : &inst->nonsimple.values_and_holders[vpos]}
- {}
-
- // Default constructor (used to signal a value-and-holder not found by get_value_and_holder())
- value_and_holder() = default;
-
- // Used for past-the-end iterator
- value_and_holder(size_t index) : index{index} {}
-
- template <typename V = void> V *&value_ptr() const {
- return reinterpret_cast<V *&>(vh[0]);
- }
- // True if this `value_and_holder` has a non-null value pointer
- explicit operator bool() const { return value_ptr(); }
-
- template <typename H> H &holder() const {
- return reinterpret_cast<H &>(vh[1]);
- }
- bool holder_constructed() const {
- return inst->simple_layout
- ? inst->simple_holder_constructed
- : inst->nonsimple.status[index] & instance::status_holder_constructed;
- }
- void set_holder_constructed(bool v = true) {
- if (inst->simple_layout)
- inst->simple_holder_constructed = v;
- else if (v)
- inst->nonsimple.status[index] |= instance::status_holder_constructed;
- else
- inst->nonsimple.status[index] &= (uint8_t) ~instance::status_holder_constructed;
- }
- bool instance_registered() const {
- return inst->simple_layout
- ? inst->simple_instance_registered
- : inst->nonsimple.status[index] & instance::status_instance_registered;
- }
- void set_instance_registered(bool v = true) {
- if (inst->simple_layout)
- inst->simple_instance_registered = v;
- else if (v)
- inst->nonsimple.status[index] |= instance::status_instance_registered;
- else
- inst->nonsimple.status[index] &= (uint8_t) ~instance::status_instance_registered;
- }
-};
-
-// Container for accessing and iterating over an instance's values/holders
-struct values_and_holders {
-private:
- instance *inst;
- using type_vec = std::vector<detail::type_info *>;
- const type_vec &tinfo;
-
-public:
- values_and_holders(instance *inst) : inst{inst}, tinfo(all_type_info(Py_TYPE(inst))) {}
-
- struct iterator {
- private:
- instance *inst = nullptr;
- const type_vec *types = nullptr;
- value_and_holder curr;
- friend struct values_and_holders;
- iterator(instance *inst, const type_vec *tinfo)
- : inst{inst}, types{tinfo},
- curr(inst /* instance */,
- types->empty() ? nullptr : (*types)[0] /* type info */,
- 0, /* vpos: (non-simple types only): the first vptr comes first */
- 0 /* index */)
- {}
- // Past-the-end iterator:
- iterator(size_t end) : curr(end) {}
- public:
- bool operator==(const iterator &other) const { return curr.index == other.curr.index; }
- bool operator!=(const iterator &other) const { return curr.index != other.curr.index; }
- iterator &operator++() {
- if (!inst->simple_layout)
- curr.vh += 1 + (*types)[curr.index]->holder_size_in_ptrs;
- ++curr.index;
- curr.type = curr.index < types->size() ? (*types)[curr.index] : nullptr;
- return *this;
- }
- value_and_holder &operator*() { return curr; }
- value_and_holder *operator->() { return &curr; }
- };
-
- iterator begin() { return iterator(inst, &tinfo); }
- iterator end() { return iterator(tinfo.size()); }
-
- iterator find(const type_info *find_type) {
- auto it = begin(), endit = end();
- while (it != endit && it->type != find_type) ++it;
- return it;
- }
-
- size_t size() { return tinfo.size(); }
-};
-
-/**
- * Extracts C++ value and holder pointer references from an instance (which may contain multiple
- * values/holders for python-side multiple inheritance) that match the given type. Throws an error
- * if the given type (or ValueType, if omitted) is not a pybind11 base of the given instance. If
- * `find_type` is omitted (or explicitly specified as nullptr) the first value/holder are returned,
- * regardless of type (and the resulting .type will be nullptr).
- *
- * The returned object should be short-lived: in particular, it must not outlive the called-upon
- * instance.
- */
-PYBIND11_NOINLINE inline value_and_holder instance::get_value_and_holder(const type_info *find_type /*= nullptr default in common.h*/, bool throw_if_missing /*= true in common.h*/) {
- // Optimize common case:
- if (!find_type || Py_TYPE(this) == find_type->type)
- return value_and_holder(this, find_type, 0, 0);
-
- detail::values_and_holders vhs(this);
- auto it = vhs.find(find_type);
- if (it != vhs.end())
- return *it;
-
- if (!throw_if_missing)
- return value_and_holder();
-
-#if defined(NDEBUG)
- pybind11_fail("pybind11::detail::instance::get_value_and_holder: "
- "type is not a pybind11 base of the given instance "
- "(compile in debug mode for type details)");
-#else
- pybind11_fail("pybind11::detail::instance::get_value_and_holder: `" +
- get_fully_qualified_tp_name(find_type->type) + "' is not a pybind11 base of the given `" +
- get_fully_qualified_tp_name(Py_TYPE(this)) + "' instance");
-#endif
-}
-
-PYBIND11_NOINLINE inline void instance::allocate_layout() {
- auto &tinfo = all_type_info(Py_TYPE(this));
-
- const size_t n_types = tinfo.size();
-
- if (n_types == 0)
- pybind11_fail("instance allocation failed: new instance has no pybind11-registered base types");
-
- simple_layout =
- n_types == 1 && tinfo.front()->holder_size_in_ptrs <= instance_simple_holder_in_ptrs();
-
- // Simple path: no python-side multiple inheritance, and a small-enough holder
- if (simple_layout) {
- simple_value_holder[0] = nullptr;
- simple_holder_constructed = false;
- simple_instance_registered = false;
- }
- else { // multiple base types or a too-large holder
- // Allocate space to hold: [v1*][h1][v2*][h2]...[bb...] where [vN*] is a value pointer,
- // [hN] is the (uninitialized) holder instance for value N, and [bb...] is a set of bool
- // values that tracks whether each associated holder has been initialized. Each [block] is
- // padded, if necessary, to an integer multiple of sizeof(void *).
- size_t space = 0;
- for (auto t : tinfo) {
- space += 1; // value pointer
- space += t->holder_size_in_ptrs; // holder instance
- }
- size_t flags_at = space;
- space += size_in_ptrs(n_types); // status bytes (holder_constructed and instance_registered)
-
- // Allocate space for flags, values, and holders, and initialize it to 0 (flags and values,
- // in particular, need to be 0). Use Python's memory allocation functions: in Python 3.6
- // they default to using pymalloc, which is designed to be efficient for small allocations
- // like the one we're doing here; in earlier versions (and for larger allocations) they are
- // just wrappers around malloc.
-#if PY_VERSION_HEX >= 0x03050000
- nonsimple.values_and_holders = (void **) PyMem_Calloc(space, sizeof(void *));
- if (!nonsimple.values_and_holders) throw std::bad_alloc();
-#else
- nonsimple.values_and_holders = (void **) PyMem_New(void *, space);
- if (!nonsimple.values_and_holders) throw std::bad_alloc();
- std::memset(nonsimple.values_and_holders, 0, space * sizeof(void *));
-#endif
- nonsimple.status = reinterpret_cast<uint8_t *>(&nonsimple.values_and_holders[flags_at]);
- }
- owned = true;
-}
-
-PYBIND11_NOINLINE inline void instance::deallocate_layout() {
- if (!simple_layout)
- PyMem_Free(nonsimple.values_and_holders);
-}
-
-PYBIND11_NOINLINE inline bool isinstance_generic(handle obj, const std::type_info &tp) {
- handle type = detail::get_type_handle(tp, false);
- if (!type)
- return false;
- return isinstance(obj, type);
-}
-
-PYBIND11_NOINLINE inline std::string error_string() {
- if (!PyErr_Occurred()) {
- PyErr_SetString(PyExc_RuntimeError, "Unknown internal error occurred");
- return "Unknown internal error occurred";
- }
-
- error_scope scope; // Preserve error state
-
- std::string errorString;
- if (scope.type) {
- errorString += handle(scope.type).attr("__name__").cast<std::string>();
- errorString += ": ";
- }
- if (scope.value)
- errorString += (std::string) str(scope.value);
-
- PyErr_NormalizeException(&scope.type, &scope.value, &scope.trace);
-
-#if PY_MAJOR_VERSION >= 3
- if (scope.trace != nullptr)
- PyException_SetTraceback(scope.value, scope.trace);
-#endif
-
-#if !defined(PYPY_VERSION)
- if (scope.trace) {
- auto *trace = (PyTracebackObject *) scope.trace;
-
- /* Get the deepest trace possible */
- while (trace->tb_next)
- trace = trace->tb_next;
-
- PyFrameObject *frame = trace->tb_frame;
- errorString += "\n\nAt:\n";
- while (frame) {
- int lineno = PyFrame_GetLineNumber(frame);
- errorString +=
- " " + handle(frame->f_code->co_filename).cast<std::string>() +
- "(" + std::to_string(lineno) + "): " +
- handle(frame->f_code->co_name).cast<std::string>() + "\n";
- frame = frame->f_back;
- }
- }
-#endif
-
- return errorString;
-}
-
-PYBIND11_NOINLINE inline handle get_object_handle(const void *ptr, const detail::type_info *type ) {
- auto &instances = get_internals().registered_instances;
- auto range = instances.equal_range(ptr);
- for (auto it = range.first; it != range.second; ++it) {
- for (const auto &vh : values_and_holders(it->second)) {
- if (vh.type == type)
- return handle((PyObject *) it->second);
- }
- }
- return handle();
-}
-
-inline PyThreadState *get_thread_state_unchecked() {
-#if defined(PYPY_VERSION)
- return PyThreadState_GET();
-#elif PY_VERSION_HEX < 0x03000000
- return _PyThreadState_Current;
-#elif PY_VERSION_HEX < 0x03050000
- return (PyThreadState*) _Py_atomic_load_relaxed(&_PyThreadState_Current);
-#elif PY_VERSION_HEX < 0x03050200
- return (PyThreadState*) _PyThreadState_Current.value;
-#else
- return _PyThreadState_UncheckedGet();
-#endif
-}
-
-// Forward declarations
-inline void keep_alive_impl(handle nurse, handle patient);
-inline PyObject *make_new_instance(PyTypeObject *type);
-
-class type_caster_generic {
-public:
- PYBIND11_NOINLINE type_caster_generic(const std::type_info &type_info)
- : typeinfo(get_type_info(type_info)), cpptype(&type_info) { }
-
- type_caster_generic(const type_info *typeinfo)
- : typeinfo(typeinfo), cpptype(typeinfo ? typeinfo->cpptype : nullptr) { }
-
- bool load(handle src, bool convert) {
- return load_impl<type_caster_generic>(src, convert);
- }
-
- PYBIND11_NOINLINE static handle cast(const void *_src, return_value_policy policy, handle parent,
- const detail::type_info *tinfo,
- void *(*copy_constructor)(const void *),
- void *(*move_constructor)(const void *),
- const void *existing_holder = nullptr) {
- if (!tinfo) // no type info: error will be set already
- return handle();
-
- void *src = const_cast<void *>(_src);
- if (src == nullptr)
- return none().release();
-
- auto it_instances = get_internals().registered_instances.equal_range(src);
- for (auto it_i = it_instances.first; it_i != it_instances.second; ++it_i) {
- for (auto instance_type : detail::all_type_info(Py_TYPE(it_i->second))) {
- if (instance_type && same_type(*instance_type->cpptype, *tinfo->cpptype))
- return handle((PyObject *) it_i->second).inc_ref();
- }
- }
-
- auto inst = reinterpret_steal<object>(make_new_instance(tinfo->type));
- auto wrapper = reinterpret_cast<instance *>(inst.ptr());
- wrapper->owned = false;
- void *&valueptr = values_and_holders(wrapper).begin()->value_ptr();
-
- switch (policy) {
- case return_value_policy::automatic:
- case return_value_policy::take_ownership:
- valueptr = src;
- wrapper->owned = true;
- break;
-
- case return_value_policy::automatic_reference:
- case return_value_policy::reference:
- valueptr = src;
- wrapper->owned = false;
- break;
-
- case return_value_policy::copy:
- if (copy_constructor)
- valueptr = copy_constructor(src);
- else {
-#if defined(NDEBUG)
- throw cast_error("return_value_policy = copy, but type is "
- "non-copyable! (compile in debug mode for details)");
-#else
- std::string type_name(tinfo->cpptype->name());
- detail::clean_type_id(type_name);
- throw cast_error("return_value_policy = copy, but type " +
- type_name + " is non-copyable!");
-#endif
- }
- wrapper->owned = true;
- break;
-
- case return_value_policy::move:
- if (move_constructor)
- valueptr = move_constructor(src);
- else if (copy_constructor)
- valueptr = copy_constructor(src);
- else {
-#if defined(NDEBUG)
- throw cast_error("return_value_policy = move, but type is neither "
- "movable nor copyable! "
- "(compile in debug mode for details)");
-#else
- std::string type_name(tinfo->cpptype->name());
- detail::clean_type_id(type_name);
- throw cast_error("return_value_policy = move, but type " +
- type_name + " is neither movable nor copyable!");
-#endif
- }
- wrapper->owned = true;
- break;
-
- case return_value_policy::reference_internal:
- valueptr = src;
- wrapper->owned = false;
- keep_alive_impl(inst, parent);
- break;
-
- default:
- throw cast_error("unhandled return_value_policy: should not happen!");
- }
-
- tinfo->init_instance(wrapper, existing_holder);
-
- return inst.release();
- }
-
- // Base methods for generic caster; there are overridden in copyable_holder_caster
- void load_value(value_and_holder &&v_h) {
- auto *&vptr = v_h.value_ptr();
- // Lazy allocation for unallocated values:
- if (vptr == nullptr) {
- auto *type = v_h.type ? v_h.type : typeinfo;
- if (type->operator_new) {
- vptr = type->operator_new(type->type_size);
- } else {
- #if defined(__cpp_aligned_new) && (!defined(_MSC_VER) || _MSC_VER >= 1912)
- if (type->type_align > __STDCPP_DEFAULT_NEW_ALIGNMENT__)
- vptr = ::operator new(type->type_size,
- std::align_val_t(type->type_align));
- else
- #endif
- vptr = ::operator new(type->type_size);
- }
- }
- value = vptr;
- }
- bool try_implicit_casts(handle src, bool convert) {
- for (auto &cast : typeinfo->implicit_casts) {
- type_caster_generic sub_caster(*cast.first);
- if (sub_caster.load(src, convert)) {
- value = cast.second(sub_caster.value);
- return true;
- }
- }
- return false;
- }
- bool try_direct_conversions(handle src) {
- for (auto &converter : *typeinfo->direct_conversions) {
- if (converter(src.ptr(), value))
- return true;
- }
- return false;
- }
- void check_holder_compat() {}
-
- PYBIND11_NOINLINE static void *local_load(PyObject *src, const type_info *ti) {
- auto caster = type_caster_generic(ti);
- if (caster.load(src, false))
- return caster.value;
- return nullptr;
- }
-
- /// Try to load with foreign typeinfo, if available. Used when there is no
- /// native typeinfo, or when the native one wasn't able to produce a value.
- PYBIND11_NOINLINE bool try_load_foreign_module_local(handle src) {
- constexpr auto *local_key = PYBIND11_MODULE_LOCAL_ID;
- const auto pytype = type::handle_of(src);
- if (!hasattr(pytype, local_key))
- return false;
-
- type_info *foreign_typeinfo = reinterpret_borrow<capsule>(getattr(pytype, local_key));
- // Only consider this foreign loader if actually foreign and is a loader of the correct cpp type
- if (foreign_typeinfo->module_local_load == &local_load
- || (cpptype && !same_type(*cpptype, *foreign_typeinfo->cpptype)))
- return false;
-
- if (auto result = foreign_typeinfo->module_local_load(src.ptr(), foreign_typeinfo)) {
- value = result;
- return true;
- }
- return false;
- }
-
- // Implementation of `load`; this takes the type of `this` so that it can dispatch the relevant
- // bits of code between here and copyable_holder_caster where the two classes need different
- // logic (without having to resort to virtual inheritance).
- template <typename ThisT>
- PYBIND11_NOINLINE bool load_impl(handle src, bool convert) {
- if (!src) return false;
- if (!typeinfo) return try_load_foreign_module_local(src);
- if (src.is_none()) {
- // Defer accepting None to other overloads (if we aren't in convert mode):
- if (!convert) return false;
- value = nullptr;
- return true;
- }
-
- auto &this_ = static_cast<ThisT &>(*this);
- this_.check_holder_compat();
-
- PyTypeObject *srctype = Py_TYPE(src.ptr());
-
- // Case 1: If src is an exact type match for the target type then we can reinterpret_cast
- // the instance's value pointer to the target type:
- if (srctype == typeinfo->type) {
- this_.load_value(reinterpret_cast<instance *>(src.ptr())->get_value_and_holder());
- return true;
- }
- // Case 2: We have a derived class
- else if (PyType_IsSubtype(srctype, typeinfo->type)) {
- auto &bases = all_type_info(srctype);
- bool no_cpp_mi = typeinfo->simple_type;
-
- // Case 2a: the python type is a Python-inherited derived class that inherits from just
- // one simple (no MI) pybind11 class, or is an exact match, so the C++ instance is of
- // the right type and we can use reinterpret_cast.
- // (This is essentially the same as case 2b, but because not using multiple inheritance
- // is extremely common, we handle it specially to avoid the loop iterator and type
- // pointer lookup overhead)
- if (bases.size() == 1 && (no_cpp_mi || bases.front()->type == typeinfo->type)) {
- this_.load_value(reinterpret_cast<instance *>(src.ptr())->get_value_and_holder());
- return true;
- }
- // Case 2b: the python type inherits from multiple C++ bases. Check the bases to see if
- // we can find an exact match (or, for a simple C++ type, an inherited match); if so, we
- // can safely reinterpret_cast to the relevant pointer.
- else if (bases.size() > 1) {
- for (auto base : bases) {
- if (no_cpp_mi ? PyType_IsSubtype(base->type, typeinfo->type) : base->type == typeinfo->type) {
- this_.load_value(reinterpret_cast<instance *>(src.ptr())->get_value_and_holder(base));
- return true;
- }
- }
- }
-
- // Case 2c: C++ multiple inheritance is involved and we couldn't find an exact type match
- // in the registered bases, above, so try implicit casting (needed for proper C++ casting
- // when MI is involved).
- if (this_.try_implicit_casts(src, convert))
- return true;
- }
-
- // Perform an implicit conversion
- if (convert) {
- for (auto &converter : typeinfo->implicit_conversions) {
- auto temp = reinterpret_steal<object>(converter(src.ptr(), typeinfo->type));
- if (load_impl<ThisT>(temp, false)) {
- loader_life_support::add_patient(temp);
- return true;
- }
- }
- if (this_.try_direct_conversions(src))
- return true;
- }
-
- // Failed to match local typeinfo. Try again with global.
- if (typeinfo->module_local) {
- if (auto gtype = get_global_type_info(*typeinfo->cpptype)) {
- typeinfo = gtype;
- return load(src, false);
- }
- }
-
- // Global typeinfo has precedence over foreign module_local
- return try_load_foreign_module_local(src);
- }
-
-
- // Called to do type lookup and wrap the pointer and type in a pair when a dynamic_cast
- // isn't needed or can't be used. If the type is unknown, sets the error and returns a pair
- // with .second = nullptr. (p.first = nullptr is not an error: it becomes None).
- PYBIND11_NOINLINE static std::pair<const void *, const type_info *> src_and_type(
- const void *src, const std::type_info &cast_type, const std::type_info *rtti_type = nullptr) {
- if (auto *tpi = get_type_info(cast_type))
- return {src, const_cast<const type_info *>(tpi)};
-
- // Not found, set error:
- std::string tname = rtti_type ? rtti_type->name() : cast_type.name();
- detail::clean_type_id(tname);
- std::string msg = "Unregistered type : " + tname;
- PyErr_SetString(PyExc_TypeError, msg.c_str());
- return {nullptr, nullptr};
- }
-
- const type_info *typeinfo = nullptr;
- const std::type_info *cpptype = nullptr;
- void *value = nullptr;
-};
-
-/**
- * Determine suitable casting operator for pointer-or-lvalue-casting type casters. The type caster
- * needs to provide `operator T*()` and `operator T&()` operators.
- *
- * If the type supports moving the value away via an `operator T&&() &&` method, it should use
- * `movable_cast_op_type` instead.
- */
-template <typename T>
-using cast_op_type =
- conditional_t<std::is_pointer<remove_reference_t<T>>::value,
- typename std::add_pointer<intrinsic_t<T>>::type,
- typename std::add_lvalue_reference<intrinsic_t<T>>::type>;
-
-/**
- * Determine suitable casting operator for a type caster with a movable value. Such a type caster
- * needs to provide `operator T*()`, `operator T&()`, and `operator T&&() &&`. The latter will be
- * called in appropriate contexts where the value can be moved rather than copied.
- *
- * These operator are automatically provided when using the PYBIND11_TYPE_CASTER macro.
- */
-template <typename T>
-using movable_cast_op_type =
- conditional_t<std::is_pointer<typename std::remove_reference<T>::type>::value,
- typename std::add_pointer<intrinsic_t<T>>::type,
- conditional_t<std::is_rvalue_reference<T>::value,
- typename std::add_rvalue_reference<intrinsic_t<T>>::type,
- typename std::add_lvalue_reference<intrinsic_t<T>>::type>>;
-
-// std::is_copy_constructible isn't quite enough: it lets std::vector<T> (and similar) through when
-// T is non-copyable, but code containing such a copy constructor fails to actually compile.
-template <typename T, typename SFINAE = void> struct is_copy_constructible : std::is_copy_constructible<T> {};
-
-// Specialization for types that appear to be copy constructible but also look like stl containers
-// (we specifically check for: has `value_type` and `reference` with `reference = value_type&`): if
-// so, copy constructability depends on whether the value_type is copy constructible.
-template <typename Container> struct is_copy_constructible<Container, enable_if_t<all_of<
- std::is_copy_constructible<Container>,
- std::is_same<typename Container::value_type &, typename Container::reference>,
- // Avoid infinite recursion
- negation<std::is_same<Container, typename Container::value_type>>
- >::value>> : is_copy_constructible<typename Container::value_type> {};
-
-// Likewise for std::pair
-// (after C++17 it is mandatory that the copy constructor not exist when the two types aren't themselves
-// copy constructible, but this can not be relied upon when T1 or T2 are themselves containers).
-template <typename T1, typename T2> struct is_copy_constructible<std::pair<T1, T2>>
- : all_of<is_copy_constructible<T1>, is_copy_constructible<T2>> {};
-
-// The same problems arise with std::is_copy_assignable, so we use the same workaround.
-template <typename T, typename SFINAE = void> struct is_copy_assignable : std::is_copy_assignable<T> {};
-template <typename Container> struct is_copy_assignable<Container, enable_if_t<all_of<
- std::is_copy_assignable<Container>,
- std::is_same<typename Container::value_type &, typename Container::reference>
- >::value>> : is_copy_assignable<typename Container::value_type> {};
-template <typename T1, typename T2> struct is_copy_assignable<std::pair<T1, T2>>
- : all_of<is_copy_assignable<T1>, is_copy_assignable<T2>> {};
-
-PYBIND11_NAMESPACE_END(detail)
-
-// polymorphic_type_hook<itype>::get(src, tinfo) determines whether the object pointed
-// to by `src` actually is an instance of some class derived from `itype`.
-// If so, it sets `tinfo` to point to the std::type_info representing that derived
-// type, and returns a pointer to the start of the most-derived object of that type
-// (in which `src` is a subobject; this will be the same address as `src` in most
-// single inheritance cases). If not, or if `src` is nullptr, it simply returns `src`
-// and leaves `tinfo` at its default value of nullptr.
-//
-// The default polymorphic_type_hook just returns src. A specialization for polymorphic
-// types determines the runtime type of the passed object and adjusts the this-pointer
-// appropriately via dynamic_cast<void*>. This is what enables a C++ Animal* to appear
-// to Python as a Dog (if Dog inherits from Animal, Animal is polymorphic, Dog is
-// registered with pybind11, and this Animal is in fact a Dog).
-//
-// You may specialize polymorphic_type_hook yourself for types that want to appear
-// polymorphic to Python but do not use C++ RTTI. (This is a not uncommon pattern
-// in performance-sensitive applications, used most notably in LLVM.)
-//
-// polymorphic_type_hook_base allows users to specialize polymorphic_type_hook with
-// std::enable_if. User provided specializations will always have higher priority than
-// the default implementation and specialization provided in polymorphic_type_hook_base.
-template <typename itype, typename SFINAE = void>
-struct polymorphic_type_hook_base
-{
- static const void *get(const itype *src, const std::type_info*&) { return src; }
-};
-template <typename itype>
-struct polymorphic_type_hook_base<itype, detail::enable_if_t<std::is_polymorphic<itype>::value>>
-{
- static const void *get(const itype *src, const std::type_info*& type) {
- type = src ? &typeid(*src) : nullptr;
- return dynamic_cast<const void*>(src);
- }
-};
-template <typename itype, typename SFINAE = void>
-struct polymorphic_type_hook : public polymorphic_type_hook_base<itype> {};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// Generic type caster for objects stored on the heap
-template <typename type> class type_caster_base : public type_caster_generic {
- using itype = intrinsic_t<type>;
-
-public:
- static constexpr auto name = _<type>();
-
- type_caster_base() : type_caster_base(typeid(type)) { }
- explicit type_caster_base(const std::type_info &info) : type_caster_generic(info) { }
-
- static handle cast(const itype &src, return_value_policy policy, handle parent) {
- if (policy == return_value_policy::automatic || policy == return_value_policy::automatic_reference)
- policy = return_value_policy::copy;
- return cast(&src, policy, parent);
- }
-
- static handle cast(itype &&src, return_value_policy, handle parent) {
- return cast(&src, return_value_policy::move, parent);
- }
-
- // Returns a (pointer, type_info) pair taking care of necessary type lookup for a
- // polymorphic type (using RTTI by default, but can be overridden by specializing
- // polymorphic_type_hook). If the instance isn't derived, returns the base version.
- static std::pair<const void *, const type_info *> src_and_type(const itype *src) {
- auto &cast_type = typeid(itype);
- const std::type_info *instance_type = nullptr;
- const void *vsrc = polymorphic_type_hook<itype>::get(src, instance_type);
- if (instance_type && !same_type(cast_type, *instance_type)) {
- // This is a base pointer to a derived type. If the derived type is registered
- // with pybind11, we want to make the full derived object available.
- // In the typical case where itype is polymorphic, we get the correct
- // derived pointer (which may be != base pointer) by a dynamic_cast to
- // most derived type. If itype is not polymorphic, we won't get here
- // except via a user-provided specialization of polymorphic_type_hook,
- // and the user has promised that no this-pointer adjustment is
- // required in that case, so it's OK to use static_cast.
- if (const auto *tpi = get_type_info(*instance_type))
- return {vsrc, tpi};
- }
- // Otherwise we have either a nullptr, an `itype` pointer, or an unknown derived pointer, so
- // don't do a cast
- return type_caster_generic::src_and_type(src, cast_type, instance_type);
- }
-
- static handle cast(const itype *src, return_value_policy policy, handle parent) {
- auto st = src_and_type(src);
- return type_caster_generic::cast(
- st.first, policy, parent, st.second,
- make_copy_constructor(src), make_move_constructor(src));
- }
-
- static handle cast_holder(const itype *src, const void *holder) {
- auto st = src_and_type(src);
- return type_caster_generic::cast(
- st.first, return_value_policy::take_ownership, {}, st.second,
- nullptr, nullptr, holder);
- }
-
- template <typename T> using cast_op_type = detail::cast_op_type<T>;
-
- operator itype*() { return (type *) value; }
- operator itype&() { if (!value) throw reference_cast_error(); return *((itype *) value); }
-
-protected:
- using Constructor = void *(*)(const void *);
-
- /* Only enabled when the types are {copy,move}-constructible *and* when the type
- does not have a private operator new implementation. */
- template <typename T, typename = enable_if_t<is_copy_constructible<T>::value>>
- static auto make_copy_constructor(const T *x) -> decltype(new T(*x), Constructor{}) {
- return [](const void *arg) -> void * {
- return new T(*reinterpret_cast<const T *>(arg));
- };
- }
-
- template <typename T, typename = enable_if_t<std::is_move_constructible<T>::value>>
- static auto make_move_constructor(const T *x) -> decltype(new T(std::move(*const_cast<T *>(x))), Constructor{}) {
- return [](const void *arg) -> void * {
- return new T(std::move(*const_cast<T *>(reinterpret_cast<const T *>(arg))));
- };
- }
-
- static Constructor make_copy_constructor(...) { return nullptr; }
- static Constructor make_move_constructor(...) { return nullptr; }
-};
-
-template <typename type, typename SFINAE = void> class type_caster : public type_caster_base<type> { };
-template <typename type> using make_caster = type_caster<intrinsic_t<type>>;
-
-// Shortcut for calling a caster's `cast_op_type` cast operator for casting a type_caster to a T
-template <typename T> typename make_caster<T>::template cast_op_type<T> cast_op(make_caster<T> &caster) {
- return caster.operator typename make_caster<T>::template cast_op_type<T>();
-}
-template <typename T> typename make_caster<T>::template cast_op_type<typename std::add_rvalue_reference<T>::type>
-cast_op(make_caster<T> &&caster) {
- return std::move(caster).operator
- typename make_caster<T>::template cast_op_type<typename std::add_rvalue_reference<T>::type>();
-}
-
-template <typename type> class type_caster<std::reference_wrapper<type>> {
-private:
- using caster_t = make_caster<type>;
- caster_t subcaster;
- using subcaster_cast_op_type = typename caster_t::template cast_op_type<type>;
- static_assert(std::is_same<typename std::remove_const<type>::type &, subcaster_cast_op_type>::value,
- "std::reference_wrapper<T> caster requires T to have a caster with an `T &` operator");
-public:
- bool load(handle src, bool convert) { return subcaster.load(src, convert); }
- static constexpr auto name = caster_t::name;
- static handle cast(const std::reference_wrapper<type> &src, return_value_policy policy, handle parent) {
- // It is definitely wrong to take ownership of this pointer, so mask that rvp
- if (policy == return_value_policy::take_ownership || policy == return_value_policy::automatic)
- policy = return_value_policy::automatic_reference;
- return caster_t::cast(&src.get(), policy, parent);
- }
- template <typename T> using cast_op_type = std::reference_wrapper<type>;
- operator std::reference_wrapper<type>() { return subcaster.operator subcaster_cast_op_type&(); }
-};
-
-#define PYBIND11_TYPE_CASTER(type, py_name) \
- protected: \
- type value; \
- public: \
- static constexpr auto name = py_name; \
- template <typename T_, enable_if_t<std::is_same<type, remove_cv_t<T_>>::value, int> = 0> \
- static handle cast(T_ *src, return_value_policy policy, handle parent) { \
- if (!src) return none().release(); \
- if (policy == return_value_policy::take_ownership) { \
- auto h = cast(std::move(*src), policy, parent); delete src; return h; \
- } else { \
- return cast(*src, policy, parent); \
- } \
- } \
- operator type*() { return &value; } \
- operator type&() { return value; } \
- operator type&&() && { return std::move(value); } \
- template <typename T_> using cast_op_type = pybind11::detail::movable_cast_op_type<T_>
-
-
-template <typename CharT> using is_std_char_type = any_of<
- std::is_same<CharT, char>, /* std::string */
-#if defined(PYBIND11_HAS_U8STRING)
- std::is_same<CharT, char8_t>, /* std::u8string */
-#endif
- std::is_same<CharT, char16_t>, /* std::u16string */
- std::is_same<CharT, char32_t>, /* std::u32string */
- std::is_same<CharT, wchar_t> /* std::wstring */
->;
-
-
-template <typename T>
-struct type_caster<T, enable_if_t<std::is_arithmetic<T>::value && !is_std_char_type<T>::value>> {
- using _py_type_0 = conditional_t<sizeof(T) <= sizeof(long), long, long long>;
- using _py_type_1 = conditional_t<std::is_signed<T>::value, _py_type_0, typename std::make_unsigned<_py_type_0>::type>;
- using py_type = conditional_t<std::is_floating_point<T>::value, double, _py_type_1>;
-public:
-
- bool load(handle src, bool convert) {
- py_type py_value;
-
- if (!src)
- return false;
-
- if (std::is_floating_point<T>::value) {
- if (convert || PyFloat_Check(src.ptr()))
- py_value = (py_type) PyFloat_AsDouble(src.ptr());
- else
- return false;
- } else if (PyFloat_Check(src.ptr())) {
- return false;
- } else if (std::is_unsigned<py_type>::value) {
- py_value = as_unsigned<py_type>(src.ptr());
- } else { // signed integer:
- py_value = sizeof(T) <= sizeof(long)
- ? (py_type) PyLong_AsLong(src.ptr())
- : (py_type) PYBIND11_LONG_AS_LONGLONG(src.ptr());
- }
-
- // Python API reported an error
- bool py_err = py_value == (py_type) -1 && PyErr_Occurred();
-
- // Check to see if the conversion is valid (integers should match exactly)
- // Signed/unsigned checks happen elsewhere
- if (py_err || (std::is_integral<T>::value && sizeof(py_type) != sizeof(T) && py_value != (py_type) (T) py_value)) {
- bool type_error = py_err && PyErr_ExceptionMatches(
-#if PY_VERSION_HEX < 0x03000000 && !defined(PYPY_VERSION)
- PyExc_SystemError
-#else
- PyExc_TypeError
-#endif
- );
- PyErr_Clear();
- if (type_error && convert && PyNumber_Check(src.ptr())) {
- auto tmp = reinterpret_steal<object>(std::is_floating_point<T>::value
- ? PyNumber_Float(src.ptr())
- : PyNumber_Long(src.ptr()));
- PyErr_Clear();
- return load(tmp, false);
- }
- return false;
- }
-
- value = (T) py_value;
- return true;
- }
-
- template<typename U = T>
- static typename std::enable_if<std::is_floating_point<U>::value, handle>::type
- cast(U src, return_value_policy /* policy */, handle /* parent */) {
- return PyFloat_FromDouble((double) src);
- }
-
- template<typename U = T>
- static typename std::enable_if<!std::is_floating_point<U>::value && std::is_signed<U>::value && (sizeof(U) <= sizeof(long)), handle>::type
- cast(U src, return_value_policy /* policy */, handle /* parent */) {
- return PYBIND11_LONG_FROM_SIGNED((long) src);
- }
-
- template<typename U = T>
- static typename std::enable_if<!std::is_floating_point<U>::value && std::is_unsigned<U>::value && (sizeof(U) <= sizeof(unsigned long)), handle>::type
- cast(U src, return_value_policy /* policy */, handle /* parent */) {
- return PYBIND11_LONG_FROM_UNSIGNED((unsigned long) src);
- }
-
- template<typename U = T>
- static typename std::enable_if<!std::is_floating_point<U>::value && std::is_signed<U>::value && (sizeof(U) > sizeof(long)), handle>::type
- cast(U src, return_value_policy /* policy */, handle /* parent */) {
- return PyLong_FromLongLong((long long) src);
- }
-
- template<typename U = T>
- static typename std::enable_if<!std::is_floating_point<U>::value && std::is_unsigned<U>::value && (sizeof(U) > sizeof(unsigned long)), handle>::type
- cast(U src, return_value_policy /* policy */, handle /* parent */) {
- return PyLong_FromUnsignedLongLong((unsigned long long) src);
- }
-
- PYBIND11_TYPE_CASTER(T, _<std::is_integral<T>::value>("int", "float"));
-};
-
-template<typename T> struct void_caster {
-public:
- bool load(handle src, bool) {
- if (src && src.is_none())
- return true;
- return false;
- }
- static handle cast(T, return_value_policy /* policy */, handle /* parent */) {
- return none().inc_ref();
- }
- PYBIND11_TYPE_CASTER(T, _("None"));
-};
-
-template <> class type_caster<void_type> : public void_caster<void_type> {};
-
-template <> class type_caster<void> : public type_caster<void_type> {
-public:
- using type_caster<void_type>::cast;
-
- bool load(handle h, bool) {
- if (!h) {
- return false;
- } else if (h.is_none()) {
- value = nullptr;
- return true;
- }
-
- /* Check if this is a capsule */
- if (isinstance<capsule>(h)) {
- value = reinterpret_borrow<capsule>(h);
- return true;
- }
-
- /* Check if this is a C++ type */
- auto &bases = all_type_info((PyTypeObject *) type::handle_of(h).ptr());
- if (bases.size() == 1) { // Only allowing loading from a single-value type
- value = values_and_holders(reinterpret_cast<instance *>(h.ptr())).begin()->value_ptr();
- return true;
- }
-
- /* Fail */
- return false;
- }
-
- static handle cast(const void *ptr, return_value_policy /* policy */, handle /* parent */) {
- if (ptr)
- return capsule(ptr).release();
- else
- return none().inc_ref();
- }
-
- template <typename T> using cast_op_type = void*&;
- operator void *&() { return value; }
- static constexpr auto name = _("capsule");
-private:
- void *value = nullptr;
-};
-
-template <> class type_caster<std::nullptr_t> : public void_caster<std::nullptr_t> { };
-
-template <> class type_caster<bool> {
-public:
- bool load(handle src, bool convert) {
- if (!src) return false;
- else if (src.ptr() == Py_True) { value = true; return true; }
- else if (src.ptr() == Py_False) { value = false; return true; }
- else if (convert || !strcmp("numpy.bool_", Py_TYPE(src.ptr())->tp_name)) {
- // (allow non-implicit conversion for numpy booleans)
-
- Py_ssize_t res = -1;
- if (src.is_none()) {
- res = 0; // None is implicitly converted to False
- }
- #if defined(PYPY_VERSION)
- // On PyPy, check that "__bool__" (or "__nonzero__" on Python 2.7) attr exists
- else if (hasattr(src, PYBIND11_BOOL_ATTR)) {
- res = PyObject_IsTrue(src.ptr());
- }
- #else
- // Alternate approach for CPython: this does the same as the above, but optimized
- // using the CPython API so as to avoid an unneeded attribute lookup.
- else if (auto tp_as_number = src.ptr()->ob_type->tp_as_number) {
- if (PYBIND11_NB_BOOL(tp_as_number)) {
- res = (*PYBIND11_NB_BOOL(tp_as_number))(src.ptr());
- }
- }
- #endif
- if (res == 0 || res == 1) {
- value = (bool) res;
- return true;
- } else {
- PyErr_Clear();
- }
- }
- return false;
- }
- static handle cast(bool src, return_value_policy /* policy */, handle /* parent */) {
- return handle(src ? Py_True : Py_False).inc_ref();
- }
- PYBIND11_TYPE_CASTER(bool, _("bool"));
-};
-
-// Helper class for UTF-{8,16,32} C++ stl strings:
-template <typename StringType, bool IsView = false> struct string_caster {
- using CharT = typename StringType::value_type;
-
- // Simplify life by being able to assume standard char sizes (the standard only guarantees
- // minimums, but Python requires exact sizes)
- static_assert(!std::is_same<CharT, char>::value || sizeof(CharT) == 1, "Unsupported char size != 1");
-#if defined(PYBIND11_HAS_U8STRING)
- static_assert(!std::is_same<CharT, char8_t>::value || sizeof(CharT) == 1, "Unsupported char8_t size != 1");
-#endif
- static_assert(!std::is_same<CharT, char16_t>::value || sizeof(CharT) == 2, "Unsupported char16_t size != 2");
- static_assert(!std::is_same<CharT, char32_t>::value || sizeof(CharT) == 4, "Unsupported char32_t size != 4");
- // wchar_t can be either 16 bits (Windows) or 32 (everywhere else)
- static_assert(!std::is_same<CharT, wchar_t>::value || sizeof(CharT) == 2 || sizeof(CharT) == 4,
- "Unsupported wchar_t size != 2/4");
- static constexpr size_t UTF_N = 8 * sizeof(CharT);
-
- bool load(handle src, bool) {
-#if PY_MAJOR_VERSION < 3
- object temp;
-#endif
- handle load_src = src;
- if (!src) {
- return false;
- } else if (!PyUnicode_Check(load_src.ptr())) {
-#if PY_MAJOR_VERSION >= 3
- return load_bytes(load_src);
-#else
- if (std::is_same<CharT, char>::value) {
- return load_bytes(load_src);
- }
-
- // The below is a guaranteed failure in Python 3 when PyUnicode_Check returns false
- if (!PYBIND11_BYTES_CHECK(load_src.ptr()))
- return false;
-
- temp = reinterpret_steal<object>(PyUnicode_FromObject(load_src.ptr()));
- if (!temp) { PyErr_Clear(); return false; }
- load_src = temp;
-#endif
- }
-
- object utfNbytes = reinterpret_steal<object>(PyUnicode_AsEncodedString(
- load_src.ptr(), UTF_N == 8 ? "utf-8" : UTF_N == 16 ? "utf-16" : "utf-32", nullptr));
- if (!utfNbytes) { PyErr_Clear(); return false; }
-
- const auto *buffer = reinterpret_cast<const CharT *>(PYBIND11_BYTES_AS_STRING(utfNbytes.ptr()));
- size_t length = (size_t) PYBIND11_BYTES_SIZE(utfNbytes.ptr()) / sizeof(CharT);
- if (UTF_N > 8) { buffer++; length--; } // Skip BOM for UTF-16/32
- value = StringType(buffer, length);
-
- // If we're loading a string_view we need to keep the encoded Python object alive:
- if (IsView)
- loader_life_support::add_patient(utfNbytes);
-
- return true;
- }
-
- static handle cast(const StringType &src, return_value_policy /* policy */, handle /* parent */) {
- const char *buffer = reinterpret_cast<const char *>(src.data());
- auto nbytes = ssize_t(src.size() * sizeof(CharT));
- handle s = decode_utfN(buffer, nbytes);
- if (!s) throw error_already_set();
- return s;
- }
-
- PYBIND11_TYPE_CASTER(StringType, _(PYBIND11_STRING_NAME));
-
-private:
- static handle decode_utfN(const char *buffer, ssize_t nbytes) {
-#if !defined(PYPY_VERSION)
- return
- UTF_N == 8 ? PyUnicode_DecodeUTF8(buffer, nbytes, nullptr) :
- UTF_N == 16 ? PyUnicode_DecodeUTF16(buffer, nbytes, nullptr, nullptr) :
- PyUnicode_DecodeUTF32(buffer, nbytes, nullptr, nullptr);
-#else
- // PyPy segfaults when on PyUnicode_DecodeUTF16 (and possibly on PyUnicode_DecodeUTF32 as well),
- // so bypass the whole thing by just passing the encoding as a string value, which works properly:
- return PyUnicode_Decode(buffer, nbytes, UTF_N == 8 ? "utf-8" : UTF_N == 16 ? "utf-16" : "utf-32", nullptr);
-#endif
- }
-
- // When loading into a std::string or char*, accept a bytes object as-is (i.e.
- // without any encoding/decoding attempt). For other C++ char sizes this is a no-op.
- // which supports loading a unicode from a str, doesn't take this path.
- template <typename C = CharT>
- bool load_bytes(enable_if_t<std::is_same<C, char>::value, handle> src) {
- if (PYBIND11_BYTES_CHECK(src.ptr())) {
- // We were passed a Python 3 raw bytes; accept it into a std::string or char*
- // without any encoding attempt.
- const char *bytes = PYBIND11_BYTES_AS_STRING(src.ptr());
- if (bytes) {
- value = StringType(bytes, (size_t) PYBIND11_BYTES_SIZE(src.ptr()));
- return true;
- }
- }
-
- return false;
- }
-
- template <typename C = CharT>
- bool load_bytes(enable_if_t<!std::is_same<C, char>::value, handle>) { return false; }
-};
-
-template <typename CharT, class Traits, class Allocator>
-struct type_caster<std::basic_string<CharT, Traits, Allocator>, enable_if_t<is_std_char_type<CharT>::value>>
- : string_caster<std::basic_string<CharT, Traits, Allocator>> {};
-
-#ifdef PYBIND11_HAS_STRING_VIEW
-template <typename CharT, class Traits>
-struct type_caster<std::basic_string_view<CharT, Traits>, enable_if_t<is_std_char_type<CharT>::value>>
- : string_caster<std::basic_string_view<CharT, Traits>, true> {};
-#endif
-
-// Type caster for C-style strings. We basically use a std::string type caster, but also add the
-// ability to use None as a nullptr char* (which the string caster doesn't allow).
-template <typename CharT> struct type_caster<CharT, enable_if_t<is_std_char_type<CharT>::value>> {
- using StringType = std::basic_string<CharT>;
- using StringCaster = type_caster<StringType>;
- StringCaster str_caster;
- bool none = false;
- CharT one_char = 0;
-public:
- bool load(handle src, bool convert) {
- if (!src) return false;
- if (src.is_none()) {
- // Defer accepting None to other overloads (if we aren't in convert mode):
- if (!convert) return false;
- none = true;
- return true;
- }
- return str_caster.load(src, convert);
- }
-
- static handle cast(const CharT *src, return_value_policy policy, handle parent) {
- if (src == nullptr) return pybind11::none().inc_ref();
- return StringCaster::cast(StringType(src), policy, parent);
- }
-
- static handle cast(CharT src, return_value_policy policy, handle parent) {
- if (std::is_same<char, CharT>::value) {
- handle s = PyUnicode_DecodeLatin1((const char *) &src, 1, nullptr);
- if (!s) throw error_already_set();
- return s;
- }
- return StringCaster::cast(StringType(1, src), policy, parent);
- }
-
- operator CharT*() { return none ? nullptr : const_cast<CharT *>(static_cast<StringType &>(str_caster).c_str()); }
- operator CharT&() {
- if (none)
- throw value_error("Cannot convert None to a character");
-
- auto &value = static_cast<StringType &>(str_caster);
- size_t str_len = value.size();
- if (str_len == 0)
- throw value_error("Cannot convert empty string to a character");
-
- // If we're in UTF-8 mode, we have two possible failures: one for a unicode character that
- // is too high, and one for multiple unicode characters (caught later), so we need to figure
- // out how long the first encoded character is in bytes to distinguish between these two
- // errors. We also allow want to allow unicode characters U+0080 through U+00FF, as those
- // can fit into a single char value.
- if (StringCaster::UTF_N == 8 && str_len > 1 && str_len <= 4) {
- auto v0 = static_cast<unsigned char>(value[0]);
- size_t char0_bytes = !(v0 & 0x80) ? 1 : // low bits only: 0-127
- (v0 & 0xE0) == 0xC0 ? 2 : // 0b110xxxxx - start of 2-byte sequence
- (v0 & 0xF0) == 0xE0 ? 3 : // 0b1110xxxx - start of 3-byte sequence
- 4; // 0b11110xxx - start of 4-byte sequence
-
- if (char0_bytes == str_len) {
- // If we have a 128-255 value, we can decode it into a single char:
- if (char0_bytes == 2 && (v0 & 0xFC) == 0xC0) { // 0x110000xx 0x10xxxxxx
- one_char = static_cast<CharT>(((v0 & 3) << 6) + (static_cast<unsigned char>(value[1]) & 0x3F));
- return one_char;
- }
- // Otherwise we have a single character, but it's > U+00FF
- throw value_error("Character code point not in range(0x100)");
- }
- }
-
- // UTF-16 is much easier: we can only have a surrogate pair for values above U+FFFF, thus a
- // surrogate pair with total length 2 instantly indicates a range error (but not a "your
- // string was too long" error).
- else if (StringCaster::UTF_N == 16 && str_len == 2) {
- one_char = static_cast<CharT>(value[0]);
- if (one_char >= 0xD800 && one_char < 0xE000)
- throw value_error("Character code point not in range(0x10000)");
- }
-
- if (str_len != 1)
- throw value_error("Expected a character, but multi-character string found");
-
- one_char = value[0];
- return one_char;
- }
-
- static constexpr auto name = _(PYBIND11_STRING_NAME);
- template <typename _T> using cast_op_type = pybind11::detail::cast_op_type<_T>;
-};
-
-// Base implementation for std::tuple and std::pair
-template <template<typename...> class Tuple, typename... Ts> class tuple_caster {
- using type = Tuple<Ts...>;
- static constexpr auto size = sizeof...(Ts);
- using indices = make_index_sequence<size>;
-public:
-
- bool load(handle src, bool convert) {
- if (!isinstance<sequence>(src))
- return false;
- const auto seq = reinterpret_borrow<sequence>(src);
- if (seq.size() != size)
- return false;
- return load_impl(seq, convert, indices{});
- }
-
- template <typename T>
- static handle cast(T &&src, return_value_policy policy, handle parent) {
- return cast_impl(std::forward<T>(src), policy, parent, indices{});
- }
-
- // copied from the PYBIND11_TYPE_CASTER macro
- template <typename T>
- static handle cast(T *src, return_value_policy policy, handle parent) {
- if (!src) return none().release();
- if (policy == return_value_policy::take_ownership) {
- auto h = cast(std::move(*src), policy, parent); delete src; return h;
- } else {
- return cast(*src, policy, parent);
- }
- }
-
- static constexpr auto name = _("Tuple[") + concat(make_caster<Ts>::name...) + _("]");
-
- template <typename T> using cast_op_type = type;
-
- operator type() & { return implicit_cast(indices{}); }
- operator type() && { return std::move(*this).implicit_cast(indices{}); }
-
-protected:
- template <size_t... Is>
- type implicit_cast(index_sequence<Is...>) & { return type(cast_op<Ts>(std::get<Is>(subcasters))...); }
- template <size_t... Is>
- type implicit_cast(index_sequence<Is...>) && { return type(cast_op<Ts>(std::move(std::get<Is>(subcasters)))...); }
-
- static constexpr bool load_impl(const sequence &, bool, index_sequence<>) { return true; }
-
- template <size_t... Is>
- bool load_impl(const sequence &seq, bool convert, index_sequence<Is...>) {
-#ifdef __cpp_fold_expressions
- if ((... || !std::get<Is>(subcasters).load(seq[Is], convert)))
- return false;
-#else
- for (bool r : {std::get<Is>(subcasters).load(seq[Is], convert)...})
- if (!r)
- return false;
-#endif
- return true;
- }
-
- /* Implementation: Convert a C++ tuple into a Python tuple */
- template <typename T, size_t... Is>
- static handle cast_impl(T &&src, return_value_policy policy, handle parent, index_sequence<Is...>) {
- std::array<object, size> entries{{
- reinterpret_steal<object>(make_caster<Ts>::cast(std::get<Is>(std::forward<T>(src)), policy, parent))...
- }};
- for (const auto &entry: entries)
- if (!entry)
- return handle();
- tuple result(size);
- int counter = 0;
- for (auto & entry: entries)
- PyTuple_SET_ITEM(result.ptr(), counter++, entry.release().ptr());
- return result.release();
- }
-
- Tuple<make_caster<Ts>...> subcasters;
-};
-
-template <typename T1, typename T2> class type_caster<std::pair<T1, T2>>
- : public tuple_caster<std::pair, T1, T2> {};
-
-template <typename... Ts> class type_caster<std::tuple<Ts...>>
- : public tuple_caster<std::tuple, Ts...> {};
-
-/// Helper class which abstracts away certain actions. Users can provide specializations for
-/// custom holders, but it's only necessary if the type has a non-standard interface.
-template <typename T>
-struct holder_helper {
- static auto get(const T &p) -> decltype(p.get()) { return p.get(); }
-};
-
-/// Type caster for holder types like std::shared_ptr, etc.
-template <typename type, typename holder_type>
-struct copyable_holder_caster : public type_caster_base<type> {
-public:
- using base = type_caster_base<type>;
- static_assert(std::is_base_of<base, type_caster<type>>::value,
- "Holder classes are only supported for custom types");
- using base::base;
- using base::cast;
- using base::typeinfo;
- using base::value;
-
- bool load(handle src, bool convert) {
- return base::template load_impl<copyable_holder_caster<type, holder_type>>(src, convert);
- }
-
- explicit operator type*() { return this->value; }
- // static_cast works around compiler error with MSVC 17 and CUDA 10.2
- // see issue #2180
- explicit operator type&() { return *(static_cast<type *>(this->value)); }
- explicit operator holder_type*() { return std::addressof(holder); }
- explicit operator holder_type&() { return holder; }
-
- static handle cast(const holder_type &src, return_value_policy, handle) {
- const auto *ptr = holder_helper<holder_type>::get(src);
- return type_caster_base<type>::cast_holder(ptr, &src);
- }
-
-protected:
- friend class type_caster_generic;
- void check_holder_compat() {
- if (typeinfo->default_holder)
- throw cast_error("Unable to load a custom holder type from a default-holder instance");
- }
-
- bool load_value(value_and_holder &&v_h) {
- if (v_h.holder_constructed()) {
- value = v_h.value_ptr();
- holder = v_h.template holder<holder_type>();
- return true;
- } else {
- throw cast_error("Unable to cast from non-held to held instance (T& to Holder<T>) "
-#if defined(NDEBUG)
- "(compile in debug mode for type information)");
-#else
- "of type '" + type_id<holder_type>() + "''");
-#endif
- }
- }
-
- template <typename T = holder_type, detail::enable_if_t<!std::is_constructible<T, const T &, type*>::value, int> = 0>
- bool try_implicit_casts(handle, bool) { return false; }
-
- template <typename T = holder_type, detail::enable_if_t<std::is_constructible<T, const T &, type*>::value, int> = 0>
- bool try_implicit_casts(handle src, bool convert) {
- for (auto &cast : typeinfo->implicit_casts) {
- copyable_holder_caster sub_caster(*cast.first);
- if (sub_caster.load(src, convert)) {
- value = cast.second(sub_caster.value);
- holder = holder_type(sub_caster.holder, (type *) value);
- return true;
- }
- }
- return false;
- }
-
- static bool try_direct_conversions(handle) { return false; }
-
-
- holder_type holder;
-};
-
-/// Specialize for the common std::shared_ptr, so users don't need to
-template <typename T>
-class type_caster<std::shared_ptr<T>> : public copyable_holder_caster<T, std::shared_ptr<T>> { };
-
-template <typename type, typename holder_type>
-struct move_only_holder_caster {
- static_assert(std::is_base_of<type_caster_base<type>, type_caster<type>>::value,
- "Holder classes are only supported for custom types");
-
- static handle cast(holder_type &&src, return_value_policy, handle) {
- auto *ptr = holder_helper<holder_type>::get(src);
- return type_caster_base<type>::cast_holder(ptr, std::addressof(src));
- }
- static constexpr auto name = type_caster_base<type>::name;
-};
-
-template <typename type, typename deleter>
-class type_caster<std::unique_ptr<type, deleter>>
- : public move_only_holder_caster<type, std::unique_ptr<type, deleter>> { };
-
-template <typename type, typename holder_type>
-using type_caster_holder = conditional_t<is_copy_constructible<holder_type>::value,
- copyable_holder_caster<type, holder_type>,
- move_only_holder_caster<type, holder_type>>;
-
-template <typename T, bool Value = false> struct always_construct_holder { static constexpr bool value = Value; };
-
-/// Create a specialization for custom holder types (silently ignores std::shared_ptr)
-#define PYBIND11_DECLARE_HOLDER_TYPE(type, holder_type, ...) \
- namespace pybind11 { namespace detail { \
- template <typename type> \
- struct always_construct_holder<holder_type> : always_construct_holder<void, ##__VA_ARGS__> { }; \
- template <typename type> \
- class type_caster<holder_type, enable_if_t<!is_shared_ptr<holder_type>::value>> \
- : public type_caster_holder<type, holder_type> { }; \
- }}
-
-// PYBIND11_DECLARE_HOLDER_TYPE holder types:
-template <typename base, typename holder> struct is_holder_type :
- std::is_base_of<detail::type_caster_holder<base, holder>, detail::type_caster<holder>> {};
-// Specialization for always-supported unique_ptr holders:
-template <typename base, typename deleter> struct is_holder_type<base, std::unique_ptr<base, deleter>> :
- std::true_type {};
-
-template <typename T> struct handle_type_name { static constexpr auto name = _<T>(); };
-template <> struct handle_type_name<bytes> { static constexpr auto name = _(PYBIND11_BYTES_NAME); };
-template <> struct handle_type_name<int_> { static constexpr auto name = _("int"); };
-template <> struct handle_type_name<iterable> { static constexpr auto name = _("Iterable"); };
-template <> struct handle_type_name<iterator> { static constexpr auto name = _("Iterator"); };
-template <> struct handle_type_name<none> { static constexpr auto name = _("None"); };
-template <> struct handle_type_name<args> { static constexpr auto name = _("*args"); };
-template <> struct handle_type_name<kwargs> { static constexpr auto name = _("**kwargs"); };
-
-template <typename type>
-struct pyobject_caster {
- template <typename T = type, enable_if_t<std::is_same<T, handle>::value, int> = 0>
- bool load(handle src, bool /* convert */) { value = src; return static_cast<bool>(value); }
-
- template <typename T = type, enable_if_t<std::is_base_of<object, T>::value, int> = 0>
- bool load(handle src, bool /* convert */) {
- if (!isinstance<type>(src))
- return false;
- value = reinterpret_borrow<type>(src);
- return true;
- }
-
- static handle cast(const handle &src, return_value_policy /* policy */, handle /* parent */) {
- return src.inc_ref();
- }
- PYBIND11_TYPE_CASTER(type, handle_type_name<type>::name);
-};
-
-template <typename T>
-class type_caster<T, enable_if_t<is_pyobject<T>::value>> : public pyobject_caster<T> { };
-
-// Our conditions for enabling moving are quite restrictive:
-// At compile time:
-// - T needs to be a non-const, non-pointer, non-reference type
-// - type_caster<T>::operator T&() must exist
-// - the type must be move constructible (obviously)
-// At run-time:
-// - if the type is non-copy-constructible, the object must be the sole owner of the type (i.e. it
-// must have ref_count() == 1)h
-// If any of the above are not satisfied, we fall back to copying.
-template <typename T> using move_is_plain_type = satisfies_none_of<T,
- std::is_void, std::is_pointer, std::is_reference, std::is_const
->;
-template <typename T, typename SFINAE = void> struct move_always : std::false_type {};
-template <typename T> struct move_always<T, enable_if_t<all_of<
- move_is_plain_type<T>,
- negation<is_copy_constructible<T>>,
- std::is_move_constructible<T>,
- std::is_same<decltype(std::declval<make_caster<T>>().operator T&()), T&>
->::value>> : std::true_type {};
-template <typename T, typename SFINAE = void> struct move_if_unreferenced : std::false_type {};
-template <typename T> struct move_if_unreferenced<T, enable_if_t<all_of<
- move_is_plain_type<T>,
- negation<move_always<T>>,
- std::is_move_constructible<T>,
- std::is_same<decltype(std::declval<make_caster<T>>().operator T&()), T&>
->::value>> : std::true_type {};
-template <typename T> using move_never = none_of<move_always<T>, move_if_unreferenced<T>>;
-
-// Detect whether returning a `type` from a cast on type's type_caster is going to result in a
-// reference or pointer to a local variable of the type_caster. Basically, only
-// non-reference/pointer `type`s and reference/pointers from a type_caster_generic are safe;
-// everything else returns a reference/pointer to a local variable.
-template <typename type> using cast_is_temporary_value_reference = bool_constant<
- (std::is_reference<type>::value || std::is_pointer<type>::value) &&
- !std::is_base_of<type_caster_generic, make_caster<type>>::value &&
- !std::is_same<intrinsic_t<type>, void>::value
->;
-
-// When a value returned from a C++ function is being cast back to Python, we almost always want to
-// force `policy = move`, regardless of the return value policy the function/method was declared
-// with.
-template <typename Return, typename SFINAE = void> struct return_value_policy_override {
- static return_value_policy policy(return_value_policy p) { return p; }
-};
-
-template <typename Return> struct return_value_policy_override<Return,
- detail::enable_if_t<std::is_base_of<type_caster_generic, make_caster<Return>>::value, void>> {
- static return_value_policy policy(return_value_policy p) {
- return !std::is_lvalue_reference<Return>::value &&
- !std::is_pointer<Return>::value
- ? return_value_policy::move : p;
- }
-};
-
-// Basic python -> C++ casting; throws if casting fails
-template <typename T, typename SFINAE> type_caster<T, SFINAE> &load_type(type_caster<T, SFINAE> &conv, const handle &handle) {
- if (!conv.load(handle, true)) {
-#if defined(NDEBUG)
- throw cast_error("Unable to cast Python instance to C++ type (compile in debug mode for details)");
-#else
- throw cast_error("Unable to cast Python instance of type " +
- (std::string) str(type::handle_of(handle)) + " to C++ type '" + type_id<T>() + "'");
-#endif
- }
- return conv;
-}
-// Wrapper around the above that also constructs and returns a type_caster
-template <typename T> make_caster<T> load_type(const handle &handle) {
- make_caster<T> conv;
- load_type(conv, handle);
- return conv;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-// pytype -> C++ type
-template <typename T, detail::enable_if_t<!detail::is_pyobject<T>::value, int> = 0>
-T cast(const handle &handle) {
- using namespace detail;
- static_assert(!cast_is_temporary_value_reference<T>::value,
- "Unable to cast type to reference: value is local to type caster");
- return cast_op<T>(load_type<T>(handle));
-}
-
-// pytype -> pytype (calls converting constructor)
-template <typename T, detail::enable_if_t<detail::is_pyobject<T>::value, int> = 0>
-T cast(const handle &handle) { return T(reinterpret_borrow<object>(handle)); }
-
-// C++ type -> py::object
-template <typename T, detail::enable_if_t<!detail::is_pyobject<T>::value, int> = 0>
-object cast(T &&value, return_value_policy policy = return_value_policy::automatic_reference,
- handle parent = handle()) {
- using no_ref_T = typename std::remove_reference<T>::type;
- if (policy == return_value_policy::automatic)
- policy = std::is_pointer<no_ref_T>::value ? return_value_policy::take_ownership :
- std::is_lvalue_reference<T>::value ? return_value_policy::copy : return_value_policy::move;
- else if (policy == return_value_policy::automatic_reference)
- policy = std::is_pointer<no_ref_T>::value ? return_value_policy::reference :
- std::is_lvalue_reference<T>::value ? return_value_policy::copy : return_value_policy::move;
- return reinterpret_steal<object>(detail::make_caster<T>::cast(std::forward<T>(value), policy, parent));
-}
-
-template <typename T> T handle::cast() const { return pybind11::cast<T>(*this); }
-template <> inline void handle::cast() const { return; }
-
-template <typename T>
-detail::enable_if_t<!detail::move_never<T>::value, T> move(object &&obj) {
- if (obj.ref_count() > 1)
-#if defined(NDEBUG)
- throw cast_error("Unable to cast Python instance to C++ rvalue: instance has multiple references"
- " (compile in debug mode for details)");
-#else
- throw cast_error("Unable to move from Python " + (std::string) str(type::handle_of(obj)) +
- " instance to C++ " + type_id<T>() + " instance: instance has multiple references");
-#endif
-
- // Move into a temporary and return that, because the reference may be a local value of `conv`
- T ret = std::move(detail::load_type<T>(obj).operator T&());
- return ret;
-}
-
-// Calling cast() on an rvalue calls pybind11::cast with the object rvalue, which does:
-// - If we have to move (because T has no copy constructor), do it. This will fail if the moved
-// object has multiple references, but trying to copy will fail to compile.
-// - If both movable and copyable, check ref count: if 1, move; otherwise copy
-// - Otherwise (not movable), copy.
-template <typename T> detail::enable_if_t<detail::move_always<T>::value, T> cast(object &&object) {
- return move<T>(std::move(object));
-}
-template <typename T> detail::enable_if_t<detail::move_if_unreferenced<T>::value, T> cast(object &&object) {
- if (object.ref_count() > 1)
- return cast<T>(object);
- else
- return move<T>(std::move(object));
-}
-template <typename T> detail::enable_if_t<detail::move_never<T>::value, T> cast(object &&object) {
- return cast<T>(object);
-}
-
-template <typename T> T object::cast() const & { return pybind11::cast<T>(*this); }
-template <typename T> T object::cast() && { return pybind11::cast<T>(std::move(*this)); }
-template <> inline void object::cast() const & { return; }
-template <> inline void object::cast() && { return; }
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Declared in pytypes.h:
-template <typename T, enable_if_t<!is_pyobject<T>::value, int>>
-object object_or_cast(T &&o) { return pybind11::cast(std::forward<T>(o)); }
-
-struct override_unused {}; // Placeholder type for the unneeded (and dead code) static variable in the PYBIND11_OVERRIDE_OVERRIDE macro
-template <typename ret_type> using override_caster_t = conditional_t<
- cast_is_temporary_value_reference<ret_type>::value, make_caster<ret_type>, override_unused>;
-
-// Trampoline use: for reference/pointer types to value-converted values, we do a value cast, then
-// store the result in the given variable. For other types, this is a no-op.
-template <typename T> enable_if_t<cast_is_temporary_value_reference<T>::value, T> cast_ref(object &&o, make_caster<T> &caster) {
- return cast_op<T>(load_type(caster, o));
-}
-template <typename T> enable_if_t<!cast_is_temporary_value_reference<T>::value, T> cast_ref(object &&, override_unused &) {
- pybind11_fail("Internal error: cast_ref fallback invoked"); }
-
-// Trampoline use: Having a pybind11::cast with an invalid reference type is going to static_assert, even
-// though if it's in dead code, so we provide a "trampoline" to pybind11::cast that only does anything in
-// cases where pybind11::cast is valid.
-template <typename T> enable_if_t<!cast_is_temporary_value_reference<T>::value, T> cast_safe(object &&o) {
- return pybind11::cast<T>(std::move(o)); }
-template <typename T> enable_if_t<cast_is_temporary_value_reference<T>::value, T> cast_safe(object &&) {
- pybind11_fail("Internal error: cast_safe fallback invoked"); }
-template <> inline void cast_safe<void>(object &&) {}
-
-PYBIND11_NAMESPACE_END(detail)
-
-template <return_value_policy policy = return_value_policy::automatic_reference>
-tuple make_tuple() { return tuple(0); }
-
-template <return_value_policy policy = return_value_policy::automatic_reference,
- typename... Args> tuple make_tuple(Args&&... args_) {
- constexpr size_t size = sizeof...(Args);
- std::array<object, size> args {
- { reinterpret_steal<object>(detail::make_caster<Args>::cast(
- std::forward<Args>(args_), policy, nullptr))... }
- };
- for (size_t i = 0; i < args.size(); i++) {
- if (!args[i]) {
-#if defined(NDEBUG)
- throw cast_error("make_tuple(): unable to convert arguments to Python object (compile in debug mode for details)");
-#else
- std::array<std::string, size> argtypes { {type_id<Args>()...} };
- throw cast_error("make_tuple(): unable to convert argument of type '" +
- argtypes[i] + "' to Python object");
-#endif
- }
- }
- tuple result(size);
- int counter = 0;
- for (auto &arg_value : args)
- PyTuple_SET_ITEM(result.ptr(), counter++, arg_value.release().ptr());
- return result;
-}
-
-/// \ingroup annotations
-/// Annotation for arguments
-struct arg {
- /// Constructs an argument with the name of the argument; if null or omitted, this is a positional argument.
- constexpr explicit arg(const char *name = nullptr) : name(name), flag_noconvert(false), flag_none(true) { }
- /// Assign a value to this argument
- template <typename T> arg_v operator=(T &&value) const;
- /// Indicate that the type should not be converted in the type caster
- arg &noconvert(bool flag = true) { flag_noconvert = flag; return *this; }
- /// Indicates that the argument should/shouldn't allow None (e.g. for nullable pointer args)
- arg &none(bool flag = true) { flag_none = flag; return *this; }
-
- const char *name; ///< If non-null, this is a named kwargs argument
- bool flag_noconvert : 1; ///< If set, do not allow conversion (requires a supporting type caster!)
- bool flag_none : 1; ///< If set (the default), allow None to be passed to this argument
-};
-
-/// \ingroup annotations
-/// Annotation for arguments with values
-struct arg_v : arg {
-private:
- template <typename T>
- arg_v(arg &&base, T &&x, const char *descr = nullptr)
- : arg(base),
- value(reinterpret_steal<object>(
- detail::make_caster<T>::cast(x, return_value_policy::automatic, {})
- )),
- descr(descr)
-#if !defined(NDEBUG)
- , type(type_id<T>())
-#endif
- { }
-
-public:
- /// Direct construction with name, default, and description
- template <typename T>
- arg_v(const char *name, T &&x, const char *descr = nullptr)
- : arg_v(arg(name), std::forward<T>(x), descr) { }
-
- /// Called internally when invoking `py::arg("a") = value`
- template <typename T>
- arg_v(const arg &base, T &&x, const char *descr = nullptr)
- : arg_v(arg(base), std::forward<T>(x), descr) { }
-
- /// Same as `arg::noconvert()`, but returns *this as arg_v&, not arg&
- arg_v &noconvert(bool flag = true) { arg::noconvert(flag); return *this; }
-
- /// Same as `arg::nonone()`, but returns *this as arg_v&, not arg&
- arg_v &none(bool flag = true) { arg::none(flag); return *this; }
-
- /// The default value
- object value;
- /// The (optional) description of the default value
- const char *descr;
-#if !defined(NDEBUG)
- /// The C++ type name of the default value (only available when compiled in debug mode)
- std::string type;
-#endif
-};
-
-/// \ingroup annotations
-/// Annotation indicating that all following arguments are keyword-only; the is the equivalent of an
-/// unnamed '*' argument (in Python 3)
-struct kw_only {};
-
-/// \ingroup annotations
-/// Annotation indicating that all previous arguments are positional-only; the is the equivalent of an
-/// unnamed '/' argument (in Python 3.8)
-struct pos_only {};
-
-template <typename T>
-arg_v arg::operator=(T &&value) const { return {std::move(*this), std::forward<T>(value)}; }
-
-/// Alias for backward compatibility -- to be removed in version 2.0
-template <typename /*unused*/> using arg_t = arg_v;
-
-inline namespace literals {
-/** \rst
- String literal version of `arg`
- \endrst */
-constexpr arg operator"" _a(const char *name, size_t) { return arg(name); }
-} // namespace literals
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// forward declaration (definition in attr.h)
-struct function_record;
-
-/// Internal data associated with a single function call
-struct function_call {
- function_call(const function_record &f, handle p); // Implementation in attr.h
-
- /// The function data:
- const function_record &func;
-
- /// Arguments passed to the function:
- std::vector<handle> args;
-
- /// The `convert` value the arguments should be loaded with
- std::vector<bool> args_convert;
-
- /// Extra references for the optional `py::args` and/or `py::kwargs` arguments (which, if
- /// present, are also in `args` but without a reference).
- object args_ref, kwargs_ref;
-
- /// The parent, if any
- handle parent;
-
- /// If this is a call to an initializer, this argument contains `self`
- handle init_self;
-};
-
-
-/// Helper class which loads arguments for C++ functions called from Python
-template <typename... Args>
-class argument_loader {
- using indices = make_index_sequence<sizeof...(Args)>;
-
- template <typename Arg> using argument_is_args = std::is_same<intrinsic_t<Arg>, args>;
- template <typename Arg> using argument_is_kwargs = std::is_same<intrinsic_t<Arg>, kwargs>;
- // Get args/kwargs argument positions relative to the end of the argument list:
- static constexpr auto args_pos = constexpr_first<argument_is_args, Args...>() - (int) sizeof...(Args),
- kwargs_pos = constexpr_first<argument_is_kwargs, Args...>() - (int) sizeof...(Args);
-
- static constexpr bool args_kwargs_are_last = kwargs_pos >= - 1 && args_pos >= kwargs_pos - 1;
-
- static_assert(args_kwargs_are_last, "py::args/py::kwargs are only permitted as the last argument(s) of a function");
-
-public:
- static constexpr bool has_kwargs = kwargs_pos < 0;
- static constexpr bool has_args = args_pos < 0;
-
- static constexpr auto arg_names = concat(type_descr(make_caster<Args>::name)...);
-
- bool load_args(function_call &call) {
- return load_impl_sequence(call, indices{});
- }
-
- template <typename Return, typename Guard, typename Func>
- enable_if_t<!std::is_void<Return>::value, Return> call(Func &&f) && {
- return std::move(*this).template call_impl<Return>(std::forward<Func>(f), indices{}, Guard{});
- }
-
- template <typename Return, typename Guard, typename Func>
- enable_if_t<std::is_void<Return>::value, void_type> call(Func &&f) && {
- std::move(*this).template call_impl<Return>(std::forward<Func>(f), indices{}, Guard{});
- return void_type();
- }
-
-private:
-
- static bool load_impl_sequence(function_call &, index_sequence<>) { return true; }
-
- template <size_t... Is>
- bool load_impl_sequence(function_call &call, index_sequence<Is...>) {
-#ifdef __cpp_fold_expressions
- if ((... || !std::get<Is>(argcasters).load(call.args[Is], call.args_convert[Is])))
- return false;
-#else
- for (bool r : {std::get<Is>(argcasters).load(call.args[Is], call.args_convert[Is])...})
- if (!r)
- return false;
-#endif
- return true;
- }
-
- template <typename Return, typename Func, size_t... Is, typename Guard>
- Return call_impl(Func &&f, index_sequence<Is...>, Guard &&) && {
- return std::forward<Func>(f)(cast_op<Args>(std::move(std::get<Is>(argcasters)))...);
- }
-
- std::tuple<make_caster<Args>...> argcasters;
-};
-
-/// Helper class which collects only positional arguments for a Python function call.
-/// A fancier version below can collect any argument, but this one is optimal for simple calls.
-template <return_value_policy policy>
-class simple_collector {
-public:
- template <typename... Ts>
- explicit simple_collector(Ts &&...values)
- : m_args(pybind11::make_tuple<policy>(std::forward<Ts>(values)...)) { }
-
- const tuple &args() const & { return m_args; }
- dict kwargs() const { return {}; }
-
- tuple args() && { return std::move(m_args); }
-
- /// Call a Python function and pass the collected arguments
- object call(PyObject *ptr) const {
- PyObject *result = PyObject_CallObject(ptr, m_args.ptr());
- if (!result)
- throw error_already_set();
- return reinterpret_steal<object>(result);
- }
-
-private:
- tuple m_args;
-};
-
-/// Helper class which collects positional, keyword, * and ** arguments for a Python function call
-template <return_value_policy policy>
-class unpacking_collector {
-public:
- template <typename... Ts>
- explicit unpacking_collector(Ts &&...values) {
- // Tuples aren't (easily) resizable so a list is needed for collection,
- // but the actual function call strictly requires a tuple.
- auto args_list = list();
- int _[] = { 0, (process(args_list, std::forward<Ts>(values)), 0)... };
- ignore_unused(_);
-
- m_args = std::move(args_list);
- }
-
- const tuple &args() const & { return m_args; }
- const dict &kwargs() const & { return m_kwargs; }
-
- tuple args() && { return std::move(m_args); }
- dict kwargs() && { return std::move(m_kwargs); }
-
- /// Call a Python function and pass the collected arguments
- object call(PyObject *ptr) const {
- PyObject *result = PyObject_Call(ptr, m_args.ptr(), m_kwargs.ptr());
- if (!result)
- throw error_already_set();
- return reinterpret_steal<object>(result);
- }
-
-private:
- template <typename T>
- void process(list &args_list, T &&x) {
- auto o = reinterpret_steal<object>(detail::make_caster<T>::cast(std::forward<T>(x), policy, {}));
- if (!o) {
-#if defined(NDEBUG)
- argument_cast_error();
-#else
- argument_cast_error(std::to_string(args_list.size()), type_id<T>());
-#endif
- }
- args_list.append(o);
- }
-
- void process(list &args_list, detail::args_proxy ap) {
- for (auto a : ap)
- args_list.append(a);
- }
-
- void process(list &/*args_list*/, arg_v a) {
- if (!a.name)
-#if defined(NDEBUG)
- nameless_argument_error();
-#else
- nameless_argument_error(a.type);
-#endif
-
- if (m_kwargs.contains(a.name)) {
-#if defined(NDEBUG)
- multiple_values_error();
-#else
- multiple_values_error(a.name);
-#endif
- }
- if (!a.value) {
-#if defined(NDEBUG)
- argument_cast_error();
-#else
- argument_cast_error(a.name, a.type);
-#endif
- }
- m_kwargs[a.name] = a.value;
- }
-
- void process(list &/*args_list*/, detail::kwargs_proxy kp) {
- if (!kp)
- return;
- for (auto k : reinterpret_borrow<dict>(kp)) {
- if (m_kwargs.contains(k.first)) {
-#if defined(NDEBUG)
- multiple_values_error();
-#else
- multiple_values_error(str(k.first));
-#endif
- }
- m_kwargs[k.first] = k.second;
- }
- }
-
- [[noreturn]] static void nameless_argument_error() {
- throw type_error("Got kwargs without a name; only named arguments "
- "may be passed via py::arg() to a python function call. "
- "(compile in debug mode for details)");
- }
- [[noreturn]] static void nameless_argument_error(std::string type) {
- throw type_error("Got kwargs without a name of type '" + type + "'; only named "
- "arguments may be passed via py::arg() to a python function call. ");
- }
- [[noreturn]] static void multiple_values_error() {
- throw type_error("Got multiple values for keyword argument "
- "(compile in debug mode for details)");
- }
-
- [[noreturn]] static void multiple_values_error(std::string name) {
- throw type_error("Got multiple values for keyword argument '" + name + "'");
- }
-
- [[noreturn]] static void argument_cast_error() {
- throw cast_error("Unable to convert call argument to Python object "
- "(compile in debug mode for details)");
- }
-
- [[noreturn]] static void argument_cast_error(std::string name, std::string type) {
- throw cast_error("Unable to convert call argument '" + name
- + "' of type '" + type + "' to Python object");
- }
-
-private:
- tuple m_args;
- dict m_kwargs;
-};
-
-/// Collect only positional arguments for a Python function call
-template <return_value_policy policy, typename... Args,
- typename = enable_if_t<all_of<is_positional<Args>...>::value>>
-simple_collector<policy> collect_arguments(Args &&...args) {
- return simple_collector<policy>(std::forward<Args>(args)...);
-}
-
-/// Collect all arguments, including keywords and unpacking (only instantiated when needed)
-template <return_value_policy policy, typename... Args,
- typename = enable_if_t<!all_of<is_positional<Args>...>::value>>
-unpacking_collector<policy> collect_arguments(Args &&...args) {
- // Following argument order rules for generalized unpacking according to PEP 448
- static_assert(
- constexpr_last<is_positional, Args...>() < constexpr_first<is_keyword_or_ds, Args...>()
- && constexpr_last<is_s_unpacking, Args...>() < constexpr_first<is_ds_unpacking, Args...>(),
- "Invalid function call: positional args must precede keywords and ** unpacking; "
- "* unpacking must precede ** unpacking"
- );
- return unpacking_collector<policy>(std::forward<Args>(args)...);
-}
-
-template <typename Derived>
-template <return_value_policy policy, typename... Args>
-object object_api<Derived>::operator()(Args &&...args) const {
- return detail::collect_arguments<policy>(std::forward<Args>(args)...).call(derived().ptr());
-}
-
-template <typename Derived>
-template <return_value_policy policy, typename... Args>
-object object_api<Derived>::call(Args &&...args) const {
- return operator()<policy>(std::forward<Args>(args)...);
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-
-template<typename T>
-handle type::handle_of() {
- static_assert(
- std::is_base_of<detail::type_caster_generic, detail::make_caster<T>>::value,
- "py::type::of<T> only supports the case where T is a registered C++ types."
- );
-
- return detail::get_type_handle(typeid(T), true);
-}
-
-
-#define PYBIND11_MAKE_OPAQUE(...) \
- namespace pybind11 { namespace detail { \
- template<> class type_caster<__VA_ARGS__> : public type_caster_base<__VA_ARGS__> { }; \
- }}
-
-/// Lets you pass a type containing a `,` through a macro parameter without needing a separate
-/// typedef, e.g.: `PYBIND11_OVERRIDE(PYBIND11_TYPE(ReturnType<A, B>), PYBIND11_TYPE(Parent<C, D>), f, arg)`
-#define PYBIND11_TYPE(...) __VA_ARGS__
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/chrono.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/chrono.h
deleted file mode 100644
index cbe9acec35f476a18bbecb3f266a85b554919b47..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/chrono.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- pybind11/chrono.h: Transparent conversion between std::chrono and python's datetime
-
- Copyright (c) 2016 Trent Houliston <trent@houliston.me> and
- Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-#include <cmath>
-#include <ctime>
-#include <chrono>
-#include <datetime.h>
-
-// Backport the PyDateTime_DELTA functions from Python3.3 if required
-#ifndef PyDateTime_DELTA_GET_DAYS
-#define PyDateTime_DELTA_GET_DAYS(o) (((PyDateTime_Delta*)o)->days)
-#endif
-#ifndef PyDateTime_DELTA_GET_SECONDS
-#define PyDateTime_DELTA_GET_SECONDS(o) (((PyDateTime_Delta*)o)->seconds)
-#endif
-#ifndef PyDateTime_DELTA_GET_MICROSECONDS
-#define PyDateTime_DELTA_GET_MICROSECONDS(o) (((PyDateTime_Delta*)o)->microseconds)
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename type> class duration_caster {
-public:
- typedef typename type::rep rep;
- using period = typename type::period;
-
- using days = std::chrono::duration<uint_fast32_t, std::ratio<86400>>;
-
- bool load(handle src, bool) {
- using namespace std::chrono;
-
- // Lazy initialise the PyDateTime import
- if (!PyDateTimeAPI) { PyDateTime_IMPORT; }
-
- if (!src) return false;
- // If invoked with datetime.delta object
- if (PyDelta_Check(src.ptr())) {
- value = type(duration_cast<duration<rep, period>>(
- days(PyDateTime_DELTA_GET_DAYS(src.ptr()))
- + seconds(PyDateTime_DELTA_GET_SECONDS(src.ptr()))
- + microseconds(PyDateTime_DELTA_GET_MICROSECONDS(src.ptr()))));
- return true;
- }
- // If invoked with a float we assume it is seconds and convert
- else if (PyFloat_Check(src.ptr())) {
- value = type(duration_cast<duration<rep, period>>(duration<double>(PyFloat_AsDouble(src.ptr()))));
- return true;
- }
- else return false;
- }
-
- // If this is a duration just return it back
- static const std::chrono::duration<rep, period>& get_duration(const std::chrono::duration<rep, period> &src) {
- return src;
- }
-
- // If this is a time_point get the time_since_epoch
- template <typename Clock> static std::chrono::duration<rep, period> get_duration(const std::chrono::time_point<Clock, std::chrono::duration<rep, period>> &src) {
- return src.time_since_epoch();
- }
-
- static handle cast(const type &src, return_value_policy /* policy */, handle /* parent */) {
- using namespace std::chrono;
-
- // Use overloaded function to get our duration from our source
- // Works out if it is a duration or time_point and get the duration
- auto d = get_duration(src);
-
- // Lazy initialise the PyDateTime import
- if (!PyDateTimeAPI) { PyDateTime_IMPORT; }
-
- // Declare these special duration types so the conversions happen with the correct primitive types (int)
- using dd_t = duration<int, std::ratio<86400>>;
- using ss_t = duration<int, std::ratio<1>>;
- using us_t = duration<int, std::micro>;
-
- auto dd = duration_cast<dd_t>(d);
- auto subd = d - dd;
- auto ss = duration_cast<ss_t>(subd);
- auto us = duration_cast<us_t>(subd - ss);
- return PyDelta_FromDSU(dd.count(), ss.count(), us.count());
- }
-
- PYBIND11_TYPE_CASTER(type, _("datetime.timedelta"));
-};
-
-// This is for casting times on the system clock into datetime.datetime instances
-template <typename Duration> class type_caster<std::chrono::time_point<std::chrono::system_clock, Duration>> {
-public:
- using type = std::chrono::time_point<std::chrono::system_clock, Duration>;
- bool load(handle src, bool) {
- using namespace std::chrono;
-
- // Lazy initialise the PyDateTime import
- if (!PyDateTimeAPI) { PyDateTime_IMPORT; }
-
- if (!src) return false;
-
- std::tm cal;
- microseconds msecs;
-
- if (PyDateTime_Check(src.ptr())) {
- cal.tm_sec = PyDateTime_DATE_GET_SECOND(src.ptr());
- cal.tm_min = PyDateTime_DATE_GET_MINUTE(src.ptr());
- cal.tm_hour = PyDateTime_DATE_GET_HOUR(src.ptr());
- cal.tm_mday = PyDateTime_GET_DAY(src.ptr());
- cal.tm_mon = PyDateTime_GET_MONTH(src.ptr()) - 1;
- cal.tm_year = PyDateTime_GET_YEAR(src.ptr()) - 1900;
- cal.tm_isdst = -1;
- msecs = microseconds(PyDateTime_DATE_GET_MICROSECOND(src.ptr()));
- } else if (PyDate_Check(src.ptr())) {
- cal.tm_sec = 0;
- cal.tm_min = 0;
- cal.tm_hour = 0;
- cal.tm_mday = PyDateTime_GET_DAY(src.ptr());
- cal.tm_mon = PyDateTime_GET_MONTH(src.ptr()) - 1;
- cal.tm_year = PyDateTime_GET_YEAR(src.ptr()) - 1900;
- cal.tm_isdst = -1;
- msecs = microseconds(0);
- } else if (PyTime_Check(src.ptr())) {
- cal.tm_sec = PyDateTime_TIME_GET_SECOND(src.ptr());
- cal.tm_min = PyDateTime_TIME_GET_MINUTE(src.ptr());
- cal.tm_hour = PyDateTime_TIME_GET_HOUR(src.ptr());
- cal.tm_mday = 1; // This date (day, month, year) = (1, 0, 70)
- cal.tm_mon = 0; // represents 1-Jan-1970, which is the first
- cal.tm_year = 70; // earliest available date for Python's datetime
- cal.tm_isdst = -1;
- msecs = microseconds(PyDateTime_TIME_GET_MICROSECOND(src.ptr()));
- }
- else return false;
-
- value = time_point_cast<Duration>(system_clock::from_time_t(std::mktime(&cal)) + msecs);
- return true;
- }
-
- static handle cast(const std::chrono::time_point<std::chrono::system_clock, Duration> &src, return_value_policy /* policy */, handle /* parent */) {
- using namespace std::chrono;
-
- // Lazy initialise the PyDateTime import
- if (!PyDateTimeAPI) { PyDateTime_IMPORT; }
-
- // Get out microseconds, and make sure they are positive, to avoid bug in eastern hemisphere time zones
- // (cfr. https://github.com/pybind/pybind11/issues/2417)
- using us_t = duration<int, std::micro>;
- auto us = duration_cast<us_t>(src.time_since_epoch() % seconds(1));
- if (us.count() < 0)
- us += seconds(1);
-
- // Subtract microseconds BEFORE `system_clock::to_time_t`, because:
- // > If std::time_t has lower precision, it is implementation-defined whether the value is rounded or truncated.
- // (https://en.cppreference.com/w/cpp/chrono/system_clock/to_time_t)
- std::time_t tt = system_clock::to_time_t(time_point_cast<system_clock::duration>(src - us));
- // this function uses static memory so it's best to copy it out asap just in case
- // otherwise other code that is using localtime may break this (not just python code)
- std::tm localtime = *std::localtime(&tt);
-
- return PyDateTime_FromDateAndTime(localtime.tm_year + 1900,
- localtime.tm_mon + 1,
- localtime.tm_mday,
- localtime.tm_hour,
- localtime.tm_min,
- localtime.tm_sec,
- us.count());
- }
- PYBIND11_TYPE_CASTER(type, _("datetime.datetime"));
-};
-
-// Other clocks that are not the system clock are not measured as datetime.datetime objects
-// since they are not measured on calendar time. So instead we just make them timedeltas
-// Or if they have passed us a time as a float we convert that
-template <typename Clock, typename Duration> class type_caster<std::chrono::time_point<Clock, Duration>>
-: public duration_caster<std::chrono::time_point<Clock, Duration>> {
-};
-
-template <typename Rep, typename Period> class type_caster<std::chrono::duration<Rep, Period>>
-: public duration_caster<std::chrono::duration<Rep, Period>> {
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/common.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/common.h
deleted file mode 100644
index 6c8a4f1e88e493ee08d24e668639c8d495fd49b1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/common.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "detail/common.h"
-#warning "Including 'common.h' is deprecated. It will be removed in v3.0. Use 'pybind11.h'."
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/complex.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/complex.h
deleted file mode 100644
index f8327eb37307490b658becf3d151132ddb5df531..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/complex.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- pybind11/complex.h: Complex number support
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-#include <complex>
-
-/// glibc defines I as a macro which breaks things, e.g., boost template names
-#ifdef I
-# undef I
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-template <typename T> struct format_descriptor<std::complex<T>, detail::enable_if_t<std::is_floating_point<T>::value>> {
- static constexpr const char c = format_descriptor<T>::c;
- static constexpr const char value[3] = { 'Z', c, '\0' };
- static std::string format() { return std::string(value); }
-};
-
-#ifndef PYBIND11_CPP17
-
-template <typename T> constexpr const char format_descriptor<
- std::complex<T>, detail::enable_if_t<std::is_floating_point<T>::value>>::value[3];
-
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename T> struct is_fmt_numeric<std::complex<T>, detail::enable_if_t<std::is_floating_point<T>::value>> {
- static constexpr bool value = true;
- static constexpr int index = is_fmt_numeric<T>::index + 3;
-};
-
-template <typename T> class type_caster<std::complex<T>> {
-public:
- bool load(handle src, bool convert) {
- if (!src)
- return false;
- if (!convert && !PyComplex_Check(src.ptr()))
- return false;
- Py_complex result = PyComplex_AsCComplex(src.ptr());
- if (result.real == -1.0 && PyErr_Occurred()) {
- PyErr_Clear();
- return false;
- }
- value = std::complex<T>((T) result.real, (T) result.imag);
- return true;
- }
-
- static handle cast(const std::complex<T> &src, return_value_policy /* policy */, handle /* parent */) {
- return PyComplex_FromDoubles((double) src.real(), (double) src.imag());
- }
-
- PYBIND11_TYPE_CASTER(std::complex<T>, _("complex"));
-};
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/class.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/class.h
deleted file mode 100644
index 569c5415d6c589a9116460a2b03883db257cdd83..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/class.h
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- pybind11/detail/class.h: Python C API implementation details for py::class_
-
- Copyright (c) 2017 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "../attr.h"
-#include "../options.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-#if PY_VERSION_HEX >= 0x03030000 && !defined(PYPY_VERSION)
-# define PYBIND11_BUILTIN_QUALNAME
-# define PYBIND11_SET_OLDPY_QUALNAME(obj, nameobj)
-#else
-// In pre-3.3 Python, we still set __qualname__ so that we can produce reliable function type
-// signatures; in 3.3+ this macro expands to nothing:
-# define PYBIND11_SET_OLDPY_QUALNAME(obj, nameobj) setattr((PyObject *) obj, "__qualname__", nameobj)
-#endif
-
-inline std::string get_fully_qualified_tp_name(PyTypeObject *type) {
-#if !defined(PYPY_VERSION)
- return type->tp_name;
-#else
- auto module_name = handle((PyObject *) type).attr("__module__").cast<std::string>();
- if (module_name == PYBIND11_BUILTINS_MODULE)
- return type->tp_name;
- else
- return std::move(module_name) + "." + type->tp_name;
-#endif
-}
-
-inline PyTypeObject *type_incref(PyTypeObject *type) {
- Py_INCREF(type);
- return type;
-}
-
-#if !defined(PYPY_VERSION)
-
-/// `pybind11_static_property.__get__()`: Always pass the class instead of the instance.
-extern "C" inline PyObject *pybind11_static_get(PyObject *self, PyObject * /*ob*/, PyObject *cls) {
- return PyProperty_Type.tp_descr_get(self, cls, cls);
-}
-
-/// `pybind11_static_property.__set__()`: Just like the above `__get__()`.
-extern "C" inline int pybind11_static_set(PyObject *self, PyObject *obj, PyObject *value) {
- PyObject *cls = PyType_Check(obj) ? obj : (PyObject *) Py_TYPE(obj);
- return PyProperty_Type.tp_descr_set(self, cls, value);
-}
-
-/** A `static_property` is the same as a `property` but the `__get__()` and `__set__()`
- methods are modified to always use the object type instead of a concrete instance.
- Return value: New reference. */
-inline PyTypeObject *make_static_property_type() {
- constexpr auto *name = "pybind11_static_property";
- auto name_obj = reinterpret_steal<object>(PYBIND11_FROM_STRING(name));
-
- /* Danger zone: from now (and until PyType_Ready), make sure to
- issue no Python C API calls which could potentially invoke the
- garbage collector (the GC will call type_traverse(), which will in
- turn find the newly constructed type in an invalid state) */
- auto heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
- if (!heap_type)
- pybind11_fail("make_static_property_type(): error allocating type!");
-
- heap_type->ht_name = name_obj.inc_ref().ptr();
-#ifdef PYBIND11_BUILTIN_QUALNAME
- heap_type->ht_qualname = name_obj.inc_ref().ptr();
-#endif
-
- auto type = &heap_type->ht_type;
- type->tp_name = name;
- type->tp_base = type_incref(&PyProperty_Type);
- type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
- type->tp_descr_get = pybind11_static_get;
- type->tp_descr_set = pybind11_static_set;
-
- if (PyType_Ready(type) < 0)
- pybind11_fail("make_static_property_type(): failure in PyType_Ready()!");
-
- setattr((PyObject *) type, "__module__", str("pybind11_builtins"));
- PYBIND11_SET_OLDPY_QUALNAME(type, name_obj);
-
- return type;
-}
-
-#else // PYPY
-
-/** PyPy has some issues with the above C API, so we evaluate Python code instead.
- This function will only be called once so performance isn't really a concern.
- Return value: New reference. */
-inline PyTypeObject *make_static_property_type() {
- auto d = dict();
- PyObject *result = PyRun_String(R"(\
- class pybind11_static_property(property):
- def __get__(self, obj, cls):
- return property.__get__(self, cls, cls)
-
- def __set__(self, obj, value):
- cls = obj if isinstance(obj, type) else type(obj)
- property.__set__(self, cls, value)
- )", Py_file_input, d.ptr(), d.ptr()
- );
- if (result == nullptr)
- throw error_already_set();
- Py_DECREF(result);
- return (PyTypeObject *) d["pybind11_static_property"].cast<object>().release().ptr();
-}
-
-#endif // PYPY
-
-/** Types with static properties need to handle `Type.static_prop = x` in a specific way.
- By default, Python replaces the `static_property` itself, but for wrapped C++ types
- we need to call `static_property.__set__()` in order to propagate the new value to
- the underlying C++ data structure. */
-extern "C" inline int pybind11_meta_setattro(PyObject* obj, PyObject* name, PyObject* value) {
- // Use `_PyType_Lookup()` instead of `PyObject_GetAttr()` in order to get the raw
- // descriptor (`property`) instead of calling `tp_descr_get` (`property.__get__()`).
- PyObject *descr = _PyType_Lookup((PyTypeObject *) obj, name);
-
- // The following assignment combinations are possible:
- // 1. `Type.static_prop = value` --> descr_set: `Type.static_prop.__set__(value)`
- // 2. `Type.static_prop = other_static_prop` --> setattro: replace existing `static_prop`
- // 3. `Type.regular_attribute = value` --> setattro: regular attribute assignment
- const auto static_prop = (PyObject *) get_internals().static_property_type;
- const auto call_descr_set = descr && PyObject_IsInstance(descr, static_prop)
- && !PyObject_IsInstance(value, static_prop);
- if (call_descr_set) {
- // Call `static_property.__set__()` instead of replacing the `static_property`.
-#if !defined(PYPY_VERSION)
- return Py_TYPE(descr)->tp_descr_set(descr, obj, value);
-#else
- if (PyObject *result = PyObject_CallMethod(descr, "__set__", "OO", obj, value)) {
- Py_DECREF(result);
- return 0;
- } else {
- return -1;
- }
-#endif
- } else {
- // Replace existing attribute.
- return PyType_Type.tp_setattro(obj, name, value);
- }
-}
-
-#if PY_MAJOR_VERSION >= 3
-/**
- * Python 3's PyInstanceMethod_Type hides itself via its tp_descr_get, which prevents aliasing
- * methods via cls.attr("m2") = cls.attr("m1"): instead the tp_descr_get returns a plain function,
- * when called on a class, or a PyMethod, when called on an instance. Override that behaviour here
- * to do a special case bypass for PyInstanceMethod_Types.
- */
-extern "C" inline PyObject *pybind11_meta_getattro(PyObject *obj, PyObject *name) {
- PyObject *descr = _PyType_Lookup((PyTypeObject *) obj, name);
- if (descr && PyInstanceMethod_Check(descr)) {
- Py_INCREF(descr);
- return descr;
- }
- else {
- return PyType_Type.tp_getattro(obj, name);
- }
-}
-#endif
-
-/// metaclass `__call__` function that is used to create all pybind11 objects.
-extern "C" inline PyObject *pybind11_meta_call(PyObject *type, PyObject *args, PyObject *kwargs) {
-
- // use the default metaclass call to create/initialize the object
- PyObject *self = PyType_Type.tp_call(type, args, kwargs);
- if (self == nullptr) {
- return nullptr;
- }
-
- // This must be a pybind11 instance
- auto instance = reinterpret_cast<detail::instance *>(self);
-
- // Ensure that the base __init__ function(s) were called
- for (const auto &vh : values_and_holders(instance)) {
- if (!vh.holder_constructed()) {
- PyErr_Format(PyExc_TypeError, "%.200s.__init__() must be called when overriding __init__",
- get_fully_qualified_tp_name(vh.type->type).c_str());
- Py_DECREF(self);
- return nullptr;
- }
- }
-
- return self;
-}
-
-/// Cleanup the type-info for a pybind11-registered type.
-extern "C" inline void pybind11_meta_dealloc(PyObject *obj) {
- auto *type = (PyTypeObject *) obj;
- auto &internals = get_internals();
-
- // A pybind11-registered type will:
- // 1) be found in internals.registered_types_py
- // 2) have exactly one associated `detail::type_info`
- auto found_type = internals.registered_types_py.find(type);
- if (found_type != internals.registered_types_py.end() &&
- found_type->second.size() == 1 &&
- found_type->second[0]->type == type) {
-
- auto *tinfo = found_type->second[0];
- auto tindex = std::type_index(*tinfo->cpptype);
- internals.direct_conversions.erase(tindex);
-
- if (tinfo->module_local)
- registered_local_types_cpp().erase(tindex);
- else
- internals.registered_types_cpp.erase(tindex);
- internals.registered_types_py.erase(tinfo->type);
-
- // Actually just `std::erase_if`, but that's only available in C++20
- auto &cache = internals.inactive_override_cache;
- for (auto it = cache.begin(), last = cache.end(); it != last; ) {
- if (it->first == (PyObject *) tinfo->type)
- it = cache.erase(it);
- else
- ++it;
- }
-
- delete tinfo;
- }
-
- PyType_Type.tp_dealloc(obj);
-}
-
-/** This metaclass is assigned by default to all pybind11 types and is required in order
- for static properties to function correctly. Users may override this using `py::metaclass`.
- Return value: New reference. */
-inline PyTypeObject* make_default_metaclass() {
- constexpr auto *name = "pybind11_type";
- auto name_obj = reinterpret_steal<object>(PYBIND11_FROM_STRING(name));
-
- /* Danger zone: from now (and until PyType_Ready), make sure to
- issue no Python C API calls which could potentially invoke the
- garbage collector (the GC will call type_traverse(), which will in
- turn find the newly constructed type in an invalid state) */
- auto heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
- if (!heap_type)
- pybind11_fail("make_default_metaclass(): error allocating metaclass!");
-
- heap_type->ht_name = name_obj.inc_ref().ptr();
-#ifdef PYBIND11_BUILTIN_QUALNAME
- heap_type->ht_qualname = name_obj.inc_ref().ptr();
-#endif
-
- auto type = &heap_type->ht_type;
- type->tp_name = name;
- type->tp_base = type_incref(&PyType_Type);
- type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
-
- type->tp_call = pybind11_meta_call;
-
- type->tp_setattro = pybind11_meta_setattro;
-#if PY_MAJOR_VERSION >= 3
- type->tp_getattro = pybind11_meta_getattro;
-#endif
-
- type->tp_dealloc = pybind11_meta_dealloc;
-
- if (PyType_Ready(type) < 0)
- pybind11_fail("make_default_metaclass(): failure in PyType_Ready()!");
-
- setattr((PyObject *) type, "__module__", str("pybind11_builtins"));
- PYBIND11_SET_OLDPY_QUALNAME(type, name_obj);
-
- return type;
-}
-
-/// For multiple inheritance types we need to recursively register/deregister base pointers for any
-/// base classes with pointers that are difference from the instance value pointer so that we can
-/// correctly recognize an offset base class pointer. This calls a function with any offset base ptrs.
-inline void traverse_offset_bases(void *valueptr, const detail::type_info *tinfo, instance *self,
- bool (*f)(void * /*parentptr*/, instance * /*self*/)) {
- for (handle h : reinterpret_borrow<tuple>(tinfo->type->tp_bases)) {
- if (auto parent_tinfo = get_type_info((PyTypeObject *) h.ptr())) {
- for (auto &c : parent_tinfo->implicit_casts) {
- if (c.first == tinfo->cpptype) {
- auto *parentptr = c.second(valueptr);
- if (parentptr != valueptr)
- f(parentptr, self);
- traverse_offset_bases(parentptr, parent_tinfo, self, f);
- break;
- }
- }
- }
- }
-}
-
-inline bool register_instance_impl(void *ptr, instance *self) {
- get_internals().registered_instances.emplace(ptr, self);
- return true; // unused, but gives the same signature as the deregister func
-}
-inline bool deregister_instance_impl(void *ptr, instance *self) {
- auto ®istered_instances = get_internals().registered_instances;
- auto range = registered_instances.equal_range(ptr);
- for (auto it = range.first; it != range.second; ++it) {
- if (self == it->second) {
- registered_instances.erase(it);
- return true;
- }
- }
- return false;
-}
-
-inline void register_instance(instance *self, void *valptr, const type_info *tinfo) {
- register_instance_impl(valptr, self);
- if (!tinfo->simple_ancestors)
- traverse_offset_bases(valptr, tinfo, self, register_instance_impl);
-}
-
-inline bool deregister_instance(instance *self, void *valptr, const type_info *tinfo) {
- bool ret = deregister_instance_impl(valptr, self);
- if (!tinfo->simple_ancestors)
- traverse_offset_bases(valptr, tinfo, self, deregister_instance_impl);
- return ret;
-}
-
-/// Instance creation function for all pybind11 types. It allocates the internal instance layout for
-/// holding C++ objects and holders. Allocation is done lazily (the first time the instance is cast
-/// to a reference or pointer), and initialization is done by an `__init__` function.
-inline PyObject *make_new_instance(PyTypeObject *type) {
-#if defined(PYPY_VERSION)
- // PyPy gets tp_basicsize wrong (issue 2482) under multiple inheritance when the first inherited
- // object is a a plain Python type (i.e. not derived from an extension type). Fix it.
- ssize_t instance_size = static_cast<ssize_t>(sizeof(instance));
- if (type->tp_basicsize < instance_size) {
- type->tp_basicsize = instance_size;
- }
-#endif
- PyObject *self = type->tp_alloc(type, 0);
- auto inst = reinterpret_cast<instance *>(self);
- // Allocate the value/holder internals:
- inst->allocate_layout();
-
- inst->owned = true;
-
- return self;
-}
-
-/// Instance creation function for all pybind11 types. It only allocates space for the
-/// C++ object, but doesn't call the constructor -- an `__init__` function must do that.
-extern "C" inline PyObject *pybind11_object_new(PyTypeObject *type, PyObject *, PyObject *) {
- return make_new_instance(type);
-}
-
-/// An `__init__` function constructs the C++ object. Users should provide at least one
-/// of these using `py::init` or directly with `.def(__init__, ...)`. Otherwise, the
-/// following default function will be used which simply throws an exception.
-extern "C" inline int pybind11_object_init(PyObject *self, PyObject *, PyObject *) {
- PyTypeObject *type = Py_TYPE(self);
- std::string msg = get_fully_qualified_tp_name(type) + ": No constructor defined!";
- PyErr_SetString(PyExc_TypeError, msg.c_str());
- return -1;
-}
-
-inline void add_patient(PyObject *nurse, PyObject *patient) {
- auto &internals = get_internals();
- auto instance = reinterpret_cast<detail::instance *>(nurse);
- instance->has_patients = true;
- Py_INCREF(patient);
- internals.patients[nurse].push_back(patient);
-}
-
-inline void clear_patients(PyObject *self) {
- auto instance = reinterpret_cast<detail::instance *>(self);
- auto &internals = get_internals();
- auto pos = internals.patients.find(self);
- assert(pos != internals.patients.end());
- // Clearing the patients can cause more Python code to run, which
- // can invalidate the iterator. Extract the vector of patients
- // from the unordered_map first.
- auto patients = std::move(pos->second);
- internals.patients.erase(pos);
- instance->has_patients = false;
- for (PyObject *&patient : patients)
- Py_CLEAR(patient);
-}
-
-/// Clears all internal data from the instance and removes it from registered instances in
-/// preparation for deallocation.
-inline void clear_instance(PyObject *self) {
- auto instance = reinterpret_cast<detail::instance *>(self);
-
- // Deallocate any values/holders, if present:
- for (auto &v_h : values_and_holders(instance)) {
- if (v_h) {
-
- // We have to deregister before we call dealloc because, for virtual MI types, we still
- // need to be able to get the parent pointers.
- if (v_h.instance_registered() && !deregister_instance(instance, v_h.value_ptr(), v_h.type))
- pybind11_fail("pybind11_object_dealloc(): Tried to deallocate unregistered instance!");
-
- if (instance->owned || v_h.holder_constructed())
- v_h.type->dealloc(v_h);
- }
- }
- // Deallocate the value/holder layout internals:
- instance->deallocate_layout();
-
- if (instance->weakrefs)
- PyObject_ClearWeakRefs(self);
-
- PyObject **dict_ptr = _PyObject_GetDictPtr(self);
- if (dict_ptr)
- Py_CLEAR(*dict_ptr);
-
- if (instance->has_patients)
- clear_patients(self);
-}
-
-/// Instance destructor function for all pybind11 types. It calls `type_info.dealloc`
-/// to destroy the C++ object itself, while the rest is Python bookkeeping.
-extern "C" inline void pybind11_object_dealloc(PyObject *self) {
- clear_instance(self);
-
- auto type = Py_TYPE(self);
- type->tp_free(self);
-
-#if PY_VERSION_HEX < 0x03080000
- // `type->tp_dealloc != pybind11_object_dealloc` means that we're being called
- // as part of a derived type's dealloc, in which case we're not allowed to decref
- // the type here. For cross-module compatibility, we shouldn't compare directly
- // with `pybind11_object_dealloc`, but with the common one stashed in internals.
- auto pybind11_object_type = (PyTypeObject *) get_internals().instance_base;
- if (type->tp_dealloc == pybind11_object_type->tp_dealloc)
- Py_DECREF(type);
-#else
- // This was not needed before Python 3.8 (Python issue 35810)
- // https://github.com/pybind/pybind11/issues/1946
- Py_DECREF(type);
-#endif
-}
-
-/** Create the type which can be used as a common base for all classes. This is
- needed in order to satisfy Python's requirements for multiple inheritance.
- Return value: New reference. */
-inline PyObject *make_object_base_type(PyTypeObject *metaclass) {
- constexpr auto *name = "pybind11_object";
- auto name_obj = reinterpret_steal<object>(PYBIND11_FROM_STRING(name));
-
- /* Danger zone: from now (and until PyType_Ready), make sure to
- issue no Python C API calls which could potentially invoke the
- garbage collector (the GC will call type_traverse(), which will in
- turn find the newly constructed type in an invalid state) */
- auto heap_type = (PyHeapTypeObject *) metaclass->tp_alloc(metaclass, 0);
- if (!heap_type)
- pybind11_fail("make_object_base_type(): error allocating type!");
-
- heap_type->ht_name = name_obj.inc_ref().ptr();
-#ifdef PYBIND11_BUILTIN_QUALNAME
- heap_type->ht_qualname = name_obj.inc_ref().ptr();
-#endif
-
- auto type = &heap_type->ht_type;
- type->tp_name = name;
- type->tp_base = type_incref(&PyBaseObject_Type);
- type->tp_basicsize = static_cast<ssize_t>(sizeof(instance));
- type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
-
- type->tp_new = pybind11_object_new;
- type->tp_init = pybind11_object_init;
- type->tp_dealloc = pybind11_object_dealloc;
-
- /* Support weak references (needed for the keep_alive feature) */
- type->tp_weaklistoffset = offsetof(instance, weakrefs);
-
- if (PyType_Ready(type) < 0)
- pybind11_fail("PyType_Ready failed in make_object_base_type():" + error_string());
-
- setattr((PyObject *) type, "__module__", str("pybind11_builtins"));
- PYBIND11_SET_OLDPY_QUALNAME(type, name_obj);
-
- assert(!PyType_HasFeature(type, Py_TPFLAGS_HAVE_GC));
- return (PyObject *) heap_type;
-}
-
-/// dynamic_attr: Support for `d = instance.__dict__`.
-extern "C" inline PyObject *pybind11_get_dict(PyObject *self, void *) {
- PyObject *&dict = *_PyObject_GetDictPtr(self);
- if (!dict)
- dict = PyDict_New();
- Py_XINCREF(dict);
- return dict;
-}
-
-/// dynamic_attr: Support for `instance.__dict__ = dict()`.
-extern "C" inline int pybind11_set_dict(PyObject *self, PyObject *new_dict, void *) {
- if (!PyDict_Check(new_dict)) {
- PyErr_Format(PyExc_TypeError, "__dict__ must be set to a dictionary, not a '%.200s'",
- get_fully_qualified_tp_name(Py_TYPE(new_dict)).c_str());
- return -1;
- }
- PyObject *&dict = *_PyObject_GetDictPtr(self);
- Py_INCREF(new_dict);
- Py_CLEAR(dict);
- dict = new_dict;
- return 0;
-}
-
-/// dynamic_attr: Allow the garbage collector to traverse the internal instance `__dict__`.
-extern "C" inline int pybind11_traverse(PyObject *self, visitproc visit, void *arg) {
- PyObject *&dict = *_PyObject_GetDictPtr(self);
- Py_VISIT(dict);
- return 0;
-}
-
-/// dynamic_attr: Allow the GC to clear the dictionary.
-extern "C" inline int pybind11_clear(PyObject *self) {
- PyObject *&dict = *_PyObject_GetDictPtr(self);
- Py_CLEAR(dict);
- return 0;
-}
-
-/// Give instances of this type a `__dict__` and opt into garbage collection.
-inline void enable_dynamic_attributes(PyHeapTypeObject *heap_type) {
- auto type = &heap_type->ht_type;
- type->tp_flags |= Py_TPFLAGS_HAVE_GC;
- type->tp_dictoffset = type->tp_basicsize; // place dict at the end
- type->tp_basicsize += (ssize_t)sizeof(PyObject *); // and allocate enough space for it
- type->tp_traverse = pybind11_traverse;
- type->tp_clear = pybind11_clear;
-
- static PyGetSetDef getset[] = {
- {const_cast<char*>("__dict__"), pybind11_get_dict, pybind11_set_dict, nullptr, nullptr},
- {nullptr, nullptr, nullptr, nullptr, nullptr}
- };
- type->tp_getset = getset;
-}
-
-/// buffer_protocol: Fill in the view as specified by flags.
-extern "C" inline int pybind11_getbuffer(PyObject *obj, Py_buffer *view, int flags) {
- // Look for a `get_buffer` implementation in this type's info or any bases (following MRO).
- type_info *tinfo = nullptr;
- for (auto type : reinterpret_borrow<tuple>(Py_TYPE(obj)->tp_mro)) {
- tinfo = get_type_info((PyTypeObject *) type.ptr());
- if (tinfo && tinfo->get_buffer)
- break;
- }
- if (view == nullptr || !tinfo || !tinfo->get_buffer) {
- if (view)
- view->obj = nullptr;
- PyErr_SetString(PyExc_BufferError, "pybind11_getbuffer(): Internal error");
- return -1;
- }
- std::memset(view, 0, sizeof(Py_buffer));
- buffer_info *info = tinfo->get_buffer(obj, tinfo->get_buffer_data);
- view->obj = obj;
- view->ndim = 1;
- view->internal = info;
- view->buf = info->ptr;
- view->itemsize = info->itemsize;
- view->len = view->itemsize;
- for (auto s : info->shape)
- view->len *= s;
- view->readonly = info->readonly;
- if ((flags & PyBUF_WRITABLE) == PyBUF_WRITABLE && info->readonly) {
- if (view)
- view->obj = nullptr;
- PyErr_SetString(PyExc_BufferError, "Writable buffer requested for readonly storage");
- return -1;
- }
- if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT)
- view->format = const_cast<char *>(info->format.c_str());
- if ((flags & PyBUF_STRIDES) == PyBUF_STRIDES) {
- view->ndim = (int) info->ndim;
- view->strides = &info->strides[0];
- view->shape = &info->shape[0];
- }
- Py_INCREF(view->obj);
- return 0;
-}
-
-/// buffer_protocol: Release the resources of the buffer.
-extern "C" inline void pybind11_releasebuffer(PyObject *, Py_buffer *view) {
- delete (buffer_info *) view->internal;
-}
-
-/// Give this type a buffer interface.
-inline void enable_buffer_protocol(PyHeapTypeObject *heap_type) {
- heap_type->ht_type.tp_as_buffer = &heap_type->as_buffer;
-#if PY_MAJOR_VERSION < 3
- heap_type->ht_type.tp_flags |= Py_TPFLAGS_HAVE_NEWBUFFER;
-#endif
-
- heap_type->as_buffer.bf_getbuffer = pybind11_getbuffer;
- heap_type->as_buffer.bf_releasebuffer = pybind11_releasebuffer;
-}
-
-/** Create a brand new Python type according to the `type_record` specification.
- Return value: New reference. */
-inline PyObject* make_new_python_type(const type_record &rec) {
- auto name = reinterpret_steal<object>(PYBIND11_FROM_STRING(rec.name));
-
- auto qualname = name;
- if (rec.scope && !PyModule_Check(rec.scope.ptr()) && hasattr(rec.scope, "__qualname__")) {
-#if PY_MAJOR_VERSION >= 3
- qualname = reinterpret_steal<object>(
- PyUnicode_FromFormat("%U.%U", rec.scope.attr("__qualname__").ptr(), name.ptr()));
-#else
- qualname = str(rec.scope.attr("__qualname__").cast<std::string>() + "." + rec.name);
-#endif
- }
-
- object module_;
- if (rec.scope) {
- if (hasattr(rec.scope, "__module__"))
- module_ = rec.scope.attr("__module__");
- else if (hasattr(rec.scope, "__name__"))
- module_ = rec.scope.attr("__name__");
- }
-
- auto full_name = c_str(
-#if !defined(PYPY_VERSION)
- module_ ? str(module_).cast<std::string>() + "." + rec.name :
-#endif
- rec.name);
-
- char *tp_doc = nullptr;
- if (rec.doc && options::show_user_defined_docstrings()) {
- /* Allocate memory for docstring (using PyObject_MALLOC, since
- Python will free this later on) */
- size_t size = strlen(rec.doc) + 1;
- tp_doc = (char *) PyObject_MALLOC(size);
- memcpy((void *) tp_doc, rec.doc, size);
- }
-
- auto &internals = get_internals();
- auto bases = tuple(rec.bases);
- auto base = (bases.empty()) ? internals.instance_base
- : bases[0].ptr();
-
- /* Danger zone: from now (and until PyType_Ready), make sure to
- issue no Python C API calls which could potentially invoke the
- garbage collector (the GC will call type_traverse(), which will in
- turn find the newly constructed type in an invalid state) */
- auto metaclass = rec.metaclass.ptr() ? (PyTypeObject *) rec.metaclass.ptr()
- : internals.default_metaclass;
-
- auto heap_type = (PyHeapTypeObject *) metaclass->tp_alloc(metaclass, 0);
- if (!heap_type)
- pybind11_fail(std::string(rec.name) + ": Unable to create type object!");
-
- heap_type->ht_name = name.release().ptr();
-#ifdef PYBIND11_BUILTIN_QUALNAME
- heap_type->ht_qualname = qualname.inc_ref().ptr();
-#endif
-
- auto type = &heap_type->ht_type;
- type->tp_name = full_name;
- type->tp_doc = tp_doc;
- type->tp_base = type_incref((PyTypeObject *)base);
- type->tp_basicsize = static_cast<ssize_t>(sizeof(instance));
- if (!bases.empty())
- type->tp_bases = bases.release().ptr();
-
- /* Don't inherit base __init__ */
- type->tp_init = pybind11_object_init;
-
- /* Supported protocols */
- type->tp_as_number = &heap_type->as_number;
- type->tp_as_sequence = &heap_type->as_sequence;
- type->tp_as_mapping = &heap_type->as_mapping;
-#if PY_VERSION_HEX >= 0x03050000
- type->tp_as_async = &heap_type->as_async;
-#endif
-
- /* Flags */
- type->tp_flags |= Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE;
-#if PY_MAJOR_VERSION < 3
- type->tp_flags |= Py_TPFLAGS_CHECKTYPES;
-#endif
- if (!rec.is_final)
- type->tp_flags |= Py_TPFLAGS_BASETYPE;
-
- if (rec.dynamic_attr)
- enable_dynamic_attributes(heap_type);
-
- if (rec.buffer_protocol)
- enable_buffer_protocol(heap_type);
-
- if (PyType_Ready(type) < 0)
- pybind11_fail(std::string(rec.name) + ": PyType_Ready failed (" + error_string() + ")!");
-
- assert(rec.dynamic_attr ? PyType_HasFeature(type, Py_TPFLAGS_HAVE_GC)
- : !PyType_HasFeature(type, Py_TPFLAGS_HAVE_GC));
-
- /* Register type with the parent scope */
- if (rec.scope)
- setattr(rec.scope, rec.name, (PyObject *) type);
- else
- Py_INCREF(type); // Keep it alive forever (reference leak)
-
- if (module_) // Needed by pydoc
- setattr((PyObject *) type, "__module__", module_);
-
- PYBIND11_SET_OLDPY_QUALNAME(type, qualname);
-
- return (PyObject *) type;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/common.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/common.h
deleted file mode 100644
index 61fc89259faa6c938fc9aef25a921eb295ef3e34..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/common.h
+++ /dev/null
@@ -1,853 +0,0 @@
-/*
- pybind11/detail/common.h -- Basic macros
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#define PYBIND11_VERSION_MAJOR 2
-#define PYBIND11_VERSION_MINOR 6
-#define PYBIND11_VERSION_PATCH 0
-
-#define PYBIND11_NAMESPACE_BEGIN(name) namespace name {
-#define PYBIND11_NAMESPACE_END(name) }
-
-// Robust support for some features and loading modules compiled against different pybind versions
-// requires forcing hidden visibility on pybind code, so we enforce this by setting the attribute on
-// the main `pybind11` namespace.
-#if !defined(PYBIND11_NAMESPACE)
-# ifdef __GNUG__
-# define PYBIND11_NAMESPACE pybind11 __attribute__((visibility("hidden")))
-# else
-# define PYBIND11_NAMESPACE pybind11
-# endif
-#endif
-
-#if !(defined(_MSC_VER) && __cplusplus == 199711L) && !defined(__INTEL_COMPILER)
-# if __cplusplus >= 201402L
-# define PYBIND11_CPP14
-# if __cplusplus >= 201703L
-# define PYBIND11_CPP17
-# endif
-# endif
-#elif defined(_MSC_VER) && __cplusplus == 199711L
-// MSVC sets _MSVC_LANG rather than __cplusplus (supposedly until the standard is fully implemented)
-// Unless you use the /Zc:__cplusplus flag on Visual Studio 2017 15.7 Preview 3 or newer
-# if _MSVC_LANG >= 201402L
-# define PYBIND11_CPP14
-# if _MSVC_LANG > 201402L && _MSC_VER >= 1910
-# define PYBIND11_CPP17
-# endif
-# endif
-#endif
-
-// Compiler version assertions
-#if defined(__INTEL_COMPILER)
-# if __INTEL_COMPILER < 1800
-# error pybind11 requires Intel C++ compiler v18 or newer
-# endif
-#elif defined(__clang__) && !defined(__apple_build_version__)
-# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 3)
-# error pybind11 requires clang 3.3 or newer
-# endif
-#elif defined(__clang__)
-// Apple changes clang version macros to its Xcode version; the first Xcode release based on
-// (upstream) clang 3.3 was Xcode 5:
-# if __clang_major__ < 5
-# error pybind11 requires Xcode/clang 5.0 or newer
-# endif
-#elif defined(__GNUG__)
-# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8)
-# error pybind11 requires gcc 4.8 or newer
-# endif
-#elif defined(_MSC_VER)
-// Pybind hits various compiler bugs in 2015u2 and earlier, and also makes use of some stl features
-// (e.g. std::negation) added in 2015u3:
-# if _MSC_FULL_VER < 190024210
-# error pybind11 requires MSVC 2015 update 3 or newer
-# endif
-#endif
-
-#if !defined(PYBIND11_EXPORT)
-# if defined(WIN32) || defined(_WIN32)
-# define PYBIND11_EXPORT __declspec(dllexport)
-# else
-# define PYBIND11_EXPORT __attribute__ ((visibility("default")))
-# endif
-#endif
-
-#if defined(_MSC_VER)
-# define PYBIND11_NOINLINE __declspec(noinline)
-#else
-# define PYBIND11_NOINLINE __attribute__ ((noinline))
-#endif
-
-#if defined(PYBIND11_CPP14)
-# define PYBIND11_DEPRECATED(reason) [[deprecated(reason)]]
-#else
-# define PYBIND11_DEPRECATED(reason) __attribute__((deprecated(reason)))
-#endif
-
-#if defined(PYBIND11_CPP17)
-# define PYBIND11_MAYBE_UNUSED [[maybe_unused]]
-#elif defined(_MSC_VER) && !defined(__clang__)
-# define PYBIND11_MAYBE_UNUSED
-#else
-# define PYBIND11_MAYBE_UNUSED __attribute__ ((__unused__))
-#endif
-
-/* Don't let Python.h #define (v)snprintf as macro because they are implemented
- properly in Visual Studio since 2015. */
-#if defined(_MSC_VER) && _MSC_VER >= 1900
-# define HAVE_SNPRINTF 1
-#endif
-
-/// Include Python header, disable linking to pythonX_d.lib on Windows in debug mode
-#if defined(_MSC_VER)
-# if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 4)
-# define HAVE_ROUND 1
-# endif
-# pragma warning(push)
-# pragma warning(disable: 4510 4610 4512 4005)
-# if defined(_DEBUG) && !defined(Py_DEBUG)
-# define PYBIND11_DEBUG_MARKER
-# undef _DEBUG
-# endif
-#endif
-
-#include <Python.h>
-#include <frameobject.h>
-#include <pythread.h>
-
-/* Python #defines overrides on all sorts of core functions, which
- tends to weak havok in C++ codebases that expect these to work
- like regular functions (potentially with several overloads) */
-#if defined(isalnum)
-# undef isalnum
-# undef isalpha
-# undef islower
-# undef isspace
-# undef isupper
-# undef tolower
-# undef toupper
-#endif
-
-#if defined(copysign)
-# undef copysign
-#endif
-
-#if defined(_MSC_VER)
-# if defined(PYBIND11_DEBUG_MARKER)
-# define _DEBUG
-# undef PYBIND11_DEBUG_MARKER
-# endif
-# pragma warning(pop)
-#endif
-
-#include <cstddef>
-#include <cstring>
-#include <forward_list>
-#include <vector>
-#include <string>
-#include <stdexcept>
-#include <exception>
-#include <unordered_set>
-#include <unordered_map>
-#include <memory>
-#include <typeindex>
-#include <type_traits>
-
-#if PY_MAJOR_VERSION >= 3 /// Compatibility macros for various Python versions
-#define PYBIND11_INSTANCE_METHOD_NEW(ptr, class_) PyInstanceMethod_New(ptr)
-#define PYBIND11_INSTANCE_METHOD_CHECK PyInstanceMethod_Check
-#define PYBIND11_INSTANCE_METHOD_GET_FUNCTION PyInstanceMethod_GET_FUNCTION
-#define PYBIND11_BYTES_CHECK PyBytes_Check
-#define PYBIND11_BYTES_FROM_STRING PyBytes_FromString
-#define PYBIND11_BYTES_FROM_STRING_AND_SIZE PyBytes_FromStringAndSize
-#define PYBIND11_BYTES_AS_STRING_AND_SIZE PyBytes_AsStringAndSize
-#define PYBIND11_BYTES_AS_STRING PyBytes_AsString
-#define PYBIND11_BYTES_SIZE PyBytes_Size
-#define PYBIND11_LONG_CHECK(o) PyLong_Check(o)
-#define PYBIND11_LONG_AS_LONGLONG(o) PyLong_AsLongLong(o)
-#define PYBIND11_LONG_FROM_SIGNED(o) PyLong_FromSsize_t((ssize_t) o)
-#define PYBIND11_LONG_FROM_UNSIGNED(o) PyLong_FromSize_t((size_t) o)
-#define PYBIND11_BYTES_NAME "bytes"
-#define PYBIND11_STRING_NAME "str"
-#define PYBIND11_SLICE_OBJECT PyObject
-#define PYBIND11_FROM_STRING PyUnicode_FromString
-#define PYBIND11_STR_TYPE ::pybind11::str
-#define PYBIND11_BOOL_ATTR "__bool__"
-#define PYBIND11_NB_BOOL(ptr) ((ptr)->nb_bool)
-#define PYBIND11_BUILTINS_MODULE "builtins"
-// Providing a separate declaration to make Clang's -Wmissing-prototypes happy.
-// See comment for PYBIND11_MODULE below for why this is marked "maybe unused".
-#define PYBIND11_PLUGIN_IMPL(name) \
- extern "C" PYBIND11_MAYBE_UNUSED PYBIND11_EXPORT PyObject *PyInit_##name(); \
- extern "C" PYBIND11_EXPORT PyObject *PyInit_##name()
-
-#else
-#define PYBIND11_INSTANCE_METHOD_NEW(ptr, class_) PyMethod_New(ptr, nullptr, class_)
-#define PYBIND11_INSTANCE_METHOD_CHECK PyMethod_Check
-#define PYBIND11_INSTANCE_METHOD_GET_FUNCTION PyMethod_GET_FUNCTION
-#define PYBIND11_BYTES_CHECK PyString_Check
-#define PYBIND11_BYTES_FROM_STRING PyString_FromString
-#define PYBIND11_BYTES_FROM_STRING_AND_SIZE PyString_FromStringAndSize
-#define PYBIND11_BYTES_AS_STRING_AND_SIZE PyString_AsStringAndSize
-#define PYBIND11_BYTES_AS_STRING PyString_AsString
-#define PYBIND11_BYTES_SIZE PyString_Size
-#define PYBIND11_LONG_CHECK(o) (PyInt_Check(o) || PyLong_Check(o))
-#define PYBIND11_LONG_AS_LONGLONG(o) (PyInt_Check(o) ? (long long) PyLong_AsLong(o) : PyLong_AsLongLong(o))
-#define PYBIND11_LONG_FROM_SIGNED(o) PyInt_FromSsize_t((ssize_t) o) // Returns long if needed.
-#define PYBIND11_LONG_FROM_UNSIGNED(o) PyInt_FromSize_t((size_t) o) // Returns long if needed.
-#define PYBIND11_BYTES_NAME "str"
-#define PYBIND11_STRING_NAME "unicode"
-#define PYBIND11_SLICE_OBJECT PySliceObject
-#define PYBIND11_FROM_STRING PyString_FromString
-#define PYBIND11_STR_TYPE ::pybind11::bytes
-#define PYBIND11_BOOL_ATTR "__nonzero__"
-#define PYBIND11_NB_BOOL(ptr) ((ptr)->nb_nonzero)
-#define PYBIND11_BUILTINS_MODULE "__builtin__"
-// Providing a separate PyInit decl to make Clang's -Wmissing-prototypes happy.
-// See comment for PYBIND11_MODULE below for why this is marked "maybe unused".
-#define PYBIND11_PLUGIN_IMPL(name) \
- static PyObject *pybind11_init_wrapper(); \
- extern "C" PYBIND11_MAYBE_UNUSED PYBIND11_EXPORT void init##name(); \
- extern "C" PYBIND11_EXPORT void init##name() { \
- (void)pybind11_init_wrapper(); \
- } \
- PyObject *pybind11_init_wrapper()
-#endif
-
-#if PY_VERSION_HEX >= 0x03050000 && PY_VERSION_HEX < 0x03050200
-extern "C" {
- struct _Py_atomic_address { void *value; };
- PyAPI_DATA(_Py_atomic_address) _PyThreadState_Current;
-}
-#endif
-
-#define PYBIND11_TRY_NEXT_OVERLOAD ((PyObject *) 1) // special failure return code
-#define PYBIND11_STRINGIFY(x) #x
-#define PYBIND11_TOSTRING(x) PYBIND11_STRINGIFY(x)
-#define PYBIND11_CONCAT(first, second) first##second
-#define PYBIND11_ENSURE_INTERNALS_READY \
- pybind11::detail::get_internals();
-
-#define PYBIND11_CHECK_PYTHON_VERSION \
- { \
- const char *compiled_ver = PYBIND11_TOSTRING(PY_MAJOR_VERSION) \
- "." PYBIND11_TOSTRING(PY_MINOR_VERSION); \
- const char *runtime_ver = Py_GetVersion(); \
- size_t len = std::strlen(compiled_ver); \
- if (std::strncmp(runtime_ver, compiled_ver, len) != 0 \
- || (runtime_ver[len] >= '0' && runtime_ver[len] <= '9')) { \
- PyErr_Format(PyExc_ImportError, \
- "Python version mismatch: module was compiled for Python %s, " \
- "but the interpreter version is incompatible: %s.", \
- compiled_ver, runtime_ver); \
- return nullptr; \
- } \
- }
-
-#define PYBIND11_CATCH_INIT_EXCEPTIONS \
- catch (pybind11::error_already_set &e) { \
- PyErr_SetString(PyExc_ImportError, e.what()); \
- return nullptr; \
- } catch (const std::exception &e) { \
- PyErr_SetString(PyExc_ImportError, e.what()); \
- return nullptr; \
- } \
-
-/** \rst
- ***Deprecated in favor of PYBIND11_MODULE***
-
- This macro creates the entry point that will be invoked when the Python interpreter
- imports a plugin library. Please create a `module_` in the function body and return
- the pointer to its underlying Python object at the end.
-
- .. code-block:: cpp
-
- PYBIND11_PLUGIN(example) {
- pybind11::module_ m("example", "pybind11 example plugin");
- /// Set up bindings here
- return m.ptr();
- }
-\endrst */
-#define PYBIND11_PLUGIN(name) \
- PYBIND11_DEPRECATED("PYBIND11_PLUGIN is deprecated, use PYBIND11_MODULE") \
- static PyObject *pybind11_init(); \
- PYBIND11_PLUGIN_IMPL(name) { \
- PYBIND11_CHECK_PYTHON_VERSION \
- PYBIND11_ENSURE_INTERNALS_READY \
- try { \
- return pybind11_init(); \
- } PYBIND11_CATCH_INIT_EXCEPTIONS \
- } \
- PyObject *pybind11_init()
-
-/** \rst
- This macro creates the entry point that will be invoked when the Python interpreter
- imports an extension module. The module name is given as the fist argument and it
- should not be in quotes. The second macro argument defines a variable of type
- `py::module_` which can be used to initialize the module.
-
- The entry point is marked as "maybe unused" to aid dead-code detection analysis:
- since the entry point is typically only looked up at runtime and not referenced
- during translation, it would otherwise appear as unused ("dead") code.
-
- .. code-block:: cpp
-
- PYBIND11_MODULE(example, m) {
- m.doc() = "pybind11 example module";
-
- // Add bindings here
- m.def("foo", []() {
- return "Hello, World!";
- });
- }
-\endrst */
-#define PYBIND11_MODULE(name, variable) \
- static ::pybind11::module_::module_def \
- PYBIND11_CONCAT(pybind11_module_def_, name); \
- PYBIND11_MAYBE_UNUSED \
- static void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ &); \
- PYBIND11_PLUGIN_IMPL(name) { \
- PYBIND11_CHECK_PYTHON_VERSION \
- PYBIND11_ENSURE_INTERNALS_READY \
- auto m = ::pybind11::module_::create_extension_module( \
- PYBIND11_TOSTRING(name), nullptr, \
- &PYBIND11_CONCAT(pybind11_module_def_, name)); \
- try { \
- PYBIND11_CONCAT(pybind11_init_, name)(m); \
- return m.ptr(); \
- } PYBIND11_CATCH_INIT_EXCEPTIONS \
- } \
- void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ &variable)
-
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-using ssize_t = Py_ssize_t;
-using size_t = std::size_t;
-
-/// Approach used to cast a previously unknown C++ instance into a Python object
-enum class return_value_policy : uint8_t {
- /** This is the default return value policy, which falls back to the policy
- return_value_policy::take_ownership when the return value is a pointer.
- Otherwise, it uses return_value::move or return_value::copy for rvalue
- and lvalue references, respectively. See below for a description of what
- all of these different policies do. */
- automatic = 0,
-
- /** As above, but use policy return_value_policy::reference when the return
- value is a pointer. This is the default conversion policy for function
- arguments when calling Python functions manually from C++ code (i.e. via
- handle::operator()). You probably won't need to use this. */
- automatic_reference,
-
- /** Reference an existing object (i.e. do not create a new copy) and take
- ownership. Python will call the destructor and delete operator when the
- object’s reference count reaches zero. Undefined behavior ensues when
- the C++ side does the same.. */
- take_ownership,
-
- /** Create a new copy of the returned object, which will be owned by
- Python. This policy is comparably safe because the lifetimes of the two
- instances are decoupled. */
- copy,
-
- /** Use std::move to move the return value contents into a new instance
- that will be owned by Python. This policy is comparably safe because the
- lifetimes of the two instances (move source and destination) are
- decoupled. */
- move,
-
- /** Reference an existing object, but do not take ownership. The C++ side
- is responsible for managing the object’s lifetime and deallocating it
- when it is no longer used. Warning: undefined behavior will ensue when
- the C++ side deletes an object that is still referenced and used by
- Python. */
- reference,
-
- /** This policy only applies to methods and properties. It references the
- object without taking ownership similar to the above
- return_value_policy::reference policy. In contrast to that policy, the
- function or property’s implicit this argument (called the parent) is
- considered to be the the owner of the return value (the child).
- pybind11 then couples the lifetime of the parent to the child via a
- reference relationship that ensures that the parent cannot be garbage
- collected while Python is still using the child. More advanced
- variations of this scheme are also possible using combinations of
- return_value_policy::reference and the keep_alive call policy */
- reference_internal
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-inline static constexpr int log2(size_t n, int k = 0) { return (n <= 1) ? k : log2(n >> 1, k + 1); }
-
-// Returns the size as a multiple of sizeof(void *), rounded up.
-inline static constexpr size_t size_in_ptrs(size_t s) { return 1 + ((s - 1) >> log2(sizeof(void *))); }
-
-/**
- * The space to allocate for simple layout instance holders (see below) in multiple of the size of
- * a pointer (e.g. 2 means 16 bytes on 64-bit architectures). The default is the minimum required
- * to holder either a std::unique_ptr or std::shared_ptr (which is almost always
- * sizeof(std::shared_ptr<T>)).
- */
-constexpr size_t instance_simple_holder_in_ptrs() {
- static_assert(sizeof(std::shared_ptr<int>) >= sizeof(std::unique_ptr<int>),
- "pybind assumes std::shared_ptrs are at least as big as std::unique_ptrs");
- return size_in_ptrs(sizeof(std::shared_ptr<int>));
-}
-
-// Forward declarations
-struct type_info;
-struct value_and_holder;
-
-struct nonsimple_values_and_holders {
- void **values_and_holders;
- uint8_t *status;
-};
-
-/// The 'instance' type which needs to be standard layout (need to be able to use 'offsetof')
-struct instance {
- PyObject_HEAD
- /// Storage for pointers and holder; see simple_layout, below, for a description
- union {
- void *simple_value_holder[1 + instance_simple_holder_in_ptrs()];
- nonsimple_values_and_holders nonsimple;
- };
- /// Weak references
- PyObject *weakrefs;
- /// If true, the pointer is owned which means we're free to manage it with a holder.
- bool owned : 1;
- /**
- * An instance has two possible value/holder layouts.
- *
- * Simple layout (when this flag is true), means the `simple_value_holder` is set with a pointer
- * and the holder object governing that pointer, i.e. [val1*][holder]. This layout is applied
- * whenever there is no python-side multiple inheritance of bound C++ types *and* the type's
- * holder will fit in the default space (which is large enough to hold either a std::unique_ptr
- * or std::shared_ptr).
- *
- * Non-simple layout applies when using custom holders that require more space than `shared_ptr`
- * (which is typically the size of two pointers), or when multiple inheritance is used on the
- * python side. Non-simple layout allocates the required amount of memory to have multiple
- * bound C++ classes as parents. Under this layout, `nonsimple.values_and_holders` is set to a
- * pointer to allocated space of the required space to hold a sequence of value pointers and
- * holders followed `status`, a set of bit flags (1 byte each), i.e.
- * [val1*][holder1][val2*][holder2]...[bb...] where each [block] is rounded up to a multiple of
- * `sizeof(void *)`. `nonsimple.status` is, for convenience, a pointer to the
- * beginning of the [bb...] block (but not independently allocated).
- *
- * Status bits indicate whether the associated holder is constructed (&
- * status_holder_constructed) and whether the value pointer is registered (&
- * status_instance_registered) in `registered_instances`.
- */
- bool simple_layout : 1;
- /// For simple layout, tracks whether the holder has been constructed
- bool simple_holder_constructed : 1;
- /// For simple layout, tracks whether the instance is registered in `registered_instances`
- bool simple_instance_registered : 1;
- /// If true, get_internals().patients has an entry for this object
- bool has_patients : 1;
-
- /// Initializes all of the above type/values/holders data (but not the instance values themselves)
- void allocate_layout();
-
- /// Destroys/deallocates all of the above
- void deallocate_layout();
-
- /// Returns the value_and_holder wrapper for the given type (or the first, if `find_type`
- /// omitted). Returns a default-constructed (with `.inst = nullptr`) object on failure if
- /// `throw_if_missing` is false.
- value_and_holder get_value_and_holder(const type_info *find_type = nullptr, bool throw_if_missing = true);
-
- /// Bit values for the non-simple status flags
- static constexpr uint8_t status_holder_constructed = 1;
- static constexpr uint8_t status_instance_registered = 2;
-};
-
-static_assert(std::is_standard_layout<instance>::value, "Internal error: `pybind11::detail::instance` is not standard layout!");
-
-/// from __cpp_future__ import (convenient aliases from C++14/17)
-#if defined(PYBIND11_CPP14) && (!defined(_MSC_VER) || _MSC_VER >= 1910)
-using std::enable_if_t;
-using std::conditional_t;
-using std::remove_cv_t;
-using std::remove_reference_t;
-#else
-template <bool B, typename T = void> using enable_if_t = typename std::enable_if<B, T>::type;
-template <bool B, typename T, typename F> using conditional_t = typename std::conditional<B, T, F>::type;
-template <typename T> using remove_cv_t = typename std::remove_cv<T>::type;
-template <typename T> using remove_reference_t = typename std::remove_reference<T>::type;
-#endif
-
-/// Index sequences
-#if defined(PYBIND11_CPP14)
-using std::index_sequence;
-using std::make_index_sequence;
-#else
-template<size_t ...> struct index_sequence { };
-template<size_t N, size_t ...S> struct make_index_sequence_impl : make_index_sequence_impl <N - 1, N - 1, S...> { };
-template<size_t ...S> struct make_index_sequence_impl <0, S...> { typedef index_sequence<S...> type; };
-template<size_t N> using make_index_sequence = typename make_index_sequence_impl<N>::type;
-#endif
-
-/// Make an index sequence of the indices of true arguments
-template <typename ISeq, size_t, bool...> struct select_indices_impl { using type = ISeq; };
-template <size_t... IPrev, size_t I, bool B, bool... Bs> struct select_indices_impl<index_sequence<IPrev...>, I, B, Bs...>
- : select_indices_impl<conditional_t<B, index_sequence<IPrev..., I>, index_sequence<IPrev...>>, I + 1, Bs...> {};
-template <bool... Bs> using select_indices = typename select_indices_impl<index_sequence<>, 0, Bs...>::type;
-
-/// Backports of std::bool_constant and std::negation to accommodate older compilers
-template <bool B> using bool_constant = std::integral_constant<bool, B>;
-template <typename T> struct negation : bool_constant<!T::value> { };
-
-// PGI/Intel cannot detect operator delete with the "compatible" void_t impl, so
-// using the new one (C++14 defect, so generally works on newer compilers, even
-// if not in C++17 mode)
-#if defined(__PGIC__) || defined(__INTEL_COMPILER)
-template<typename... > using void_t = void;
-#else
-template <typename...> struct void_t_impl { using type = void; };
-template <typename... Ts> using void_t = typename void_t_impl<Ts...>::type;
-#endif
-
-
-/// Compile-time all/any/none of that check the boolean value of all template types
-#if defined(__cpp_fold_expressions) && !(defined(_MSC_VER) && (_MSC_VER < 1916))
-template <class... Ts> using all_of = bool_constant<(Ts::value && ...)>;
-template <class... Ts> using any_of = bool_constant<(Ts::value || ...)>;
-#elif !defined(_MSC_VER)
-template <bool...> struct bools {};
-template <class... Ts> using all_of = std::is_same<
- bools<Ts::value..., true>,
- bools<true, Ts::value...>>;
-template <class... Ts> using any_of = negation<all_of<negation<Ts>...>>;
-#else
-// MSVC has trouble with the above, but supports std::conjunction, which we can use instead (albeit
-// at a slight loss of compilation efficiency).
-template <class... Ts> using all_of = std::conjunction<Ts...>;
-template <class... Ts> using any_of = std::disjunction<Ts...>;
-#endif
-template <class... Ts> using none_of = negation<any_of<Ts...>>;
-
-template <class T, template<class> class... Predicates> using satisfies_all_of = all_of<Predicates<T>...>;
-template <class T, template<class> class... Predicates> using satisfies_any_of = any_of<Predicates<T>...>;
-template <class T, template<class> class... Predicates> using satisfies_none_of = none_of<Predicates<T>...>;
-
-/// Strip the class from a method type
-template <typename T> struct remove_class { };
-template <typename C, typename R, typename... A> struct remove_class<R (C::*)(A...)> { using type = R (A...); };
-template <typename C, typename R, typename... A> struct remove_class<R (C::*)(A...) const> { using type = R (A...); };
-
-/// Helper template to strip away type modifiers
-template <typename T> struct intrinsic_type { using type = T; };
-template <typename T> struct intrinsic_type<const T> { using type = typename intrinsic_type<T>::type; };
-template <typename T> struct intrinsic_type<T*> { using type = typename intrinsic_type<T>::type; };
-template <typename T> struct intrinsic_type<T&> { using type = typename intrinsic_type<T>::type; };
-template <typename T> struct intrinsic_type<T&&> { using type = typename intrinsic_type<T>::type; };
-template <typename T, size_t N> struct intrinsic_type<const T[N]> { using type = typename intrinsic_type<T>::type; };
-template <typename T, size_t N> struct intrinsic_type<T[N]> { using type = typename intrinsic_type<T>::type; };
-template <typename T> using intrinsic_t = typename intrinsic_type<T>::type;
-
-/// Helper type to replace 'void' in some expressions
-struct void_type { };
-
-/// Helper template which holds a list of types
-template <typename...> struct type_list { };
-
-/// Compile-time integer sum
-#ifdef __cpp_fold_expressions
-template <typename... Ts> constexpr size_t constexpr_sum(Ts... ns) { return (0 + ... + size_t{ns}); }
-#else
-constexpr size_t constexpr_sum() { return 0; }
-template <typename T, typename... Ts>
-constexpr size_t constexpr_sum(T n, Ts... ns) { return size_t{n} + constexpr_sum(ns...); }
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(constexpr_impl)
-/// Implementation details for constexpr functions
-constexpr int first(int i) { return i; }
-template <typename T, typename... Ts>
-constexpr int first(int i, T v, Ts... vs) { return v ? i : first(i + 1, vs...); }
-
-constexpr int last(int /*i*/, int result) { return result; }
-template <typename T, typename... Ts>
-constexpr int last(int i, int result, T v, Ts... vs) { return last(i + 1, v ? i : result, vs...); }
-PYBIND11_NAMESPACE_END(constexpr_impl)
-
-/// Return the index of the first type in Ts which satisfies Predicate<T>. Returns sizeof...(Ts) if
-/// none match.
-template <template<typename> class Predicate, typename... Ts>
-constexpr int constexpr_first() { return constexpr_impl::first(0, Predicate<Ts>::value...); }
-
-/// Return the index of the last type in Ts which satisfies Predicate<T>, or -1 if none match.
-template <template<typename> class Predicate, typename... Ts>
-constexpr int constexpr_last() { return constexpr_impl::last(0, -1, Predicate<Ts>::value...); }
-
-/// Return the Nth element from the parameter pack
-template <size_t N, typename T, typename... Ts>
-struct pack_element { using type = typename pack_element<N - 1, Ts...>::type; };
-template <typename T, typename... Ts>
-struct pack_element<0, T, Ts...> { using type = T; };
-
-/// Return the one and only type which matches the predicate, or Default if none match.
-/// If more than one type matches the predicate, fail at compile-time.
-template <template<typename> class Predicate, typename Default, typename... Ts>
-struct exactly_one {
- static constexpr auto found = constexpr_sum(Predicate<Ts>::value...);
- static_assert(found <= 1, "Found more than one type matching the predicate");
-
- static constexpr auto index = found ? constexpr_first<Predicate, Ts...>() : 0;
- using type = conditional_t<found, typename pack_element<index, Ts...>::type, Default>;
-};
-template <template<typename> class P, typename Default>
-struct exactly_one<P, Default> { using type = Default; };
-
-template <template<typename> class Predicate, typename Default, typename... Ts>
-using exactly_one_t = typename exactly_one<Predicate, Default, Ts...>::type;
-
-/// Defer the evaluation of type T until types Us are instantiated
-template <typename T, typename... /*Us*/> struct deferred_type { using type = T; };
-template <typename T, typename... Us> using deferred_t = typename deferred_type<T, Us...>::type;
-
-/// Like is_base_of, but requires a strict base (i.e. `is_strict_base_of<T, T>::value == false`,
-/// unlike `std::is_base_of`)
-template <typename Base, typename Derived> using is_strict_base_of = bool_constant<
- std::is_base_of<Base, Derived>::value && !std::is_same<Base, Derived>::value>;
-
-/// Like is_base_of, but also requires that the base type is accessible (i.e. that a Derived pointer
-/// can be converted to a Base pointer)
-/// For unions, `is_base_of<T, T>::value` is False, so we need to check `is_same` as well.
-template <typename Base, typename Derived> using is_accessible_base_of = bool_constant<
- (std::is_same<Base, Derived>::value || std::is_base_of<Base, Derived>::value) && std::is_convertible<Derived *, Base *>::value>;
-
-template <template<typename...> class Base>
-struct is_template_base_of_impl {
- template <typename... Us> static std::true_type check(Base<Us...> *);
- static std::false_type check(...);
-};
-
-/// Check if a template is the base of a type. For example:
-/// `is_template_base_of<Base, T>` is true if `struct T : Base<U> {}` where U can be anything
-template <template<typename...> class Base, typename T>
-#if !defined(_MSC_VER)
-using is_template_base_of = decltype(is_template_base_of_impl<Base>::check((intrinsic_t<T>*)nullptr));
-#else // MSVC2015 has trouble with decltype in template aliases
-struct is_template_base_of : decltype(is_template_base_of_impl<Base>::check((intrinsic_t<T>*)nullptr)) { };
-#endif
-
-/// Check if T is an instantiation of the template `Class`. For example:
-/// `is_instantiation<shared_ptr, T>` is true if `T == shared_ptr<U>` where U can be anything.
-template <template<typename...> class Class, typename T>
-struct is_instantiation : std::false_type { };
-template <template<typename...> class Class, typename... Us>
-struct is_instantiation<Class, Class<Us...>> : std::true_type { };
-
-/// Check if T is std::shared_ptr<U> where U can be anything
-template <typename T> using is_shared_ptr = is_instantiation<std::shared_ptr, T>;
-
-/// Check if T looks like an input iterator
-template <typename T, typename = void> struct is_input_iterator : std::false_type {};
-template <typename T>
-struct is_input_iterator<T, void_t<decltype(*std::declval<T &>()), decltype(++std::declval<T &>())>>
- : std::true_type {};
-
-template <typename T> using is_function_pointer = bool_constant<
- std::is_pointer<T>::value && std::is_function<typename std::remove_pointer<T>::type>::value>;
-
-template <typename F> struct strip_function_object {
- using type = typename remove_class<decltype(&F::operator())>::type;
-};
-
-// Extracts the function signature from a function, function pointer or lambda.
-template <typename Function, typename F = remove_reference_t<Function>>
-using function_signature_t = conditional_t<
- std::is_function<F>::value,
- F,
- typename conditional_t<
- std::is_pointer<F>::value || std::is_member_pointer<F>::value,
- std::remove_pointer<F>,
- strip_function_object<F>
- >::type
->;
-
-/// Returns true if the type looks like a lambda: that is, isn't a function, pointer or member
-/// pointer. Note that this can catch all sorts of other things, too; this is intended to be used
-/// in a place where passing a lambda makes sense.
-template <typename T> using is_lambda = satisfies_none_of<remove_reference_t<T>,
- std::is_function, std::is_pointer, std::is_member_pointer>;
-
-/// Ignore that a variable is unused in compiler warnings
-inline void ignore_unused(const int *) { }
-
-/// Apply a function over each element of a parameter pack
-#ifdef __cpp_fold_expressions
-#define PYBIND11_EXPAND_SIDE_EFFECTS(PATTERN) (((PATTERN), void()), ...)
-#else
-using expand_side_effects = bool[];
-#define PYBIND11_EXPAND_SIDE_EFFECTS(PATTERN) (void)pybind11::detail::expand_side_effects{ ((PATTERN), void(), false)..., false }
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// C++ bindings of builtin Python exceptions
-class builtin_exception : public std::runtime_error {
-public:
- using std::runtime_error::runtime_error;
- /// Set the error using the Python C API
- virtual void set_error() const = 0;
-};
-
-#define PYBIND11_RUNTIME_EXCEPTION(name, type) \
- class name : public builtin_exception { public: \
- using builtin_exception::builtin_exception; \
- name() : name("") { } \
- void set_error() const override { PyErr_SetString(type, what()); } \
- };
-
-PYBIND11_RUNTIME_EXCEPTION(stop_iteration, PyExc_StopIteration)
-PYBIND11_RUNTIME_EXCEPTION(index_error, PyExc_IndexError)
-PYBIND11_RUNTIME_EXCEPTION(key_error, PyExc_KeyError)
-PYBIND11_RUNTIME_EXCEPTION(value_error, PyExc_ValueError)
-PYBIND11_RUNTIME_EXCEPTION(type_error, PyExc_TypeError)
-PYBIND11_RUNTIME_EXCEPTION(buffer_error, PyExc_BufferError)
-PYBIND11_RUNTIME_EXCEPTION(import_error, PyExc_ImportError)
-PYBIND11_RUNTIME_EXCEPTION(cast_error, PyExc_RuntimeError) /// Thrown when pybind11::cast or handle::call fail due to a type casting error
-PYBIND11_RUNTIME_EXCEPTION(reference_cast_error, PyExc_RuntimeError) /// Used internally
-
-[[noreturn]] PYBIND11_NOINLINE inline void pybind11_fail(const char *reason) { throw std::runtime_error(reason); }
-[[noreturn]] PYBIND11_NOINLINE inline void pybind11_fail(const std::string &reason) { throw std::runtime_error(reason); }
-
-template <typename T, typename SFINAE = void> struct format_descriptor { };
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-// Returns the index of the given type in the type char array below, and in the list in numpy.h
-// The order here is: bool; 8 ints ((signed,unsigned)x(8,16,32,64)bits); float,double,long double;
-// complex float,double,long double. Note that the long double types only participate when long
-// double is actually longer than double (it isn't under MSVC).
-// NB: not only the string below but also complex.h and numpy.h rely on this order.
-template <typename T, typename SFINAE = void> struct is_fmt_numeric { static constexpr bool value = false; };
-template <typename T> struct is_fmt_numeric<T, enable_if_t<std::is_arithmetic<T>::value>> {
- static constexpr bool value = true;
- static constexpr int index = std::is_same<T, bool>::value ? 0 : 1 + (
- std::is_integral<T>::value ? detail::log2(sizeof(T))*2 + std::is_unsigned<T>::value : 8 + (
- std::is_same<T, double>::value ? 1 : std::is_same<T, long double>::value ? 2 : 0));
-};
-PYBIND11_NAMESPACE_END(detail)
-
-template <typename T> struct format_descriptor<T, detail::enable_if_t<std::is_arithmetic<T>::value>> {
- static constexpr const char c = "?bBhHiIqQfdg"[detail::is_fmt_numeric<T>::index];
- static constexpr const char value[2] = { c, '\0' };
- static std::string format() { return std::string(1, c); }
-};
-
-#if !defined(PYBIND11_CPP17)
-
-template <typename T> constexpr const char format_descriptor<
- T, detail::enable_if_t<std::is_arithmetic<T>::value>>::value[2];
-
-#endif
-
-/// RAII wrapper that temporarily clears any Python error state
-struct error_scope {
- PyObject *type, *value, *trace;
- error_scope() { PyErr_Fetch(&type, &value, &trace); }
- ~error_scope() { PyErr_Restore(type, value, trace); }
-};
-
-/// Dummy destructor wrapper that can be used to expose classes with a private destructor
-struct nodelete { template <typename T> void operator()(T*) { } };
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-template <typename... Args>
-struct overload_cast_impl {
- constexpr overload_cast_impl() {}; // NOLINT(modernize-use-equals-default): MSVC 2015 needs this
-
- template <typename Return>
- constexpr auto operator()(Return (*pf)(Args...)) const noexcept
- -> decltype(pf) { return pf; }
-
- template <typename Return, typename Class>
- constexpr auto operator()(Return (Class::*pmf)(Args...), std::false_type = {}) const noexcept
- -> decltype(pmf) { return pmf; }
-
- template <typename Return, typename Class>
- constexpr auto operator()(Return (Class::*pmf)(Args...) const, std::true_type) const noexcept
- -> decltype(pmf) { return pmf; }
-};
-PYBIND11_NAMESPACE_END(detail)
-
-// overload_cast requires variable templates: C++14
-#if defined(PYBIND11_CPP14)
-#define PYBIND11_OVERLOAD_CAST 1
-/// Syntax sugar for resolving overloaded function pointers:
-/// - regular: static_cast<Return (Class::*)(Arg0, Arg1, Arg2)>(&Class::func)
-/// - sweet: overload_cast<Arg0, Arg1, Arg2>(&Class::func)
-template <typename... Args>
-static constexpr detail::overload_cast_impl<Args...> overload_cast = {};
-// MSVC 2015 only accepts this particular initialization syntax for this variable template.
-#endif
-
-/// Const member function selector for overload_cast
-/// - regular: static_cast<Return (Class::*)(Arg) const>(&Class::func)
-/// - sweet: overload_cast<Arg>(&Class::func, const_)
-static constexpr auto const_ = std::true_type{};
-
-#if !defined(PYBIND11_CPP14) // no overload_cast: providing something that static_assert-fails:
-template <typename... Args> struct overload_cast {
- static_assert(detail::deferred_t<std::false_type, Args...>::value,
- "pybind11::overload_cast<...> requires compiling in C++14 mode");
-};
-#endif // overload_cast
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Adaptor for converting arbitrary container arguments into a vector; implicitly convertible from
-// any standard container (or C-style array) supporting std::begin/std::end, any singleton
-// arithmetic type (if T is arithmetic), or explicitly constructible from an iterator pair.
-template <typename T>
-class any_container {
- std::vector<T> v;
-public:
- any_container() = default;
-
- // Can construct from a pair of iterators
- template <typename It, typename = enable_if_t<is_input_iterator<It>::value>>
- any_container(It first, It last) : v(first, last) { }
-
- // Implicit conversion constructor from any arbitrary container type with values convertible to T
- template <typename Container, typename = enable_if_t<std::is_convertible<decltype(*std::begin(std::declval<const Container &>())), T>::value>>
- any_container(const Container &c) : any_container(std::begin(c), std::end(c)) { }
-
- // initializer_list's aren't deducible, so don't get matched by the above template; we need this
- // to explicitly allow implicit conversion from one:
- template <typename TIn, typename = enable_if_t<std::is_convertible<TIn, T>::value>>
- any_container(const std::initializer_list<TIn> &c) : any_container(c.begin(), c.end()) { }
-
- // Avoid copying if given an rvalue vector of the correct type.
- any_container(std::vector<T> &&v) : v(std::move(v)) { }
-
- // Moves the vector out of an rvalue any_container
- operator std::vector<T> &&() && { return std::move(v); }
-
- // Dereferencing obtains a reference to the underlying vector
- std::vector<T> &operator*() { return v; }
- const std::vector<T> &operator*() const { return v; }
-
- // -> lets you call methods on the underlying vector
- std::vector<T> *operator->() { return &v; }
- const std::vector<T> *operator->() const { return &v; }
-};
-
-// Forward-declaration; see detail/class.h
-std::string get_fully_qualified_tp_name(PyTypeObject*);
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/descr.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/descr.h
deleted file mode 100644
index 92720cd56277e73a27da3bac85c3c2ae6a3589ac..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/descr.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- pybind11/detail/descr.h: Helper type for concatenating type signatures at compile time
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "common.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-#if !defined(_MSC_VER)
-# define PYBIND11_DESCR_CONSTEXPR static constexpr
-#else
-# define PYBIND11_DESCR_CONSTEXPR const
-#endif
-
-/* Concatenate type signatures at compile time */
-template <size_t N, typename... Ts>
-struct descr {
- char text[N + 1];
-
- constexpr descr() : text{'\0'} { }
- constexpr descr(char const (&s)[N+1]) : descr(s, make_index_sequence<N>()) { }
-
- template <size_t... Is>
- constexpr descr(char const (&s)[N+1], index_sequence<Is...>) : text{s[Is]..., '\0'} { }
-
- template <typename... Chars>
- constexpr descr(char c, Chars... cs) : text{c, static_cast<char>(cs)..., '\0'} { }
-
- static constexpr std::array<const std::type_info *, sizeof...(Ts) + 1> types() {
- return {{&typeid(Ts)..., nullptr}};
- }
-};
-
-template <size_t N1, size_t N2, typename... Ts1, typename... Ts2, size_t... Is1, size_t... Is2>
-constexpr descr<N1 + N2, Ts1..., Ts2...> plus_impl(const descr<N1, Ts1...> &a, const descr<N2, Ts2...> &b,
- index_sequence<Is1...>, index_sequence<Is2...>) {
- return {a.text[Is1]..., b.text[Is2]...};
-}
-
-template <size_t N1, size_t N2, typename... Ts1, typename... Ts2>
-constexpr descr<N1 + N2, Ts1..., Ts2...> operator+(const descr<N1, Ts1...> &a, const descr<N2, Ts2...> &b) {
- return plus_impl(a, b, make_index_sequence<N1>(), make_index_sequence<N2>());
-}
-
-template <size_t N>
-constexpr descr<N - 1> _(char const(&text)[N]) { return descr<N - 1>(text); }
-constexpr descr<0> _(char const(&)[1]) { return {}; }
-
-template <size_t Rem, size_t... Digits> struct int_to_str : int_to_str<Rem/10, Rem%10, Digits...> { };
-template <size_t...Digits> struct int_to_str<0, Digits...> {
- static constexpr auto digits = descr<sizeof...(Digits)>(('0' + Digits)...);
-};
-
-// Ternary description (like std::conditional)
-template <bool B, size_t N1, size_t N2>
-constexpr enable_if_t<B, descr<N1 - 1>> _(char const(&text1)[N1], char const(&)[N2]) {
- return _(text1);
-}
-template <bool B, size_t N1, size_t N2>
-constexpr enable_if_t<!B, descr<N2 - 1>> _(char const(&)[N1], char const(&text2)[N2]) {
- return _(text2);
-}
-
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<B, T1> _(const T1 &d, const T2 &) { return d; }
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<!B, T2> _(const T1 &, const T2 &d) { return d; }
-
-template <size_t Size> auto constexpr _() -> decltype(int_to_str<Size / 10, Size % 10>::digits) {
- return int_to_str<Size / 10, Size % 10>::digits;
-}
-
-template <typename Type> constexpr descr<1, Type> _() { return {'%'}; }
-
-constexpr descr<0> concat() { return {}; }
-
-template <size_t N, typename... Ts>
-constexpr descr<N, Ts...> concat(const descr<N, Ts...> &descr) { return descr; }
-
-template <size_t N, typename... Ts, typename... Args>
-constexpr auto concat(const descr<N, Ts...> &d, const Args &...args)
- -> decltype(std::declval<descr<N + 2, Ts...>>() + concat(args...)) {
- return d + _(", ") + concat(args...);
-}
-
-template <size_t N, typename... Ts>
-constexpr descr<N + 2, Ts...> type_descr(const descr<N, Ts...> &descr) {
- return _("{") + descr + _("}");
-}
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/init.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/init.h
deleted file mode 100644
index 3ef78c1179f5b533c3ba3f637420c8125d632a7f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/init.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- pybind11/detail/init.h: init factory function implementation and support code.
-
- Copyright (c) 2017 Jason Rhinelander <jason@imaginary.ca>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "class.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <>
-class type_caster<value_and_holder> {
-public:
- bool load(handle h, bool) {
- value = reinterpret_cast<value_and_holder *>(h.ptr());
- return true;
- }
-
- template <typename> using cast_op_type = value_and_holder &;
- operator value_and_holder &() { return *value; }
- static constexpr auto name = _<value_and_holder>();
-
-private:
- value_and_holder *value = nullptr;
-};
-
-PYBIND11_NAMESPACE_BEGIN(initimpl)
-
-inline void no_nullptr(void *ptr) {
- if (!ptr) throw type_error("pybind11::init(): factory function returned nullptr");
-}
-
-// Implementing functions for all forms of py::init<...> and py::init(...)
-template <typename Class> using Cpp = typename Class::type;
-template <typename Class> using Alias = typename Class::type_alias;
-template <typename Class> using Holder = typename Class::holder_type;
-
-template <typename Class> using is_alias_constructible = std::is_constructible<Alias<Class>, Cpp<Class> &&>;
-
-// Takes a Cpp pointer and returns true if it actually is a polymorphic Alias instance.
-template <typename Class, enable_if_t<Class::has_alias, int> = 0>
-bool is_alias(Cpp<Class> *ptr) {
- return dynamic_cast<Alias<Class> *>(ptr) != nullptr;
-}
-// Failing fallback version of the above for a no-alias class (always returns false)
-template <typename /*Class*/>
-constexpr bool is_alias(void *) { return false; }
-
-// Constructs and returns a new object; if the given arguments don't map to a constructor, we fall
-// back to brace aggregate initiailization so that for aggregate initialization can be used with
-// py::init, e.g. `py::init<int, int>` to initialize a `struct T { int a; int b; }`. For
-// non-aggregate types, we need to use an ordinary T(...) constructor (invoking as `T{...}` usually
-// works, but will not do the expected thing when `T` has an `initializer_list<T>` constructor).
-template <typename Class, typename... Args, detail::enable_if_t<std::is_constructible<Class, Args...>::value, int> = 0>
-inline Class *construct_or_initialize(Args &&...args) { return new Class(std::forward<Args>(args)...); }
-template <typename Class, typename... Args, detail::enable_if_t<!std::is_constructible<Class, Args...>::value, int> = 0>
-inline Class *construct_or_initialize(Args &&...args) { return new Class{std::forward<Args>(args)...}; }
-
-// Attempts to constructs an alias using a `Alias(Cpp &&)` constructor. This allows types with
-// an alias to provide only a single Cpp factory function as long as the Alias can be
-// constructed from an rvalue reference of the base Cpp type. This means that Alias classes
-// can, when appropriate, simply define a `Alias(Cpp &&)` constructor rather than needing to
-// inherit all the base class constructors.
-template <typename Class>
-void construct_alias_from_cpp(std::true_type /*is_alias_constructible*/,
- value_and_holder &v_h, Cpp<Class> &&base) {
- v_h.value_ptr() = new Alias<Class>(std::move(base));
-}
-template <typename Class>
-[[noreturn]] void construct_alias_from_cpp(std::false_type /*!is_alias_constructible*/,
- value_and_holder &, Cpp<Class> &&) {
- throw type_error("pybind11::init(): unable to convert returned instance to required "
- "alias class: no `Alias<Class>(Class &&)` constructor available");
-}
-
-// Error-generating fallback for factories that don't match one of the below construction
-// mechanisms.
-template <typename Class>
-void construct(...) {
- static_assert(!std::is_same<Class, Class>::value /* always false */,
- "pybind11::init(): init function must return a compatible pointer, "
- "holder, or value");
-}
-
-// Pointer return v1: the factory function returns a class pointer for a registered class.
-// If we don't need an alias (because this class doesn't have one, or because the final type is
-// inherited on the Python side) we can simply take over ownership. Otherwise we need to try to
-// construct an Alias from the returned base instance.
-template <typename Class>
-void construct(value_and_holder &v_h, Cpp<Class> *ptr, bool need_alias) {
- no_nullptr(ptr);
- if (Class::has_alias && need_alias && !is_alias<Class>(ptr)) {
- // We're going to try to construct an alias by moving the cpp type. Whether or not
- // that succeeds, we still need to destroy the original cpp pointer (either the
- // moved away leftover, if the alias construction works, or the value itself if we
- // throw an error), but we can't just call `delete ptr`: it might have a special
- // deleter, or might be shared_from_this. So we construct a holder around it as if
- // it was a normal instance, then steal the holder away into a local variable; thus
- // the holder and destruction happens when we leave the C++ scope, and the holder
- // class gets to handle the destruction however it likes.
- v_h.value_ptr() = ptr;
- v_h.set_instance_registered(true); // To prevent init_instance from registering it
- v_h.type->init_instance(v_h.inst, nullptr); // Set up the holder
- Holder<Class> temp_holder(std::move(v_h.holder<Holder<Class>>())); // Steal the holder
- v_h.type->dealloc(v_h); // Destroys the moved-out holder remains, resets value ptr to null
- v_h.set_instance_registered(false);
-
- construct_alias_from_cpp<Class>(is_alias_constructible<Class>{}, v_h, std::move(*ptr));
- } else {
- // Otherwise the type isn't inherited, so we don't need an Alias
- v_h.value_ptr() = ptr;
- }
-}
-
-// Pointer return v2: a factory that always returns an alias instance ptr. We simply take over
-// ownership of the pointer.
-template <typename Class, enable_if_t<Class::has_alias, int> = 0>
-void construct(value_and_holder &v_h, Alias<Class> *alias_ptr, bool) {
- no_nullptr(alias_ptr);
- v_h.value_ptr() = static_cast<Cpp<Class> *>(alias_ptr);
-}
-
-// Holder return: copy its pointer, and move or copy the returned holder into the new instance's
-// holder. This also handles types like std::shared_ptr<T> and std::unique_ptr<T> where T is a
-// derived type (through those holder's implicit conversion from derived class holder constructors).
-template <typename Class>
-void construct(value_and_holder &v_h, Holder<Class> holder, bool need_alias) {
- auto *ptr = holder_helper<Holder<Class>>::get(holder);
- no_nullptr(ptr);
- // If we need an alias, check that the held pointer is actually an alias instance
- if (Class::has_alias && need_alias && !is_alias<Class>(ptr))
- throw type_error("pybind11::init(): construction failed: returned holder-wrapped instance "
- "is not an alias instance");
-
- v_h.value_ptr() = ptr;
- v_h.type->init_instance(v_h.inst, &holder);
-}
-
-// return-by-value version 1: returning a cpp class by value. If the class has an alias and an
-// alias is required the alias must have an `Alias(Cpp &&)` constructor so that we can construct
-// the alias from the base when needed (i.e. because of Python-side inheritance). When we don't
-// need it, we simply move-construct the cpp value into a new instance.
-template <typename Class>
-void construct(value_and_holder &v_h, Cpp<Class> &&result, bool need_alias) {
- static_assert(std::is_move_constructible<Cpp<Class>>::value,
- "pybind11::init() return-by-value factory function requires a movable class");
- if (Class::has_alias && need_alias)
- construct_alias_from_cpp<Class>(is_alias_constructible<Class>{}, v_h, std::move(result));
- else
- v_h.value_ptr() = new Cpp<Class>(std::move(result));
-}
-
-// return-by-value version 2: returning a value of the alias type itself. We move-construct an
-// Alias instance (even if no the python-side inheritance is involved). The is intended for
-// cases where Alias initialization is always desired.
-template <typename Class>
-void construct(value_and_holder &v_h, Alias<Class> &&result, bool) {
- static_assert(std::is_move_constructible<Alias<Class>>::value,
- "pybind11::init() return-by-alias-value factory function requires a movable alias class");
- v_h.value_ptr() = new Alias<Class>(std::move(result));
-}
-
-// Implementing class for py::init<...>()
-template <typename... Args>
-struct constructor {
- template <typename Class, typename... Extra, enable_if_t<!Class::has_alias, int> = 0>
- static void execute(Class &cl, const Extra&... extra) {
- cl.def("__init__", [](value_and_holder &v_h, Args... args) {
- v_h.value_ptr() = construct_or_initialize<Cpp<Class>>(std::forward<Args>(args)...);
- }, is_new_style_constructor(), extra...);
- }
-
- template <typename Class, typename... Extra,
- enable_if_t<Class::has_alias &&
- std::is_constructible<Cpp<Class>, Args...>::value, int> = 0>
- static void execute(Class &cl, const Extra&... extra) {
- cl.def("__init__", [](value_and_holder &v_h, Args... args) {
- if (Py_TYPE(v_h.inst) == v_h.type->type)
- v_h.value_ptr() = construct_or_initialize<Cpp<Class>>(std::forward<Args>(args)...);
- else
- v_h.value_ptr() = construct_or_initialize<Alias<Class>>(std::forward<Args>(args)...);
- }, is_new_style_constructor(), extra...);
- }
-
- template <typename Class, typename... Extra,
- enable_if_t<Class::has_alias &&
- !std::is_constructible<Cpp<Class>, Args...>::value, int> = 0>
- static void execute(Class &cl, const Extra&... extra) {
- cl.def("__init__", [](value_and_holder &v_h, Args... args) {
- v_h.value_ptr() = construct_or_initialize<Alias<Class>>(std::forward<Args>(args)...);
- }, is_new_style_constructor(), extra...);
- }
-};
-
-// Implementing class for py::init_alias<...>()
-template <typename... Args> struct alias_constructor {
- template <typename Class, typename... Extra,
- enable_if_t<Class::has_alias && std::is_constructible<Alias<Class>, Args...>::value, int> = 0>
- static void execute(Class &cl, const Extra&... extra) {
- cl.def("__init__", [](value_and_holder &v_h, Args... args) {
- v_h.value_ptr() = construct_or_initialize<Alias<Class>>(std::forward<Args>(args)...);
- }, is_new_style_constructor(), extra...);
- }
-};
-
-// Implementation class for py::init(Func) and py::init(Func, AliasFunc)
-template <typename CFunc, typename AFunc = void_type (*)(),
- typename = function_signature_t<CFunc>, typename = function_signature_t<AFunc>>
-struct factory;
-
-// Specialization for py::init(Func)
-template <typename Func, typename Return, typename... Args>
-struct factory<Func, void_type (*)(), Return(Args...)> {
- remove_reference_t<Func> class_factory;
-
- factory(Func &&f) : class_factory(std::forward<Func>(f)) { }
-
- // The given class either has no alias or has no separate alias factory;
- // this always constructs the class itself. If the class is registered with an alias
- // type and an alias instance is needed (i.e. because the final type is a Python class
- // inheriting from the C++ type) the returned value needs to either already be an alias
- // instance, or the alias needs to be constructible from a `Class &&` argument.
- template <typename Class, typename... Extra>
- void execute(Class &cl, const Extra &...extra) && {
- #if defined(PYBIND11_CPP14)
- cl.def("__init__", [func = std::move(class_factory)]
- #else
- auto &func = class_factory;
- cl.def("__init__", [func]
- #endif
- (value_and_holder &v_h, Args... args) {
- construct<Class>(v_h, func(std::forward<Args>(args)...),
- Py_TYPE(v_h.inst) != v_h.type->type);
- }, is_new_style_constructor(), extra...);
- }
-};
-
-// Specialization for py::init(Func, AliasFunc)
-template <typename CFunc, typename AFunc,
- typename CReturn, typename... CArgs, typename AReturn, typename... AArgs>
-struct factory<CFunc, AFunc, CReturn(CArgs...), AReturn(AArgs...)> {
- static_assert(sizeof...(CArgs) == sizeof...(AArgs),
- "pybind11::init(class_factory, alias_factory): class and alias factories "
- "must have identical argument signatures");
- static_assert(all_of<std::is_same<CArgs, AArgs>...>::value,
- "pybind11::init(class_factory, alias_factory): class and alias factories "
- "must have identical argument signatures");
-
- remove_reference_t<CFunc> class_factory;
- remove_reference_t<AFunc> alias_factory;
-
- factory(CFunc &&c, AFunc &&a)
- : class_factory(std::forward<CFunc>(c)), alias_factory(std::forward<AFunc>(a)) { }
-
- // The class factory is called when the `self` type passed to `__init__` is the direct
- // class (i.e. not inherited), the alias factory when `self` is a Python-side subtype.
- template <typename Class, typename... Extra>
- void execute(Class &cl, const Extra&... extra) && {
- static_assert(Class::has_alias, "The two-argument version of `py::init()` can "
- "only be used if the class has an alias");
- #if defined(PYBIND11_CPP14)
- cl.def("__init__", [class_func = std::move(class_factory), alias_func = std::move(alias_factory)]
- #else
- auto &class_func = class_factory;
- auto &alias_func = alias_factory;
- cl.def("__init__", [class_func, alias_func]
- #endif
- (value_and_holder &v_h, CArgs... args) {
- if (Py_TYPE(v_h.inst) == v_h.type->type)
- // If the instance type equals the registered type we don't have inheritance, so
- // don't need the alias and can construct using the class function:
- construct<Class>(v_h, class_func(std::forward<CArgs>(args)...), false);
- else
- construct<Class>(v_h, alias_func(std::forward<CArgs>(args)...), true);
- }, is_new_style_constructor(), extra...);
- }
-};
-
-/// Set just the C++ state. Same as `__init__`.
-template <typename Class, typename T>
-void setstate(value_and_holder &v_h, T &&result, bool need_alias) {
- construct<Class>(v_h, std::forward<T>(result), need_alias);
-}
-
-/// Set both the C++ and Python states
-template <typename Class, typename T, typename O,
- enable_if_t<std::is_convertible<O, handle>::value, int> = 0>
-void setstate(value_and_holder &v_h, std::pair<T, O> &&result, bool need_alias) {
- construct<Class>(v_h, std::move(result.first), need_alias);
- setattr((PyObject *) v_h.inst, "__dict__", result.second);
-}
-
-/// Implementation for py::pickle(GetState, SetState)
-template <typename Get, typename Set,
- typename = function_signature_t<Get>, typename = function_signature_t<Set>>
-struct pickle_factory;
-
-template <typename Get, typename Set,
- typename RetState, typename Self, typename NewInstance, typename ArgState>
-struct pickle_factory<Get, Set, RetState(Self), NewInstance(ArgState)> {
- static_assert(std::is_same<intrinsic_t<RetState>, intrinsic_t<ArgState>>::value,
- "The type returned by `__getstate__` must be the same "
- "as the argument accepted by `__setstate__`");
-
- remove_reference_t<Get> get;
- remove_reference_t<Set> set;
-
- pickle_factory(Get get, Set set)
- : get(std::forward<Get>(get)), set(std::forward<Set>(set)) { }
-
- template <typename Class, typename... Extra>
- void execute(Class &cl, const Extra &...extra) && {
- cl.def("__getstate__", std::move(get));
-
-#if defined(PYBIND11_CPP14)
- cl.def("__setstate__", [func = std::move(set)]
-#else
- auto &func = set;
- cl.def("__setstate__", [func]
-#endif
- (value_and_holder &v_h, ArgState state) {
- setstate<Class>(v_h, func(std::forward<ArgState>(state)),
- Py_TYPE(v_h.inst) != v_h.type->type);
- }, is_new_style_constructor(), extra...);
- }
-};
-
-PYBIND11_NAMESPACE_END(initimpl)
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(pybind11)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/internals.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/internals.h
deleted file mode 100644
index a455715bfd4d76266ac791076c2feff2b98108db..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/internals.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- pybind11/detail/internals.h: Internal data structure and related functions
-
- Copyright (c) 2017 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "../pytypes.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-// Forward declarations
-inline PyTypeObject *make_static_property_type();
-inline PyTypeObject *make_default_metaclass();
-inline PyObject *make_object_base_type(PyTypeObject *metaclass);
-
-// The old Python Thread Local Storage (TLS) API is deprecated in Python 3.7 in favor of the new
-// Thread Specific Storage (TSS) API.
-#if PY_VERSION_HEX >= 0x03070000
-# define PYBIND11_TLS_KEY_INIT(var) Py_tss_t *var = nullptr
-# define PYBIND11_TLS_GET_VALUE(key) PyThread_tss_get((key))
-# define PYBIND11_TLS_REPLACE_VALUE(key, value) PyThread_tss_set((key), (value))
-# define PYBIND11_TLS_DELETE_VALUE(key) PyThread_tss_set((key), nullptr)
-# define PYBIND11_TLS_FREE(key) PyThread_tss_free(key)
-#else
- // Usually an int but a long on Cygwin64 with Python 3.x
-# define PYBIND11_TLS_KEY_INIT(var) decltype(PyThread_create_key()) var = 0
-# define PYBIND11_TLS_GET_VALUE(key) PyThread_get_key_value((key))
-# if PY_MAJOR_VERSION < 3
-# define PYBIND11_TLS_DELETE_VALUE(key) \
- PyThread_delete_key_value(key)
-# define PYBIND11_TLS_REPLACE_VALUE(key, value) \
- do { \
- PyThread_delete_key_value((key)); \
- PyThread_set_key_value((key), (value)); \
- } while (false)
-# else
-# define PYBIND11_TLS_DELETE_VALUE(key) \
- PyThread_set_key_value((key), nullptr)
-# define PYBIND11_TLS_REPLACE_VALUE(key, value) \
- PyThread_set_key_value((key), (value))
-# endif
-# define PYBIND11_TLS_FREE(key) (void)key
-#endif
-
-// Python loads modules by default with dlopen with the RTLD_LOCAL flag; under libc++ and possibly
-// other STLs, this means `typeid(A)` from one module won't equal `typeid(A)` from another module
-// even when `A` is the same, non-hidden-visibility type (e.g. from a common include). Under
-// libstdc++, this doesn't happen: equality and the type_index hash are based on the type name,
-// which works. If not under a known-good stl, provide our own name-based hash and equality
-// functions that use the type name.
-#if defined(__GLIBCXX__)
-inline bool same_type(const std::type_info &lhs, const std::type_info &rhs) { return lhs == rhs; }
-using type_hash = std::hash<std::type_index>;
-using type_equal_to = std::equal_to<std::type_index>;
-#else
-inline bool same_type(const std::type_info &lhs, const std::type_info &rhs) {
- return lhs.name() == rhs.name() || std::strcmp(lhs.name(), rhs.name()) == 0;
-}
-
-struct type_hash {
- size_t operator()(const std::type_index &t) const {
- size_t hash = 5381;
- const char *ptr = t.name();
- while (auto c = static_cast<unsigned char>(*ptr++))
- hash = (hash * 33) ^ c;
- return hash;
- }
-};
-
-struct type_equal_to {
- bool operator()(const std::type_index &lhs, const std::type_index &rhs) const {
- return lhs.name() == rhs.name() || std::strcmp(lhs.name(), rhs.name()) == 0;
- }
-};
-#endif
-
-template <typename value_type>
-using type_map = std::unordered_map<std::type_index, value_type, type_hash, type_equal_to>;
-
-struct override_hash {
- inline size_t operator()(const std::pair<const PyObject *, const char *>& v) const {
- size_t value = std::hash<const void *>()(v.first);
- value ^= std::hash<const void *>()(v.second) + 0x9e3779b9 + (value<<6) + (value>>2);
- return value;
- }
-};
-
-/// Internal data structure used to track registered instances and types.
-/// Whenever binary incompatible changes are made to this structure,
-/// `PYBIND11_INTERNALS_VERSION` must be incremented.
-struct internals {
- type_map<type_info *> registered_types_cpp; // std::type_index -> pybind11's type information
- std::unordered_map<PyTypeObject *, std::vector<type_info *>> registered_types_py; // PyTypeObject* -> base type_info(s)
- std::unordered_multimap<const void *, instance*> registered_instances; // void * -> instance*
- std::unordered_set<std::pair<const PyObject *, const char *>, override_hash> inactive_override_cache;
- type_map<std::vector<bool (*)(PyObject *, void *&)>> direct_conversions;
- std::unordered_map<const PyObject *, std::vector<PyObject *>> patients;
- std::forward_list<void (*) (std::exception_ptr)> registered_exception_translators;
- std::unordered_map<std::string, void *> shared_data; // Custom data to be shared across extensions
- std::vector<PyObject *> loader_patient_stack; // Used by `loader_life_support`
- std::forward_list<std::string> static_strings; // Stores the std::strings backing detail::c_str()
- PyTypeObject *static_property_type;
- PyTypeObject *default_metaclass;
- PyObject *instance_base;
-#if defined(WITH_THREAD)
- PYBIND11_TLS_KEY_INIT(tstate);
- PyInterpreterState *istate = nullptr;
- ~internals() {
- // This destructor is called *after* Py_Finalize() in finalize_interpreter().
- // That *SHOULD BE* fine. The following details what happens whe PyThread_tss_free is called.
- // PYBIND11_TLS_FREE is PyThread_tss_free on python 3.7+. On older python, it does nothing.
- // PyThread_tss_free calls PyThread_tss_delete and PyMem_RawFree.
- // PyThread_tss_delete just calls TlsFree (on Windows) or pthread_key_delete (on *NIX). Neither
- // of those have anything to do with CPython internals.
- // PyMem_RawFree *requires* that the `tstate` be allocated with the CPython allocator.
- PYBIND11_TLS_FREE(tstate);
- }
-#endif
-};
-
-/// Additional type information which does not fit into the PyTypeObject.
-/// Changes to this struct also require bumping `PYBIND11_INTERNALS_VERSION`.
-struct type_info {
- PyTypeObject *type;
- const std::type_info *cpptype;
- size_t type_size, type_align, holder_size_in_ptrs;
- void *(*operator_new)(size_t);
- void (*init_instance)(instance *, const void *);
- void (*dealloc)(value_and_holder &v_h);
- std::vector<PyObject *(*)(PyObject *, PyTypeObject *)> implicit_conversions;
- std::vector<std::pair<const std::type_info *, void *(*)(void *)>> implicit_casts;
- std::vector<bool (*)(PyObject *, void *&)> *direct_conversions;
- buffer_info *(*get_buffer)(PyObject *, void *) = nullptr;
- void *get_buffer_data = nullptr;
- void *(*module_local_load)(PyObject *, const type_info *) = nullptr;
- /* A simple type never occurs as a (direct or indirect) parent
- * of a class that makes use of multiple inheritance */
- bool simple_type : 1;
- /* True if there is no multiple inheritance in this type's inheritance tree */
- bool simple_ancestors : 1;
- /* for base vs derived holder_type checks */
- bool default_holder : 1;
- /* true if this is a type registered with py::module_local */
- bool module_local : 1;
-};
-
-/// Tracks the `internals` and `type_info` ABI version independent of the main library version
-#define PYBIND11_INTERNALS_VERSION 4
-
-/// On MSVC, debug and release builds are not ABI-compatible!
-#if defined(_MSC_VER) && defined(_DEBUG)
-# define PYBIND11_BUILD_TYPE "_debug"
-#else
-# define PYBIND11_BUILD_TYPE ""
-#endif
-
-/// Let's assume that different compilers are ABI-incompatible.
-/// A user can manually set this string if they know their
-/// compiler is compatible.
-#ifndef PYBIND11_COMPILER_TYPE
-# if defined(_MSC_VER)
-# define PYBIND11_COMPILER_TYPE "_msvc"
-# elif defined(__INTEL_COMPILER)
-# define PYBIND11_COMPILER_TYPE "_icc"
-# elif defined(__clang__)
-# define PYBIND11_COMPILER_TYPE "_clang"
-# elif defined(__PGI)
-# define PYBIND11_COMPILER_TYPE "_pgi"
-# elif defined(__MINGW32__)
-# define PYBIND11_COMPILER_TYPE "_mingw"
-# elif defined(__CYGWIN__)
-# define PYBIND11_COMPILER_TYPE "_gcc_cygwin"
-# elif defined(__GNUC__)
-# define PYBIND11_COMPILER_TYPE "_gcc"
-# else
-# define PYBIND11_COMPILER_TYPE "_unknown"
-# endif
-#endif
-
-/// Also standard libs
-#ifndef PYBIND11_STDLIB
-# if defined(_LIBCPP_VERSION)
-# define PYBIND11_STDLIB "_libcpp"
-# elif defined(__GLIBCXX__) || defined(__GLIBCPP__)
-# define PYBIND11_STDLIB "_libstdcpp"
-# else
-# define PYBIND11_STDLIB ""
-# endif
-#endif
-
-/// On Linux/OSX, changes in __GXX_ABI_VERSION__ indicate ABI incompatibility.
-#ifndef PYBIND11_BUILD_ABI
-# if defined(__GXX_ABI_VERSION)
-# define PYBIND11_BUILD_ABI "_cxxabi" PYBIND11_TOSTRING(__GXX_ABI_VERSION)
-# else
-# define PYBIND11_BUILD_ABI ""
-# endif
-#endif
-
-#ifndef PYBIND11_INTERNALS_KIND
-# if defined(WITH_THREAD)
-# define PYBIND11_INTERNALS_KIND ""
-# else
-# define PYBIND11_INTERNALS_KIND "_without_thread"
-# endif
-#endif
-
-#define PYBIND11_INTERNALS_ID "__pybind11_internals_v" \
- PYBIND11_TOSTRING(PYBIND11_INTERNALS_VERSION) PYBIND11_INTERNALS_KIND PYBIND11_COMPILER_TYPE PYBIND11_STDLIB PYBIND11_BUILD_ABI PYBIND11_BUILD_TYPE "__"
-
-#define PYBIND11_MODULE_LOCAL_ID "__pybind11_module_local_v" \
- PYBIND11_TOSTRING(PYBIND11_INTERNALS_VERSION) PYBIND11_INTERNALS_KIND PYBIND11_COMPILER_TYPE PYBIND11_STDLIB PYBIND11_BUILD_ABI PYBIND11_BUILD_TYPE "__"
-
-/// Each module locally stores a pointer to the `internals` data. The data
-/// itself is shared among modules with the same `PYBIND11_INTERNALS_ID`.
-inline internals **&get_internals_pp() {
- static internals **internals_pp = nullptr;
- return internals_pp;
-}
-
-inline void translate_exception(std::exception_ptr p) {
- try {
- if (p) std::rethrow_exception(p);
- } catch (error_already_set &e) { e.restore(); return;
- } catch (const builtin_exception &e) { e.set_error(); return;
- } catch (const std::bad_alloc &e) { PyErr_SetString(PyExc_MemoryError, e.what()); return;
- } catch (const std::domain_error &e) { PyErr_SetString(PyExc_ValueError, e.what()); return;
- } catch (const std::invalid_argument &e) { PyErr_SetString(PyExc_ValueError, e.what()); return;
- } catch (const std::length_error &e) { PyErr_SetString(PyExc_ValueError, e.what()); return;
- } catch (const std::out_of_range &e) { PyErr_SetString(PyExc_IndexError, e.what()); return;
- } catch (const std::range_error &e) { PyErr_SetString(PyExc_ValueError, e.what()); return;
- } catch (const std::overflow_error &e) { PyErr_SetString(PyExc_OverflowError, e.what()); return;
- } catch (const std::exception &e) { PyErr_SetString(PyExc_RuntimeError, e.what()); return;
- } catch (...) {
- PyErr_SetString(PyExc_RuntimeError, "Caught an unknown exception!");
- return;
- }
-}
-
-#if !defined(__GLIBCXX__)
-inline void translate_local_exception(std::exception_ptr p) {
- try {
- if (p) std::rethrow_exception(p);
- } catch (error_already_set &e) { e.restore(); return;
- } catch (const builtin_exception &e) { e.set_error(); return;
- }
-}
-#endif
-
-/// Return a reference to the current `internals` data
-PYBIND11_NOINLINE inline internals &get_internals() {
- auto **&internals_pp = get_internals_pp();
- if (internals_pp && *internals_pp)
- return **internals_pp;
-
- // Ensure that the GIL is held since we will need to make Python calls.
- // Cannot use py::gil_scoped_acquire here since that constructor calls get_internals.
- struct gil_scoped_acquire_local {
- gil_scoped_acquire_local() : state (PyGILState_Ensure()) {}
- ~gil_scoped_acquire_local() { PyGILState_Release(state); }
- const PyGILState_STATE state;
- } gil;
-
- constexpr auto *id = PYBIND11_INTERNALS_ID;
- auto builtins = handle(PyEval_GetBuiltins());
- if (builtins.contains(id) && isinstance<capsule>(builtins[id])) {
- internals_pp = static_cast<internals **>(capsule(builtins[id]));
-
- // We loaded builtins through python's builtins, which means that our `error_already_set`
- // and `builtin_exception` may be different local classes than the ones set up in the
- // initial exception translator, below, so add another for our local exception classes.
- //
- // libstdc++ doesn't require this (types there are identified only by name)
-#if !defined(__GLIBCXX__)
- (*internals_pp)->registered_exception_translators.push_front(&translate_local_exception);
-#endif
- } else {
- if (!internals_pp) internals_pp = new internals*();
- auto *&internals_ptr = *internals_pp;
- internals_ptr = new internals();
-#if defined(WITH_THREAD)
-
- #if PY_VERSION_HEX < 0x03090000
- PyEval_InitThreads();
- #endif
- PyThreadState *tstate = PyThreadState_Get();
- #if PY_VERSION_HEX >= 0x03070000
- internals_ptr->tstate = PyThread_tss_alloc();
- if (!internals_ptr->tstate || PyThread_tss_create(internals_ptr->tstate))
- pybind11_fail("get_internals: could not successfully initialize the TSS key!");
- PyThread_tss_set(internals_ptr->tstate, tstate);
- #else
- internals_ptr->tstate = PyThread_create_key();
- if (internals_ptr->tstate == -1)
- pybind11_fail("get_internals: could not successfully initialize the TLS key!");
- PyThread_set_key_value(internals_ptr->tstate, tstate);
- #endif
- internals_ptr->istate = tstate->interp;
-#endif
- builtins[id] = capsule(internals_pp);
- internals_ptr->registered_exception_translators.push_front(&translate_exception);
- internals_ptr->static_property_type = make_static_property_type();
- internals_ptr->default_metaclass = make_default_metaclass();
- internals_ptr->instance_base = make_object_base_type(internals_ptr->default_metaclass);
- }
- return **internals_pp;
-}
-
-/// Works like `internals.registered_types_cpp`, but for module-local registered types:
-inline type_map<type_info *> ®istered_local_types_cpp() {
- static type_map<type_info *> locals{};
- return locals;
-}
-
-/// Constructs a std::string with the given arguments, stores it in `internals`, and returns its
-/// `c_str()`. Such strings objects have a long storage duration -- the internal strings are only
-/// cleared when the program exits or after interpreter shutdown (when embedding), and so are
-/// suitable for c-style strings needed by Python internals (such as PyTypeObject's tp_name).
-template <typename... Args>
-const char *c_str(Args &&...args) {
- auto &strings = get_internals().static_strings;
- strings.emplace_front(std::forward<Args>(args)...);
- return strings.front().c_str();
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Returns a named pointer that is shared among all extension modules (using the same
-/// pybind11 version) running in the current interpreter. Names starting with underscores
-/// are reserved for internal usage. Returns `nullptr` if no matching entry was found.
-inline PYBIND11_NOINLINE void *get_shared_data(const std::string &name) {
- auto &internals = detail::get_internals();
- auto it = internals.shared_data.find(name);
- return it != internals.shared_data.end() ? it->second : nullptr;
-}
-
-/// Set the shared data that can be later recovered by `get_shared_data()`.
-inline PYBIND11_NOINLINE void *set_shared_data(const std::string &name, void *data) {
- detail::get_internals().shared_data[name] = data;
- return data;
-}
-
-/// Returns a typed reference to a shared data entry (by using `get_shared_data()`) if
-/// such entry exists. Otherwise, a new object of default-constructible type `T` is
-/// added to the shared data under the given name and a reference to it is returned.
-template<typename T>
-T &get_or_create_shared_data(const std::string &name) {
- auto &internals = detail::get_internals();
- auto it = internals.shared_data.find(name);
- T *ptr = (T *) (it != internals.shared_data.end() ? it->second : nullptr);
- if (!ptr) {
- ptr = new T();
- internals.shared_data[name] = ptr;
- }
- return *ptr;
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/typeid.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/typeid.h
deleted file mode 100644
index 148889ffefdcc4de303d99f82af43aa9302c0a7c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/detail/typeid.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- pybind11/detail/typeid.h: Compiler-independent access to type identifiers
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include <cstdio>
-#include <cstdlib>
-
-#if defined(__GNUG__)
-#include <cxxabi.h>
-#endif
-
-#include "common.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-/// Erase all occurrences of a substring
-inline void erase_all(std::string &string, const std::string &search) {
- for (size_t pos = 0;;) {
- pos = string.find(search, pos);
- if (pos == std::string::npos) break;
- string.erase(pos, search.length());
- }
-}
-
-PYBIND11_NOINLINE inline void clean_type_id(std::string &name) {
-#if defined(__GNUG__)
- int status = 0;
- std::unique_ptr<char, void (*)(void *)> res {
- abi::__cxa_demangle(name.c_str(), nullptr, nullptr, &status), std::free };
- if (status == 0)
- name = res.get();
-#else
- detail::erase_all(name, "class ");
- detail::erase_all(name, "struct ");
- detail::erase_all(name, "enum ");
-#endif
- detail::erase_all(name, "pybind11::");
-}
-PYBIND11_NAMESPACE_END(detail)
-
-/// Return a string representation of a C++ type
-template <typename T> static std::string type_id() {
- std::string name(typeid(T).name());
- detail::clean_type_id(name);
- return name;
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/eigen.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/eigen.h
deleted file mode 100644
index 58582b2cea3d171d642d0c4298ded9dcb29197c0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/eigen.h
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
- pybind11/eigen.h: Transparent conversion for dense and sparse Eigen matrices
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "numpy.h"
-
-#if defined(__INTEL_COMPILER)
-# pragma warning(disable: 1682) // implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
-#elif defined(__GNUG__) || defined(__clang__)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wconversion"
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-# ifdef __clang__
-// Eigen generates a bunch of implicit-copy-constructor-is-deprecated warnings with -Wdeprecated
-// under Clang, so disable that warning here:
-# pragma GCC diagnostic ignored "-Wdeprecated"
-# endif
-# if __GNUC__ >= 7
-# pragma GCC diagnostic ignored "-Wint-in-bool-context"
-# endif
-#endif
-
-#if defined(_MSC_VER)
-# pragma warning(push)
-# pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
-# pragma warning(disable: 4996) // warning C4996: std::unary_negate is deprecated in C++17
-#endif
-
-#include <Eigen/Core>
-#include <Eigen/SparseCore>
-
-// Eigen prior to 3.2.7 doesn't have proper move constructors--but worse, some classes get implicit
-// move constructors that break things. We could detect this an explicitly copy, but an extra copy
-// of matrices seems highly undesirable.
-static_assert(EIGEN_VERSION_AT_LEAST(3,2,7), "Eigen support in pybind11 requires Eigen >= 3.2.7");
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-// Provide a convenience alias for easier pass-by-ref usage with fully dynamic strides:
-using EigenDStride = Eigen::Stride<Eigen::Dynamic, Eigen::Dynamic>;
-template <typename MatrixType> using EigenDRef = Eigen::Ref<MatrixType, 0, EigenDStride>;
-template <typename MatrixType> using EigenDMap = Eigen::Map<MatrixType, 0, EigenDStride>;
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-#if EIGEN_VERSION_AT_LEAST(3,3,0)
-using EigenIndex = Eigen::Index;
-#else
-using EigenIndex = EIGEN_DEFAULT_DENSE_INDEX_TYPE;
-#endif
-
-// Matches Eigen::Map, Eigen::Ref, blocks, etc:
-template <typename T> using is_eigen_dense_map = all_of<is_template_base_of<Eigen::DenseBase, T>, std::is_base_of<Eigen::MapBase<T, Eigen::ReadOnlyAccessors>, T>>;
-template <typename T> using is_eigen_mutable_map = std::is_base_of<Eigen::MapBase<T, Eigen::WriteAccessors>, T>;
-template <typename T> using is_eigen_dense_plain = all_of<negation<is_eigen_dense_map<T>>, is_template_base_of<Eigen::PlainObjectBase, T>>;
-template <typename T> using is_eigen_sparse = is_template_base_of<Eigen::SparseMatrixBase, T>;
-// Test for objects inheriting from EigenBase<Derived> that aren't captured by the above. This
-// basically covers anything that can be assigned to a dense matrix but that don't have a typical
-// matrix data layout that can be copied from their .data(). For example, DiagonalMatrix and
-// SelfAdjointView fall into this category.
-template <typename T> using is_eigen_other = all_of<
- is_template_base_of<Eigen::EigenBase, T>,
- negation<any_of<is_eigen_dense_map<T>, is_eigen_dense_plain<T>, is_eigen_sparse<T>>>
->;
-
-// Captures numpy/eigen conformability status (returned by EigenProps::conformable()):
-template <bool EigenRowMajor> struct EigenConformable {
- bool conformable = false;
- EigenIndex rows = 0, cols = 0;
- EigenDStride stride{0, 0}; // Only valid if negativestrides is false!
- bool negativestrides = false; // If true, do not use stride!
-
- EigenConformable(bool fits = false) : conformable{fits} {}
- // Matrix type:
- EigenConformable(EigenIndex r, EigenIndex c,
- EigenIndex rstride, EigenIndex cstride) :
- conformable{true}, rows{r}, cols{c} {
- // TODO: when Eigen bug #747 is fixed, remove the tests for non-negativity. http://eigen.tuxfamily.org/bz/show_bug.cgi?id=747
- if (rstride < 0 || cstride < 0) {
- negativestrides = true;
- } else {
- stride = {EigenRowMajor ? rstride : cstride /* outer stride */,
- EigenRowMajor ? cstride : rstride /* inner stride */ };
- }
- }
- // Vector type:
- EigenConformable(EigenIndex r, EigenIndex c, EigenIndex stride)
- : EigenConformable(r, c, r == 1 ? c*stride : stride, c == 1 ? r : r*stride) {}
-
- template <typename props> bool stride_compatible() const {
- // To have compatible strides, we need (on both dimensions) one of fully dynamic strides,
- // matching strides, or a dimension size of 1 (in which case the stride value is irrelevant)
- return
- !negativestrides &&
- (props::inner_stride == Eigen::Dynamic || props::inner_stride == stride.inner() ||
- (EigenRowMajor ? cols : rows) == 1) &&
- (props::outer_stride == Eigen::Dynamic || props::outer_stride == stride.outer() ||
- (EigenRowMajor ? rows : cols) == 1);
- }
- operator bool() const { return conformable; }
-};
-
-template <typename Type> struct eigen_extract_stride { using type = Type; };
-template <typename PlainObjectType, int MapOptions, typename StrideType>
-struct eigen_extract_stride<Eigen::Map<PlainObjectType, MapOptions, StrideType>> { using type = StrideType; };
-template <typename PlainObjectType, int Options, typename StrideType>
-struct eigen_extract_stride<Eigen::Ref<PlainObjectType, Options, StrideType>> { using type = StrideType; };
-
-// Helper struct for extracting information from an Eigen type
-template <typename Type_> struct EigenProps {
- using Type = Type_;
- using Scalar = typename Type::Scalar;
- using StrideType = typename eigen_extract_stride<Type>::type;
- static constexpr EigenIndex
- rows = Type::RowsAtCompileTime,
- cols = Type::ColsAtCompileTime,
- size = Type::SizeAtCompileTime;
- static constexpr bool
- row_major = Type::IsRowMajor,
- vector = Type::IsVectorAtCompileTime, // At least one dimension has fixed size 1
- fixed_rows = rows != Eigen::Dynamic,
- fixed_cols = cols != Eigen::Dynamic,
- fixed = size != Eigen::Dynamic, // Fully-fixed size
- dynamic = !fixed_rows && !fixed_cols; // Fully-dynamic size
-
- template <EigenIndex i, EigenIndex ifzero> using if_zero = std::integral_constant<EigenIndex, i == 0 ? ifzero : i>;
- static constexpr EigenIndex inner_stride = if_zero<StrideType::InnerStrideAtCompileTime, 1>::value,
- outer_stride = if_zero<StrideType::OuterStrideAtCompileTime,
- vector ? size : row_major ? cols : rows>::value;
- static constexpr bool dynamic_stride = inner_stride == Eigen::Dynamic && outer_stride == Eigen::Dynamic;
- static constexpr bool requires_row_major = !dynamic_stride && !vector && (row_major ? inner_stride : outer_stride) == 1;
- static constexpr bool requires_col_major = !dynamic_stride && !vector && (row_major ? outer_stride : inner_stride) == 1;
-
- // Takes an input array and determines whether we can make it fit into the Eigen type. If
- // the array is a vector, we attempt to fit it into either an Eigen 1xN or Nx1 vector
- // (preferring the latter if it will fit in either, i.e. for a fully dynamic matrix type).
- static EigenConformable<row_major> conformable(const array &a) {
- const auto dims = a.ndim();
- if (dims < 1 || dims > 2)
- return false;
-
- if (dims == 2) { // Matrix type: require exact match (or dynamic)
-
- EigenIndex
- np_rows = a.shape(0),
- np_cols = a.shape(1),
- np_rstride = a.strides(0) / static_cast<ssize_t>(sizeof(Scalar)),
- np_cstride = a.strides(1) / static_cast<ssize_t>(sizeof(Scalar));
- if ((fixed_rows && np_rows != rows) || (fixed_cols && np_cols != cols))
- return false;
-
- return {np_rows, np_cols, np_rstride, np_cstride};
- }
-
- // Otherwise we're storing an n-vector. Only one of the strides will be used, but whichever
- // is used, we want the (single) numpy stride value.
- const EigenIndex n = a.shape(0),
- stride = a.strides(0) / static_cast<ssize_t>(sizeof(Scalar));
-
- if (vector) { // Eigen type is a compile-time vector
- if (fixed && size != n)
- return false; // Vector size mismatch
- return {rows == 1 ? 1 : n, cols == 1 ? 1 : n, stride};
- }
- else if (fixed) {
- // The type has a fixed size, but is not a vector: abort
- return false;
- }
- else if (fixed_cols) {
- // Since this isn't a vector, cols must be != 1. We allow this only if it exactly
- // equals the number of elements (rows is Dynamic, and so 1 row is allowed).
- if (cols != n) return false;
- return {1, n, stride};
- }
- else {
- // Otherwise it's either fully dynamic, or column dynamic; both become a column vector
- if (fixed_rows && rows != n) return false;
- return {n, 1, stride};
- }
- }
-
- static constexpr bool show_writeable = is_eigen_dense_map<Type>::value && is_eigen_mutable_map<Type>::value;
- static constexpr bool show_order = is_eigen_dense_map<Type>::value;
- static constexpr bool show_c_contiguous = show_order && requires_row_major;
- static constexpr bool show_f_contiguous = !show_c_contiguous && show_order && requires_col_major;
-
- static constexpr auto descriptor =
- _("numpy.ndarray[") + npy_format_descriptor<Scalar>::name +
- _("[") + _<fixed_rows>(_<(size_t) rows>(), _("m")) +
- _(", ") + _<fixed_cols>(_<(size_t) cols>(), _("n")) +
- _("]") +
- // For a reference type (e.g. Ref<MatrixXd>) we have other constraints that might need to be
- // satisfied: writeable=True (for a mutable reference), and, depending on the map's stride
- // options, possibly f_contiguous or c_contiguous. We include them in the descriptor output
- // to provide some hint as to why a TypeError is occurring (otherwise it can be confusing to
- // see that a function accepts a 'numpy.ndarray[float64[3,2]]' and an error message that you
- // *gave* a numpy.ndarray of the right type and dimensions.
- _<show_writeable>(", flags.writeable", "") +
- _<show_c_contiguous>(", flags.c_contiguous", "") +
- _<show_f_contiguous>(", flags.f_contiguous", "") +
- _("]");
-};
-
-// Casts an Eigen type to numpy array. If given a base, the numpy array references the src data,
-// otherwise it'll make a copy. writeable lets you turn off the writeable flag for the array.
-template <typename props> handle eigen_array_cast(typename props::Type const &src, handle base = handle(), bool writeable = true) {
- constexpr ssize_t elem_size = sizeof(typename props::Scalar);
- array a;
- if (props::vector)
- a = array({ src.size() }, { elem_size * src.innerStride() }, src.data(), base);
- else
- a = array({ src.rows(), src.cols() }, { elem_size * src.rowStride(), elem_size * src.colStride() },
- src.data(), base);
-
- if (!writeable)
- array_proxy(a.ptr())->flags &= ~detail::npy_api::NPY_ARRAY_WRITEABLE_;
-
- return a.release();
-}
-
-// Takes an lvalue ref to some Eigen type and a (python) base object, creating a numpy array that
-// reference the Eigen object's data with `base` as the python-registered base class (if omitted,
-// the base will be set to None, and lifetime management is up to the caller). The numpy array is
-// non-writeable if the given type is const.
-template <typename props, typename Type>
-handle eigen_ref_array(Type &src, handle parent = none()) {
- // none here is to get past array's should-we-copy detection, which currently always
- // copies when there is no base. Setting the base to None should be harmless.
- return eigen_array_cast<props>(src, parent, !std::is_const<Type>::value);
-}
-
-// Takes a pointer to some dense, plain Eigen type, builds a capsule around it, then returns a numpy
-// array that references the encapsulated data with a python-side reference to the capsule to tie
-// its destruction to that of any dependent python objects. Const-ness is determined by whether or
-// not the Type of the pointer given is const.
-template <typename props, typename Type, typename = enable_if_t<is_eigen_dense_plain<Type>::value>>
-handle eigen_encapsulate(Type *src) {
- capsule base(src, [](void *o) { delete static_cast<Type *>(o); });
- return eigen_ref_array<props>(*src, base);
-}
-
-// Type caster for regular, dense matrix types (e.g. MatrixXd), but not maps/refs/etc. of dense
-// types.
-template<typename Type>
-struct type_caster<Type, enable_if_t<is_eigen_dense_plain<Type>::value>> {
- using Scalar = typename Type::Scalar;
- using props = EigenProps<Type>;
-
- bool load(handle src, bool convert) {
- // If we're in no-convert mode, only load if given an array of the correct type
- if (!convert && !isinstance<array_t<Scalar>>(src))
- return false;
-
- // Coerce into an array, but don't do type conversion yet; the copy below handles it.
- auto buf = array::ensure(src);
-
- if (!buf)
- return false;
-
- auto dims = buf.ndim();
- if (dims < 1 || dims > 2)
- return false;
-
- auto fits = props::conformable(buf);
- if (!fits)
- return false;
-
- // Allocate the new type, then build a numpy reference into it
- value = Type(fits.rows, fits.cols);
- auto ref = reinterpret_steal<array>(eigen_ref_array<props>(value));
- if (dims == 1) ref = ref.squeeze();
- else if (ref.ndim() == 1) buf = buf.squeeze();
-
- int result = detail::npy_api::get().PyArray_CopyInto_(ref.ptr(), buf.ptr());
-
- if (result < 0) { // Copy failed!
- PyErr_Clear();
- return false;
- }
-
- return true;
- }
-
-private:
-
- // Cast implementation
- template <typename CType>
- static handle cast_impl(CType *src, return_value_policy policy, handle parent) {
- switch (policy) {
- case return_value_policy::take_ownership:
- case return_value_policy::automatic:
- return eigen_encapsulate<props>(src);
- case return_value_policy::move:
- return eigen_encapsulate<props>(new CType(std::move(*src)));
- case return_value_policy::copy:
- return eigen_array_cast<props>(*src);
- case return_value_policy::reference:
- case return_value_policy::automatic_reference:
- return eigen_ref_array<props>(*src);
- case return_value_policy::reference_internal:
- return eigen_ref_array<props>(*src, parent);
- default:
- throw cast_error("unhandled return_value_policy: should not happen!");
- };
- }
-
-public:
-
- // Normal returned non-reference, non-const value:
- static handle cast(Type &&src, return_value_policy /* policy */, handle parent) {
- return cast_impl(&src, return_value_policy::move, parent);
- }
- // If you return a non-reference const, we mark the numpy array readonly:
- static handle cast(const Type &&src, return_value_policy /* policy */, handle parent) {
- return cast_impl(&src, return_value_policy::move, parent);
- }
- // lvalue reference return; default (automatic) becomes copy
- static handle cast(Type &src, return_value_policy policy, handle parent) {
- if (policy == return_value_policy::automatic || policy == return_value_policy::automatic_reference)
- policy = return_value_policy::copy;
- return cast_impl(&src, policy, parent);
- }
- // const lvalue reference return; default (automatic) becomes copy
- static handle cast(const Type &src, return_value_policy policy, handle parent) {
- if (policy == return_value_policy::automatic || policy == return_value_policy::automatic_reference)
- policy = return_value_policy::copy;
- return cast(&src, policy, parent);
- }
- // non-const pointer return
- static handle cast(Type *src, return_value_policy policy, handle parent) {
- return cast_impl(src, policy, parent);
- }
- // const pointer return
- static handle cast(const Type *src, return_value_policy policy, handle parent) {
- return cast_impl(src, policy, parent);
- }
-
- static constexpr auto name = props::descriptor;
-
- operator Type*() { return &value; }
- operator Type&() { return value; }
- operator Type&&() && { return std::move(value); }
- template <typename T> using cast_op_type = movable_cast_op_type<T>;
-
-private:
- Type value;
-};
-
-// Base class for casting reference/map/block/etc. objects back to python.
-template <typename MapType> struct eigen_map_caster {
-private:
- using props = EigenProps<MapType>;
-
-public:
-
- // Directly referencing a ref/map's data is a bit dangerous (whatever the map/ref points to has
- // to stay around), but we'll allow it under the assumption that you know what you're doing (and
- // have an appropriate keep_alive in place). We return a numpy array pointing directly at the
- // ref's data (The numpy array ends up read-only if the ref was to a const matrix type.) Note
- // that this means you need to ensure you don't destroy the object in some other way (e.g. with
- // an appropriate keep_alive, or with a reference to a statically allocated matrix).
- static handle cast(const MapType &src, return_value_policy policy, handle parent) {
- switch (policy) {
- case return_value_policy::copy:
- return eigen_array_cast<props>(src);
- case return_value_policy::reference_internal:
- return eigen_array_cast<props>(src, parent, is_eigen_mutable_map<MapType>::value);
- case return_value_policy::reference:
- case return_value_policy::automatic:
- case return_value_policy::automatic_reference:
- return eigen_array_cast<props>(src, none(), is_eigen_mutable_map<MapType>::value);
- default:
- // move, take_ownership don't make any sense for a ref/map:
- pybind11_fail("Invalid return_value_policy for Eigen Map/Ref/Block type");
- }
- }
-
- static constexpr auto name = props::descriptor;
-
- // Explicitly delete these: support python -> C++ conversion on these (i.e. these can be return
- // types but not bound arguments). We still provide them (with an explicitly delete) so that
- // you end up here if you try anyway.
- bool load(handle, bool) = delete;
- operator MapType() = delete;
- template <typename> using cast_op_type = MapType;
-};
-
-// We can return any map-like object (but can only load Refs, specialized next):
-template <typename Type> struct type_caster<Type, enable_if_t<is_eigen_dense_map<Type>::value>>
- : eigen_map_caster<Type> {};
-
-// Loader for Ref<...> arguments. See the documentation for info on how to make this work without
-// copying (it requires some extra effort in many cases).
-template <typename PlainObjectType, typename StrideType>
-struct type_caster<
- Eigen::Ref<PlainObjectType, 0, StrideType>,
- enable_if_t<is_eigen_dense_map<Eigen::Ref<PlainObjectType, 0, StrideType>>::value>
-> : public eigen_map_caster<Eigen::Ref<PlainObjectType, 0, StrideType>> {
-private:
- using Type = Eigen::Ref<PlainObjectType, 0, StrideType>;
- using props = EigenProps<Type>;
- using Scalar = typename props::Scalar;
- using MapType = Eigen::Map<PlainObjectType, 0, StrideType>;
- using Array = array_t<Scalar, array::forcecast |
- ((props::row_major ? props::inner_stride : props::outer_stride) == 1 ? array::c_style :
- (props::row_major ? props::outer_stride : props::inner_stride) == 1 ? array::f_style : 0)>;
- static constexpr bool need_writeable = is_eigen_mutable_map<Type>::value;
- // Delay construction (these have no default constructor)
- std::unique_ptr<MapType> map;
- std::unique_ptr<Type> ref;
- // Our array. When possible, this is just a numpy array pointing to the source data, but
- // sometimes we can't avoid copying (e.g. input is not a numpy array at all, has an incompatible
- // layout, or is an array of a type that needs to be converted). Using a numpy temporary
- // (rather than an Eigen temporary) saves an extra copy when we need both type conversion and
- // storage order conversion. (Note that we refuse to use this temporary copy when loading an
- // argument for a Ref<M> with M non-const, i.e. a read-write reference).
- Array copy_or_ref;
-public:
- bool load(handle src, bool convert) {
- // First check whether what we have is already an array of the right type. If not, we can't
- // avoid a copy (because the copy is also going to do type conversion).
- bool need_copy = !isinstance<Array>(src);
-
- EigenConformable<props::row_major> fits;
- if (!need_copy) {
- // We don't need a converting copy, but we also need to check whether the strides are
- // compatible with the Ref's stride requirements
- Array aref = reinterpret_borrow<Array>(src);
-
- if (aref && (!need_writeable || aref.writeable())) {
- fits = props::conformable(aref);
- if (!fits) return false; // Incompatible dimensions
- if (!fits.template stride_compatible<props>())
- need_copy = true;
- else
- copy_or_ref = std::move(aref);
- }
- else {
- need_copy = true;
- }
- }
-
- if (need_copy) {
- // We need to copy: If we need a mutable reference, or we're not supposed to convert
- // (either because we're in the no-convert overload pass, or because we're explicitly
- // instructed not to copy (via `py::arg().noconvert()`) we have to fail loading.
- if (!convert || need_writeable) return false;
-
- Array copy = Array::ensure(src);
- if (!copy) return false;
- fits = props::conformable(copy);
- if (!fits || !fits.template stride_compatible<props>())
- return false;
- copy_or_ref = std::move(copy);
- loader_life_support::add_patient(copy_or_ref);
- }
-
- ref.reset();
- map.reset(new MapType(data(copy_or_ref), fits.rows, fits.cols, make_stride(fits.stride.outer(), fits.stride.inner())));
- ref.reset(new Type(*map));
-
- return true;
- }
-
- operator Type*() { return ref.get(); }
- operator Type&() { return *ref; }
- template <typename _T> using cast_op_type = pybind11::detail::cast_op_type<_T>;
-
-private:
- template <typename T = Type, enable_if_t<is_eigen_mutable_map<T>::value, int> = 0>
- Scalar *data(Array &a) { return a.mutable_data(); }
-
- template <typename T = Type, enable_if_t<!is_eigen_mutable_map<T>::value, int> = 0>
- const Scalar *data(Array &a) { return a.data(); }
-
- // Attempt to figure out a constructor of `Stride` that will work.
- // If both strides are fixed, use a default constructor:
- template <typename S> using stride_ctor_default = bool_constant<
- S::InnerStrideAtCompileTime != Eigen::Dynamic && S::OuterStrideAtCompileTime != Eigen::Dynamic &&
- std::is_default_constructible<S>::value>;
- // Otherwise, if there is a two-index constructor, assume it is (outer,inner) like
- // Eigen::Stride, and use it:
- template <typename S> using stride_ctor_dual = bool_constant<
- !stride_ctor_default<S>::value && std::is_constructible<S, EigenIndex, EigenIndex>::value>;
- // Otherwise, if there is a one-index constructor, and just one of the strides is dynamic, use
- // it (passing whichever stride is dynamic).
- template <typename S> using stride_ctor_outer = bool_constant<
- !any_of<stride_ctor_default<S>, stride_ctor_dual<S>>::value &&
- S::OuterStrideAtCompileTime == Eigen::Dynamic && S::InnerStrideAtCompileTime != Eigen::Dynamic &&
- std::is_constructible<S, EigenIndex>::value>;
- template <typename S> using stride_ctor_inner = bool_constant<
- !any_of<stride_ctor_default<S>, stride_ctor_dual<S>>::value &&
- S::InnerStrideAtCompileTime == Eigen::Dynamic && S::OuterStrideAtCompileTime != Eigen::Dynamic &&
- std::is_constructible<S, EigenIndex>::value>;
-
- template <typename S = StrideType, enable_if_t<stride_ctor_default<S>::value, int> = 0>
- static S make_stride(EigenIndex, EigenIndex) { return S(); }
- template <typename S = StrideType, enable_if_t<stride_ctor_dual<S>::value, int> = 0>
- static S make_stride(EigenIndex outer, EigenIndex inner) { return S(outer, inner); }
- template <typename S = StrideType, enable_if_t<stride_ctor_outer<S>::value, int> = 0>
- static S make_stride(EigenIndex outer, EigenIndex) { return S(outer); }
- template <typename S = StrideType, enable_if_t<stride_ctor_inner<S>::value, int> = 0>
- static S make_stride(EigenIndex, EigenIndex inner) { return S(inner); }
-
-};
-
-// type_caster for special matrix types (e.g. DiagonalMatrix), which are EigenBase, but not
-// EigenDense (i.e. they don't have a data(), at least not with the usual matrix layout).
-// load() is not supported, but we can cast them into the python domain by first copying to a
-// regular Eigen::Matrix, then casting that.
-template <typename Type>
-struct type_caster<Type, enable_if_t<is_eigen_other<Type>::value>> {
-protected:
- using Matrix = Eigen::Matrix<typename Type::Scalar, Type::RowsAtCompileTime, Type::ColsAtCompileTime>;
- using props = EigenProps<Matrix>;
-public:
- static handle cast(const Type &src, return_value_policy /* policy */, handle /* parent */) {
- handle h = eigen_encapsulate<props>(new Matrix(src));
- return h;
- }
- static handle cast(const Type *src, return_value_policy policy, handle parent) { return cast(*src, policy, parent); }
-
- static constexpr auto name = props::descriptor;
-
- // Explicitly delete these: support python -> C++ conversion on these (i.e. these can be return
- // types but not bound arguments). We still provide them (with an explicitly delete) so that
- // you end up here if you try anyway.
- bool load(handle, bool) = delete;
- operator Type() = delete;
- template <typename> using cast_op_type = Type;
-};
-
-template<typename Type>
-struct type_caster<Type, enable_if_t<is_eigen_sparse<Type>::value>> {
- typedef typename Type::Scalar Scalar;
- typedef remove_reference_t<decltype(*std::declval<Type>().outerIndexPtr())> StorageIndex;
- typedef typename Type::Index Index;
- static constexpr bool rowMajor = Type::IsRowMajor;
-
- bool load(handle src, bool) {
- if (!src)
- return false;
-
- auto obj = reinterpret_borrow<object>(src);
- object sparse_module = module_::import("scipy.sparse");
- object matrix_type = sparse_module.attr(
- rowMajor ? "csr_matrix" : "csc_matrix");
-
- if (!type::handle_of(obj).is(matrix_type)) {
- try {
- obj = matrix_type(obj);
- } catch (const error_already_set &) {
- return false;
- }
- }
-
- auto values = array_t<Scalar>((object) obj.attr("data"));
- auto innerIndices = array_t<StorageIndex>((object) obj.attr("indices"));
- auto outerIndices = array_t<StorageIndex>((object) obj.attr("indptr"));
- auto shape = pybind11::tuple((pybind11::object) obj.attr("shape"));
- auto nnz = obj.attr("nnz").cast<Index>();
-
- if (!values || !innerIndices || !outerIndices)
- return false;
-
- value = Eigen::MappedSparseMatrix<Scalar, Type::Flags, StorageIndex>(
- shape[0].cast<Index>(), shape[1].cast<Index>(), nnz,
- outerIndices.mutable_data(), innerIndices.mutable_data(), values.mutable_data());
-
- return true;
- }
-
- static handle cast(const Type &src, return_value_policy /* policy */, handle /* parent */) {
- const_cast<Type&>(src).makeCompressed();
-
- object matrix_type = module_::import("scipy.sparse").attr(
- rowMajor ? "csr_matrix" : "csc_matrix");
-
- array data(src.nonZeros(), src.valuePtr());
- array outerIndices((rowMajor ? src.rows() : src.cols()) + 1, src.outerIndexPtr());
- array innerIndices(src.nonZeros(), src.innerIndexPtr());
-
- return matrix_type(
- std::make_tuple(data, innerIndices, outerIndices),
- std::make_pair(src.rows(), src.cols())
- ).release();
- }
-
- PYBIND11_TYPE_CASTER(Type, _<(Type::IsRowMajor) != 0>("scipy.sparse.csr_matrix[", "scipy.sparse.csc_matrix[")
- + npy_format_descriptor<Scalar>::name + _("]"));
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-#if defined(__GNUG__) || defined(__clang__)
-# pragma GCC diagnostic pop
-#elif defined(_MSC_VER)
-# pragma warning(pop)
-#endif
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/embed.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/embed.h
deleted file mode 100644
index 204aaf989ff6225543efa7b9fb85fb7dbe817b1b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/embed.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- pybind11/embed.h: Support for embedding the interpreter
-
- Copyright (c) 2017 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-#include "eval.h"
-
-#if defined(PYPY_VERSION)
-# error Embedding the interpreter is not supported with PyPy
-#endif
-
-#if PY_MAJOR_VERSION >= 3
-# define PYBIND11_EMBEDDED_MODULE_IMPL(name) \
- extern "C" PyObject *pybind11_init_impl_##name(); \
- extern "C" PyObject *pybind11_init_impl_##name() { \
- return pybind11_init_wrapper_##name(); \
- }
-#else
-# define PYBIND11_EMBEDDED_MODULE_IMPL(name) \
- extern "C" void pybind11_init_impl_##name(); \
- extern "C" void pybind11_init_impl_##name() { \
- pybind11_init_wrapper_##name(); \
- }
-#endif
-
-/** \rst
- Add a new module to the table of builtins for the interpreter. Must be
- defined in global scope. The first macro parameter is the name of the
- module (without quotes). The second parameter is the variable which will
- be used as the interface to add functions and classes to the module.
-
- .. code-block:: cpp
-
- PYBIND11_EMBEDDED_MODULE(example, m) {
- // ... initialize functions and classes here
- m.def("foo", []() {
- return "Hello, World!";
- });
- }
- \endrst */
-#define PYBIND11_EMBEDDED_MODULE(name, variable) \
- static ::pybind11::module_::module_def \
- PYBIND11_CONCAT(pybind11_module_def_, name); \
- static void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ &); \
- static PyObject PYBIND11_CONCAT(*pybind11_init_wrapper_, name)() { \
- auto m = ::pybind11::module_::create_extension_module( \
- PYBIND11_TOSTRING(name), nullptr, \
- &PYBIND11_CONCAT(pybind11_module_def_, name)); \
- try { \
- PYBIND11_CONCAT(pybind11_init_, name)(m); \
- return m.ptr(); \
- } PYBIND11_CATCH_INIT_EXCEPTIONS \
- } \
- PYBIND11_EMBEDDED_MODULE_IMPL(name) \
- ::pybind11::detail::embedded_module PYBIND11_CONCAT(pybind11_module_, name) \
- (PYBIND11_TOSTRING(name), \
- PYBIND11_CONCAT(pybind11_init_impl_, name)); \
- void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ &variable)
-
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// Python 2.7/3.x compatible version of `PyImport_AppendInittab` and error checks.
-struct embedded_module {
-#if PY_MAJOR_VERSION >= 3
- using init_t = PyObject *(*)();
-#else
- using init_t = void (*)();
-#endif
- embedded_module(const char *name, init_t init) {
- if (Py_IsInitialized())
- pybind11_fail("Can't add new modules after the interpreter has been initialized");
-
- auto result = PyImport_AppendInittab(name, init);
- if (result == -1)
- pybind11_fail("Insufficient memory to add a new module");
- }
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-/** \rst
- Initialize the Python interpreter. No other pybind11 or CPython API functions can be
- called before this is done; with the exception of `PYBIND11_EMBEDDED_MODULE`. The
- optional parameter can be used to skip the registration of signal handlers (see the
- `Python documentation`_ for details). Calling this function again after the interpreter
- has already been initialized is a fatal error.
-
- If initializing the Python interpreter fails, then the program is terminated. (This
- is controlled by the CPython runtime and is an exception to pybind11's normal behavior
- of throwing exceptions on errors.)
-
- .. _Python documentation: https://docs.python.org/3/c-api/init.html#c.Py_InitializeEx
- \endrst */
-inline void initialize_interpreter(bool init_signal_handlers = true) {
- if (Py_IsInitialized())
- pybind11_fail("The interpreter is already running");
-
- Py_InitializeEx(init_signal_handlers ? 1 : 0);
-
- // Make .py files in the working directory available by default
- module_::import("sys").attr("path").cast<list>().append(".");
-}
-
-/** \rst
- Shut down the Python interpreter. No pybind11 or CPython API functions can be called
- after this. In addition, pybind11 objects must not outlive the interpreter:
-
- .. code-block:: cpp
-
- { // BAD
- py::initialize_interpreter();
- auto hello = py::str("Hello, World!");
- py::finalize_interpreter();
- } // <-- BOOM, hello's destructor is called after interpreter shutdown
-
- { // GOOD
- py::initialize_interpreter();
- { // scoped
- auto hello = py::str("Hello, World!");
- } // <-- OK, hello is cleaned up properly
- py::finalize_interpreter();
- }
-
- { // BETTER
- py::scoped_interpreter guard{};
- auto hello = py::str("Hello, World!");
- }
-
- .. warning::
-
- The interpreter can be restarted by calling `initialize_interpreter` again.
- Modules created using pybind11 can be safely re-initialized. However, Python
- itself cannot completely unload binary extension modules and there are several
- caveats with regard to interpreter restarting. All the details can be found
- in the CPython documentation. In short, not all interpreter memory may be
- freed, either due to reference cycles or user-created global data.
-
- \endrst */
-inline void finalize_interpreter() {
- handle builtins(PyEval_GetBuiltins());
- const char *id = PYBIND11_INTERNALS_ID;
-
- // Get the internals pointer (without creating it if it doesn't exist). It's possible for the
- // internals to be created during Py_Finalize() (e.g. if a py::capsule calls `get_internals()`
- // during destruction), so we get the pointer-pointer here and check it after Py_Finalize().
- detail::internals **internals_ptr_ptr = detail::get_internals_pp();
- // It could also be stashed in builtins, so look there too:
- if (builtins.contains(id) && isinstance<capsule>(builtins[id]))
- internals_ptr_ptr = capsule(builtins[id]);
-
- Py_Finalize();
-
- if (internals_ptr_ptr) {
- delete *internals_ptr_ptr;
- *internals_ptr_ptr = nullptr;
- }
-}
-
-/** \rst
- Scope guard version of `initialize_interpreter` and `finalize_interpreter`.
- This a move-only guard and only a single instance can exist.
-
- .. code-block:: cpp
-
- #include <pybind11/embed.h>
-
- int main() {
- py::scoped_interpreter guard{};
- py::print(Hello, World!);
- } // <-- interpreter shutdown
- \endrst */
-class scoped_interpreter {
-public:
- scoped_interpreter(bool init_signal_handlers = true) {
- initialize_interpreter(init_signal_handlers);
- }
-
- scoped_interpreter(const scoped_interpreter &) = delete;
- scoped_interpreter(scoped_interpreter &&other) noexcept { other.is_valid = false; }
- scoped_interpreter &operator=(const scoped_interpreter &) = delete;
- scoped_interpreter &operator=(scoped_interpreter &&) = delete;
-
- ~scoped_interpreter() {
- if (is_valid)
- finalize_interpreter();
- }
-
-private:
- bool is_valid = true;
-};
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/eval.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/eval.h
deleted file mode 100644
index 05d7bb6140b32681c626253c30ec44cdbe738140..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/eval.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- pybind11/exec.h: Support for evaluating Python expressions and statements
- from strings and files
-
- Copyright (c) 2016 Klemens Morgenstern <klemens.morgenstern@ed-chemnitz.de> and
- Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-enum eval_mode {
- /// Evaluate a string containing an isolated expression
- eval_expr,
-
- /// Evaluate a string containing a single statement. Returns \c none
- eval_single_statement,
-
- /// Evaluate a string containing a sequence of statement. Returns \c none
- eval_statements
-};
-
-template <eval_mode mode = eval_expr>
-object eval(str expr, object global = globals(), object local = object()) {
- if (!local)
- local = global;
-
- /* PyRun_String does not accept a PyObject / encoding specifier,
- this seems to be the only alternative */
- std::string buffer = "# -*- coding: utf-8 -*-\n" + (std::string) expr;
-
- int start;
- switch (mode) {
- case eval_expr: start = Py_eval_input; break;
- case eval_single_statement: start = Py_single_input; break;
- case eval_statements: start = Py_file_input; break;
- default: pybind11_fail("invalid evaluation mode");
- }
-
- PyObject *result = PyRun_String(buffer.c_str(), start, global.ptr(), local.ptr());
- if (!result)
- throw error_already_set();
- return reinterpret_steal<object>(result);
-}
-
-template <eval_mode mode = eval_expr, size_t N>
-object eval(const char (&s)[N], object global = globals(), object local = object()) {
- /* Support raw string literals by removing common leading whitespace */
- auto expr = (s[0] == '\n') ? str(module_::import("textwrap").attr("dedent")(s))
- : str(s);
- return eval<mode>(expr, global, local);
-}
-
-inline void exec(str expr, object global = globals(), object local = object()) {
- eval<eval_statements>(expr, global, local);
-}
-
-template <size_t N>
-void exec(const char (&s)[N], object global = globals(), object local = object()) {
- eval<eval_statements>(s, global, local);
-}
-
-#if defined(PYPY_VERSION) && PY_VERSION_HEX >= 0x03000000
-template <eval_mode mode = eval_statements>
-object eval_file(str, object, object) {
- pybind11_fail("eval_file not supported in PyPy3. Use eval");
-}
-template <eval_mode mode = eval_statements>
-object eval_file(str, object) {
- pybind11_fail("eval_file not supported in PyPy3. Use eval");
-}
-template <eval_mode mode = eval_statements>
-object eval_file(str) {
- pybind11_fail("eval_file not supported in PyPy3. Use eval");
-}
-#else
-template <eval_mode mode = eval_statements>
-object eval_file(str fname, object global = globals(), object local = object()) {
- if (!local)
- local = global;
-
- int start;
- switch (mode) {
- case eval_expr: start = Py_eval_input; break;
- case eval_single_statement: start = Py_single_input; break;
- case eval_statements: start = Py_file_input; break;
- default: pybind11_fail("invalid evaluation mode");
- }
-
- int closeFile = 1;
- std::string fname_str = (std::string) fname;
-#if PY_VERSION_HEX >= 0x03040000
- FILE *f = _Py_fopen_obj(fname.ptr(), "r");
-#elif PY_VERSION_HEX >= 0x03000000
- FILE *f = _Py_fopen(fname.ptr(), "r");
-#else
- /* No unicode support in open() :( */
- auto fobj = reinterpret_steal<object>(PyFile_FromString(
- const_cast<char *>(fname_str.c_str()),
- const_cast<char*>("r")));
- FILE *f = nullptr;
- if (fobj)
- f = PyFile_AsFile(fobj.ptr());
- closeFile = 0;
-#endif
- if (!f) {
- PyErr_Clear();
- pybind11_fail("File \"" + fname_str + "\" could not be opened!");
- }
-
-#if PY_VERSION_HEX < 0x03000000 && defined(PYPY_VERSION)
- PyObject *result = PyRun_File(f, fname_str.c_str(), start, global.ptr(),
- local.ptr());
- (void) closeFile;
-#else
- PyObject *result = PyRun_FileEx(f, fname_str.c_str(), start, global.ptr(),
- local.ptr(), closeFile);
-#endif
-
- if (!result)
- throw error_already_set();
- return reinterpret_steal<object>(result);
-}
-#endif
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/functional.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/functional.h
deleted file mode 100644
index 92c17dc2255cacacee6b03ad3b73109a5bbcacc3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/functional.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- pybind11/functional.h: std::function<> support
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-#include <functional>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename Return, typename... Args>
-struct type_caster<std::function<Return(Args...)>> {
- using type = std::function<Return(Args...)>;
- using retval_type = conditional_t<std::is_same<Return, void>::value, void_type, Return>;
- using function_type = Return (*) (Args...);
-
-public:
- bool load(handle src, bool convert) {
- if (src.is_none()) {
- // Defer accepting None to other overloads (if we aren't in convert mode):
- if (!convert) return false;
- return true;
- }
-
- if (!isinstance<function>(src))
- return false;
-
- auto func = reinterpret_borrow<function>(src);
-
- /*
- When passing a C++ function as an argument to another C++
- function via Python, every function call would normally involve
- a full C++ -> Python -> C++ roundtrip, which can be prohibitive.
- Here, we try to at least detect the case where the function is
- stateless (i.e. function pointer or lambda function without
- captured variables), in which case the roundtrip can be avoided.
- */
- if (auto cfunc = func.cpp_function()) {
- auto c = reinterpret_borrow<capsule>(PyCFunction_GET_SELF(cfunc.ptr()));
- auto rec = (function_record *) c;
-
- if (rec && rec->is_stateless &&
- same_type(typeid(function_type), *reinterpret_cast<const std::type_info *>(rec->data[1]))) {
- struct capture { function_type f; };
- value = ((capture *) &rec->data)->f;
- return true;
- }
- }
-
- // ensure GIL is held during functor destruction
- struct func_handle {
- function f;
- func_handle(function&& f_) : f(std::move(f_)) {}
- func_handle(const func_handle& f_) {
- gil_scoped_acquire acq;
- f = f_.f;
- }
- ~func_handle() {
- gil_scoped_acquire acq;
- function kill_f(std::move(f));
- }
- };
-
- // to emulate 'move initialization capture' in C++11
- struct func_wrapper {
- func_handle hfunc;
- func_wrapper(func_handle&& hf): hfunc(std::move(hf)) {}
- Return operator()(Args... args) const {
- gil_scoped_acquire acq;
- object retval(hfunc.f(std::forward<Args>(args)...));
- /* Visual studio 2015 parser issue: need parentheses around this expression */
- return (retval.template cast<Return>());
- }
- };
-
- value = func_wrapper(func_handle(std::move(func)));
- return true;
- }
-
- template <typename Func>
- static handle cast(Func &&f_, return_value_policy policy, handle /* parent */) {
- if (!f_)
- return none().inc_ref();
-
- auto result = f_.template target<function_type>();
- if (result)
- return cpp_function(*result, policy).release();
- else
- return cpp_function(std::forward<Func>(f_), policy).release();
- }
-
- PYBIND11_TYPE_CASTER(type, _("Callable[[") + concat(make_caster<Args>::name...) + _("], ")
- + make_caster<retval_type>::name + _("]"));
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/iostream.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/iostream.h
deleted file mode 100644
index 5e9a8143d0da8b12ef0c846a253587c7e3756a3d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/iostream.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- pybind11/iostream.h -- Tools to assist with redirecting cout and cerr to Python
-
- Copyright (c) 2017 Henry F. Schreiner
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-#include <streambuf>
-#include <ostream>
-#include <string>
-#include <memory>
-#include <iostream>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Buffer that writes to Python instead of C++
-class pythonbuf : public std::streambuf {
-private:
- using traits_type = std::streambuf::traits_type;
-
- const size_t buf_size;
- std::unique_ptr<char[]> d_buffer;
- object pywrite;
- object pyflush;
-
- int overflow(int c) override {
- if (!traits_type::eq_int_type(c, traits_type::eof())) {
- *pptr() = traits_type::to_char_type(c);
- pbump(1);
- }
- return sync() == 0 ? traits_type::not_eof(c) : traits_type::eof();
- }
-
- // This function must be non-virtual to be called in a destructor. If the
- // rare MSVC test failure shows up with this version, then this should be
- // simplified to a fully qualified call.
- int _sync() {
- if (pbase() != pptr()) {
- // This subtraction cannot be negative, so dropping the sign
- str line(pbase(), static_cast<size_t>(pptr() - pbase()));
-
- {
- gil_scoped_acquire tmp;
- pywrite(line);
- pyflush();
- }
-
- setp(pbase(), epptr());
- }
- return 0;
- }
-
- int sync() override {
- return _sync();
- }
-
-public:
-
- pythonbuf(object pyostream, size_t buffer_size = 1024)
- : buf_size(buffer_size),
- d_buffer(new char[buf_size]),
- pywrite(pyostream.attr("write")),
- pyflush(pyostream.attr("flush")) {
- setp(d_buffer.get(), d_buffer.get() + buf_size - 1);
- }
-
- pythonbuf(pythonbuf&&) = default;
-
- /// Sync before destroy
- ~pythonbuf() override {
- _sync();
- }
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-
-/** \rst
- This a move-only guard that redirects output.
-
- .. code-block:: cpp
-
- #include <pybind11/iostream.h>
-
- ...
-
- {
- py::scoped_ostream_redirect output;
- std::cout << "Hello, World!"; // Python stdout
- } // <-- return std::cout to normal
-
- You can explicitly pass the c++ stream and the python object,
- for example to guard stderr instead.
-
- .. code-block:: cpp
-
- {
- py::scoped_ostream_redirect output{std::cerr, py::module_::import("sys").attr("stderr")};
- std::cerr << "Hello, World!";
- }
- \endrst */
-class scoped_ostream_redirect {
-protected:
- std::streambuf *old;
- std::ostream &costream;
- detail::pythonbuf buffer;
-
-public:
- scoped_ostream_redirect(
- std::ostream &costream = std::cout,
- object pyostream = module_::import("sys").attr("stdout"))
- : costream(costream), buffer(pyostream) {
- old = costream.rdbuf(&buffer);
- }
-
- ~scoped_ostream_redirect() {
- costream.rdbuf(old);
- }
-
- scoped_ostream_redirect(const scoped_ostream_redirect &) = delete;
- scoped_ostream_redirect(scoped_ostream_redirect &&other) = default;
- scoped_ostream_redirect &operator=(const scoped_ostream_redirect &) = delete;
- scoped_ostream_redirect &operator=(scoped_ostream_redirect &&) = delete;
-};
-
-
-/** \rst
- Like `scoped_ostream_redirect`, but redirects cerr by default. This class
- is provided primary to make ``py::call_guard`` easier to make.
-
- .. code-block:: cpp
-
- m.def("noisy_func", &noisy_func,
- py::call_guard<scoped_ostream_redirect,
- scoped_estream_redirect>());
-
-\endrst */
-class scoped_estream_redirect : public scoped_ostream_redirect {
-public:
- scoped_estream_redirect(
- std::ostream &costream = std::cerr,
- object pyostream = module_::import("sys").attr("stderr"))
- : scoped_ostream_redirect(costream,pyostream) {}
-};
-
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Class to redirect output as a context manager. C++ backend.
-class OstreamRedirect {
- bool do_stdout_;
- bool do_stderr_;
- std::unique_ptr<scoped_ostream_redirect> redirect_stdout;
- std::unique_ptr<scoped_estream_redirect> redirect_stderr;
-
-public:
- OstreamRedirect(bool do_stdout = true, bool do_stderr = true)
- : do_stdout_(do_stdout), do_stderr_(do_stderr) {}
-
- void enter() {
- if (do_stdout_)
- redirect_stdout.reset(new scoped_ostream_redirect());
- if (do_stderr_)
- redirect_stderr.reset(new scoped_estream_redirect());
- }
-
- void exit() {
- redirect_stdout.reset();
- redirect_stderr.reset();
- }
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-/** \rst
- This is a helper function to add a C++ redirect context manager to Python
- instead of using a C++ guard. To use it, add the following to your binding code:
-
- .. code-block:: cpp
-
- #include <pybind11/iostream.h>
-
- ...
-
- py::add_ostream_redirect(m, "ostream_redirect");
-
- You now have a Python context manager that redirects your output:
-
- .. code-block:: python
-
- with m.ostream_redirect():
- m.print_to_cout_function()
-
- This manager can optionally be told which streams to operate on:
-
- .. code-block:: python
-
- with m.ostream_redirect(stdout=true, stderr=true):
- m.noisy_function_with_error_printing()
-
- \endrst */
-inline class_<detail::OstreamRedirect> add_ostream_redirect(module_ m, std::string name = "ostream_redirect") {
- return class_<detail::OstreamRedirect>(m, name.c_str(), module_local())
- .def(init<bool,bool>(), arg("stdout")=true, arg("stderr")=true)
- .def("__enter__", &detail::OstreamRedirect::enter)
- .def("__exit__", [](detail::OstreamRedirect &self_, args) { self_.exit(); });
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/numpy.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/numpy.h
deleted file mode 100644
index 2c2ab7889bbe631e2c3b2797ab891f3f64387b0e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/numpy.h
+++ /dev/null
@@ -1,1693 +0,0 @@
-/*
- pybind11/numpy.h: Basic NumPy support, vectorize() wrapper
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-#include "complex.h"
-#include <numeric>
-#include <algorithm>
-#include <array>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <sstream>
-#include <string>
-#include <functional>
-#include <type_traits>
-#include <utility>
-#include <vector>
-#include <typeindex>
-
-#if defined(_MSC_VER)
-# pragma warning(push)
-# pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
-#endif
-
-/* This will be true on all flat address space platforms and allows us to reduce the
- whole npy_intp / ssize_t / Py_intptr_t business down to just ssize_t for all size
- and dimension types (e.g. shape, strides, indexing), instead of inflicting this
- upon the library user. */
-static_assert(sizeof(::pybind11::ssize_t) == sizeof(Py_intptr_t), "ssize_t != Py_intptr_t");
-static_assert(std::is_signed<Py_intptr_t>::value, "Py_intptr_t must be signed");
-// We now can reinterpret_cast between py::ssize_t and Py_intptr_t (MSVC + PyPy cares)
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-class array; // Forward declaration
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <> struct handle_type_name<array> { static constexpr auto name = _("numpy.ndarray"); };
-
-template <typename type, typename SFINAE = void> struct npy_format_descriptor;
-
-struct PyArrayDescr_Proxy {
- PyObject_HEAD
- PyObject *typeobj;
- char kind;
- char type;
- char byteorder;
- char flags;
- int type_num;
- int elsize;
- int alignment;
- char *subarray;
- PyObject *fields;
- PyObject *names;
-};
-
-struct PyArray_Proxy {
- PyObject_HEAD
- char *data;
- int nd;
- ssize_t *dimensions;
- ssize_t *strides;
- PyObject *base;
- PyObject *descr;
- int flags;
-};
-
-struct PyVoidScalarObject_Proxy {
- PyObject_VAR_HEAD
- char *obval;
- PyArrayDescr_Proxy *descr;
- int flags;
- PyObject *base;
-};
-
-struct numpy_type_info {
- PyObject* dtype_ptr;
- std::string format_str;
-};
-
-struct numpy_internals {
- std::unordered_map<std::type_index, numpy_type_info> registered_dtypes;
-
- numpy_type_info *get_type_info(const std::type_info& tinfo, bool throw_if_missing = true) {
- auto it = registered_dtypes.find(std::type_index(tinfo));
- if (it != registered_dtypes.end())
- return &(it->second);
- if (throw_if_missing)
- pybind11_fail(std::string("NumPy type info missing for ") + tinfo.name());
- return nullptr;
- }
-
- template<typename T> numpy_type_info *get_type_info(bool throw_if_missing = true) {
- return get_type_info(typeid(typename std::remove_cv<T>::type), throw_if_missing);
- }
-};
-
-inline PYBIND11_NOINLINE void load_numpy_internals(numpy_internals* &ptr) {
- ptr = &get_or_create_shared_data<numpy_internals>("_numpy_internals");
-}
-
-inline numpy_internals& get_numpy_internals() {
- static numpy_internals* ptr = nullptr;
- if (!ptr)
- load_numpy_internals(ptr);
- return *ptr;
-}
-
-template <typename T> struct same_size {
- template <typename U> using as = bool_constant<sizeof(T) == sizeof(U)>;
-};
-
-template <typename Concrete> constexpr int platform_lookup() { return -1; }
-
-// Lookup a type according to its size, and return a value corresponding to the NumPy typenum.
-template <typename Concrete, typename T, typename... Ts, typename... Ints>
-constexpr int platform_lookup(int I, Ints... Is) {
- return sizeof(Concrete) == sizeof(T) ? I : platform_lookup<Concrete, Ts...>(Is...);
-}
-
-struct npy_api {
- enum constants {
- NPY_ARRAY_C_CONTIGUOUS_ = 0x0001,
- NPY_ARRAY_F_CONTIGUOUS_ = 0x0002,
- NPY_ARRAY_OWNDATA_ = 0x0004,
- NPY_ARRAY_FORCECAST_ = 0x0010,
- NPY_ARRAY_ENSUREARRAY_ = 0x0040,
- NPY_ARRAY_ALIGNED_ = 0x0100,
- NPY_ARRAY_WRITEABLE_ = 0x0400,
- NPY_BOOL_ = 0,
- NPY_BYTE_, NPY_UBYTE_,
- NPY_SHORT_, NPY_USHORT_,
- NPY_INT_, NPY_UINT_,
- NPY_LONG_, NPY_ULONG_,
- NPY_LONGLONG_, NPY_ULONGLONG_,
- NPY_FLOAT_, NPY_DOUBLE_, NPY_LONGDOUBLE_,
- NPY_CFLOAT_, NPY_CDOUBLE_, NPY_CLONGDOUBLE_,
- NPY_OBJECT_ = 17,
- NPY_STRING_, NPY_UNICODE_, NPY_VOID_,
- // Platform-dependent normalization
- NPY_INT8_ = NPY_BYTE_,
- NPY_UINT8_ = NPY_UBYTE_,
- NPY_INT16_ = NPY_SHORT_,
- NPY_UINT16_ = NPY_USHORT_,
- // `npy_common.h` defines the integer aliases. In order, it checks:
- // NPY_BITSOF_LONG, NPY_BITSOF_LONGLONG, NPY_BITSOF_INT, NPY_BITSOF_SHORT, NPY_BITSOF_CHAR
- // and assigns the alias to the first matching size, so we should check in this order.
- NPY_INT32_ = platform_lookup<std::int32_t, long, int, short>(
- NPY_LONG_, NPY_INT_, NPY_SHORT_),
- NPY_UINT32_ = platform_lookup<std::uint32_t, unsigned long, unsigned int, unsigned short>(
- NPY_ULONG_, NPY_UINT_, NPY_USHORT_),
- NPY_INT64_ = platform_lookup<std::int64_t, long, long long, int>(
- NPY_LONG_, NPY_LONGLONG_, NPY_INT_),
- NPY_UINT64_ = platform_lookup<std::uint64_t, unsigned long, unsigned long long, unsigned int>(
- NPY_ULONG_, NPY_ULONGLONG_, NPY_UINT_),
- };
-
- typedef struct {
- Py_intptr_t *ptr;
- int len;
- } PyArray_Dims;
-
- static npy_api& get() {
- static npy_api api = lookup();
- return api;
- }
-
- bool PyArray_Check_(PyObject *obj) const {
- return (bool) PyObject_TypeCheck(obj, PyArray_Type_);
- }
- bool PyArrayDescr_Check_(PyObject *obj) const {
- return (bool) PyObject_TypeCheck(obj, PyArrayDescr_Type_);
- }
-
- unsigned int (*PyArray_GetNDArrayCFeatureVersion_)();
- PyObject *(*PyArray_DescrFromType_)(int);
- PyObject *(*PyArray_NewFromDescr_)
- (PyTypeObject *, PyObject *, int, Py_intptr_t const *,
- Py_intptr_t const *, void *, int, PyObject *);
- // Unused. Not removed because that affects ABI of the class.
- PyObject *(*PyArray_DescrNewFromType_)(int);
- int (*PyArray_CopyInto_)(PyObject *, PyObject *);
- PyObject *(*PyArray_NewCopy_)(PyObject *, int);
- PyTypeObject *PyArray_Type_;
- PyTypeObject *PyVoidArrType_Type_;
- PyTypeObject *PyArrayDescr_Type_;
- PyObject *(*PyArray_DescrFromScalar_)(PyObject *);
- PyObject *(*PyArray_FromAny_) (PyObject *, PyObject *, int, int, int, PyObject *);
- int (*PyArray_DescrConverter_) (PyObject *, PyObject **);
- bool (*PyArray_EquivTypes_) (PyObject *, PyObject *);
- int (*PyArray_GetArrayParamsFromObject_)(PyObject *, PyObject *, unsigned char, PyObject **, int *,
- Py_intptr_t *, PyObject **, PyObject *);
- PyObject *(*PyArray_Squeeze_)(PyObject *);
- // Unused. Not removed because that affects ABI of the class.
- int (*PyArray_SetBaseObject_)(PyObject *, PyObject *);
- PyObject* (*PyArray_Resize_)(PyObject*, PyArray_Dims*, int, int);
-private:
- enum functions {
- API_PyArray_GetNDArrayCFeatureVersion = 211,
- API_PyArray_Type = 2,
- API_PyArrayDescr_Type = 3,
- API_PyVoidArrType_Type = 39,
- API_PyArray_DescrFromType = 45,
- API_PyArray_DescrFromScalar = 57,
- API_PyArray_FromAny = 69,
- API_PyArray_Resize = 80,
- API_PyArray_CopyInto = 82,
- API_PyArray_NewCopy = 85,
- API_PyArray_NewFromDescr = 94,
- API_PyArray_DescrNewFromType = 96,
- API_PyArray_DescrConverter = 174,
- API_PyArray_EquivTypes = 182,
- API_PyArray_GetArrayParamsFromObject = 278,
- API_PyArray_Squeeze = 136,
- API_PyArray_SetBaseObject = 282
- };
-
- static npy_api lookup() {
- module_ m = module_::import("numpy.core.multiarray");
- auto c = m.attr("_ARRAY_API");
-#if PY_MAJOR_VERSION >= 3
- void **api_ptr = (void **) PyCapsule_GetPointer(c.ptr(), NULL);
-#else
- void **api_ptr = (void **) PyCObject_AsVoidPtr(c.ptr());
-#endif
- npy_api api;
-#define DECL_NPY_API(Func) api.Func##_ = (decltype(api.Func##_)) api_ptr[API_##Func];
- DECL_NPY_API(PyArray_GetNDArrayCFeatureVersion);
- if (api.PyArray_GetNDArrayCFeatureVersion_() < 0x7)
- pybind11_fail("pybind11 numpy support requires numpy >= 1.7.0");
- DECL_NPY_API(PyArray_Type);
- DECL_NPY_API(PyVoidArrType_Type);
- DECL_NPY_API(PyArrayDescr_Type);
- DECL_NPY_API(PyArray_DescrFromType);
- DECL_NPY_API(PyArray_DescrFromScalar);
- DECL_NPY_API(PyArray_FromAny);
- DECL_NPY_API(PyArray_Resize);
- DECL_NPY_API(PyArray_CopyInto);
- DECL_NPY_API(PyArray_NewCopy);
- DECL_NPY_API(PyArray_NewFromDescr);
- DECL_NPY_API(PyArray_DescrNewFromType);
- DECL_NPY_API(PyArray_DescrConverter);
- DECL_NPY_API(PyArray_EquivTypes);
- DECL_NPY_API(PyArray_GetArrayParamsFromObject);
- DECL_NPY_API(PyArray_Squeeze);
- DECL_NPY_API(PyArray_SetBaseObject);
-#undef DECL_NPY_API
- return api;
- }
-};
-
-inline PyArray_Proxy* array_proxy(void* ptr) {
- return reinterpret_cast<PyArray_Proxy*>(ptr);
-}
-
-inline const PyArray_Proxy* array_proxy(const void* ptr) {
- return reinterpret_cast<const PyArray_Proxy*>(ptr);
-}
-
-inline PyArrayDescr_Proxy* array_descriptor_proxy(PyObject* ptr) {
- return reinterpret_cast<PyArrayDescr_Proxy*>(ptr);
-}
-
-inline const PyArrayDescr_Proxy* array_descriptor_proxy(const PyObject* ptr) {
- return reinterpret_cast<const PyArrayDescr_Proxy*>(ptr);
-}
-
-inline bool check_flags(const void* ptr, int flag) {
- return (flag == (array_proxy(ptr)->flags & flag));
-}
-
-template <typename T> struct is_std_array : std::false_type { };
-template <typename T, size_t N> struct is_std_array<std::array<T, N>> : std::true_type { };
-template <typename T> struct is_complex : std::false_type { };
-template <typename T> struct is_complex<std::complex<T>> : std::true_type { };
-
-template <typename T> struct array_info_scalar {
- using type = T;
- static constexpr bool is_array = false;
- static constexpr bool is_empty = false;
- static constexpr auto extents = _("");
- static void append_extents(list& /* shape */) { }
-};
-// Computes underlying type and a comma-separated list of extents for array
-// types (any mix of std::array and built-in arrays). An array of char is
-// treated as scalar because it gets special handling.
-template <typename T> struct array_info : array_info_scalar<T> { };
-template <typename T, size_t N> struct array_info<std::array<T, N>> {
- using type = typename array_info<T>::type;
- static constexpr bool is_array = true;
- static constexpr bool is_empty = (N == 0) || array_info<T>::is_empty;
- static constexpr size_t extent = N;
-
- // appends the extents to shape
- static void append_extents(list& shape) {
- shape.append(N);
- array_info<T>::append_extents(shape);
- }
-
- static constexpr auto extents = _<array_info<T>::is_array>(
- concat(_<N>(), array_info<T>::extents), _<N>()
- );
-};
-// For numpy we have special handling for arrays of characters, so we don't include
-// the size in the array extents.
-template <size_t N> struct array_info<char[N]> : array_info_scalar<char[N]> { };
-template <size_t N> struct array_info<std::array<char, N>> : array_info_scalar<std::array<char, N>> { };
-template <typename T, size_t N> struct array_info<T[N]> : array_info<std::array<T, N>> { };
-template <typename T> using remove_all_extents_t = typename array_info<T>::type;
-
-template <typename T> using is_pod_struct = all_of<
- std::is_standard_layout<T>, // since we're accessing directly in memory we need a standard layout type
-#if !defined(__GNUG__) || defined(_LIBCPP_VERSION) || defined(_GLIBCXX_USE_CXX11_ABI)
- // _GLIBCXX_USE_CXX11_ABI indicates that we're using libstdc++ from GCC 5 or newer, independent
- // of the actual compiler (Clang can also use libstdc++, but it always defines __GNUC__ == 4).
- std::is_trivially_copyable<T>,
-#else
- // GCC 4 doesn't implement is_trivially_copyable, so approximate it
- std::is_trivially_destructible<T>,
- satisfies_any_of<T, std::has_trivial_copy_constructor, std::has_trivial_copy_assign>,
-#endif
- satisfies_none_of<T, std::is_reference, std::is_array, is_std_array, std::is_arithmetic, is_complex, std::is_enum>
->;
-
-// Replacement for std::is_pod (deprecated in C++20)
-template <typename T> using is_pod = all_of<
- std::is_standard_layout<T>,
- std::is_trivial<T>
->;
-
-template <ssize_t Dim = 0, typename Strides> ssize_t byte_offset_unsafe(const Strides &) { return 0; }
-template <ssize_t Dim = 0, typename Strides, typename... Ix>
-ssize_t byte_offset_unsafe(const Strides &strides, ssize_t i, Ix... index) {
- return i * strides[Dim] + byte_offset_unsafe<Dim + 1>(strides, index...);
-}
-
-/**
- * Proxy class providing unsafe, unchecked const access to array data. This is constructed through
- * the `unchecked<T, N>()` method of `array` or the `unchecked<N>()` method of `array_t<T>`. `Dims`
- * will be -1 for dimensions determined at runtime.
- */
-template <typename T, ssize_t Dims>
-class unchecked_reference {
-protected:
- static constexpr bool Dynamic = Dims < 0;
- const unsigned char *data_;
- // Storing the shape & strides in local variables (i.e. these arrays) allows the compiler to
- // make large performance gains on big, nested loops, but requires compile-time dimensions
- conditional_t<Dynamic, const ssize_t *, std::array<ssize_t, (size_t) Dims>>
- shape_, strides_;
- const ssize_t dims_;
-
- friend class pybind11::array;
- // Constructor for compile-time dimensions:
- template <bool Dyn = Dynamic>
- unchecked_reference(const void *data, const ssize_t *shape, const ssize_t *strides, enable_if_t<!Dyn, ssize_t>)
- : data_{reinterpret_cast<const unsigned char *>(data)}, dims_{Dims} {
- for (size_t i = 0; i < (size_t) dims_; i++) {
- shape_[i] = shape[i];
- strides_[i] = strides[i];
- }
- }
- // Constructor for runtime dimensions:
- template <bool Dyn = Dynamic>
- unchecked_reference(const void *data, const ssize_t *shape, const ssize_t *strides, enable_if_t<Dyn, ssize_t> dims)
- : data_{reinterpret_cast<const unsigned char *>(data)}, shape_{shape}, strides_{strides}, dims_{dims} {}
-
-public:
- /**
- * Unchecked const reference access to data at the given indices. For a compile-time known
- * number of dimensions, this requires the correct number of arguments; for run-time
- * dimensionality, this is not checked (and so is up to the caller to use safely).
- */
- template <typename... Ix> const T &operator()(Ix... index) const {
- static_assert(ssize_t{sizeof...(Ix)} == Dims || Dynamic,
- "Invalid number of indices for unchecked array reference");
- return *reinterpret_cast<const T *>(data_ + byte_offset_unsafe(strides_, ssize_t(index)...));
- }
- /**
- * Unchecked const reference access to data; this operator only participates if the reference
- * is to a 1-dimensional array. When present, this is exactly equivalent to `obj(index)`.
- */
- template <ssize_t D = Dims, typename = enable_if_t<D == 1 || Dynamic>>
- const T &operator[](ssize_t index) const { return operator()(index); }
-
- /// Pointer access to the data at the given indices.
- template <typename... Ix> const T *data(Ix... ix) const { return &operator()(ssize_t(ix)...); }
-
- /// Returns the item size, i.e. sizeof(T)
- constexpr static ssize_t itemsize() { return sizeof(T); }
-
- /// Returns the shape (i.e. size) of dimension `dim`
- ssize_t shape(ssize_t dim) const { return shape_[(size_t) dim]; }
-
- /// Returns the number of dimensions of the array
- ssize_t ndim() const { return dims_; }
-
- /// Returns the total number of elements in the referenced array, i.e. the product of the shapes
- template <bool Dyn = Dynamic>
- enable_if_t<!Dyn, ssize_t> size() const {
- return std::accumulate(shape_.begin(), shape_.end(), (ssize_t) 1, std::multiplies<ssize_t>());
- }
- template <bool Dyn = Dynamic>
- enable_if_t<Dyn, ssize_t> size() const {
- return std::accumulate(shape_, shape_ + ndim(), (ssize_t) 1, std::multiplies<ssize_t>());
- }
-
- /// Returns the total number of bytes used by the referenced data. Note that the actual span in
- /// memory may be larger if the referenced array has non-contiguous strides (e.g. for a slice).
- ssize_t nbytes() const {
- return size() * itemsize();
- }
-};
-
-template <typename T, ssize_t Dims>
-class unchecked_mutable_reference : public unchecked_reference<T, Dims> {
- friend class pybind11::array;
- using ConstBase = unchecked_reference<T, Dims>;
- using ConstBase::ConstBase;
- using ConstBase::Dynamic;
-public:
- // Bring in const-qualified versions from base class
- using ConstBase::operator();
- using ConstBase::operator[];
-
- /// Mutable, unchecked access to data at the given indices.
- template <typename... Ix> T& operator()(Ix... index) {
- static_assert(ssize_t{sizeof...(Ix)} == Dims || Dynamic,
- "Invalid number of indices for unchecked array reference");
- return const_cast<T &>(ConstBase::operator()(index...));
- }
- /**
- * Mutable, unchecked access data at the given index; this operator only participates if the
- * reference is to a 1-dimensional array (or has runtime dimensions). When present, this is
- * exactly equivalent to `obj(index)`.
- */
- template <ssize_t D = Dims, typename = enable_if_t<D == 1 || Dynamic>>
- T &operator[](ssize_t index) { return operator()(index); }
-
- /// Mutable pointer access to the data at the given indices.
- template <typename... Ix> T *mutable_data(Ix... ix) { return &operator()(ssize_t(ix)...); }
-};
-
-template <typename T, ssize_t Dim>
-struct type_caster<unchecked_reference<T, Dim>> {
- static_assert(Dim == 0 && Dim > 0 /* always fail */, "unchecked array proxy object is not castable");
-};
-template <typename T, ssize_t Dim>
-struct type_caster<unchecked_mutable_reference<T, Dim>> : type_caster<unchecked_reference<T, Dim>> {};
-
-PYBIND11_NAMESPACE_END(detail)
-
-class dtype : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(dtype, object, detail::npy_api::get().PyArrayDescr_Check_);
-
- explicit dtype(const buffer_info &info) {
- dtype descr(_dtype_from_pep3118()(PYBIND11_STR_TYPE(info.format)));
- // If info.itemsize == 0, use the value calculated from the format string
- m_ptr = descr.strip_padding(info.itemsize ? info.itemsize : descr.itemsize()).release().ptr();
- }
-
- explicit dtype(const std::string &format) {
- m_ptr = from_args(pybind11::str(format)).release().ptr();
- }
-
- dtype(const char *format) : dtype(std::string(format)) { }
-
- dtype(list names, list formats, list offsets, ssize_t itemsize) {
- dict args;
- args["names"] = names;
- args["formats"] = formats;
- args["offsets"] = offsets;
- args["itemsize"] = pybind11::int_(itemsize);
- m_ptr = from_args(args).release().ptr();
- }
-
- /// This is essentially the same as calling numpy.dtype(args) in Python.
- static dtype from_args(object args) {
- PyObject *ptr = nullptr;
- if (!detail::npy_api::get().PyArray_DescrConverter_(args.ptr(), &ptr) || !ptr)
- throw error_already_set();
- return reinterpret_steal<dtype>(ptr);
- }
-
- /// Return dtype associated with a C++ type.
- template <typename T> static dtype of() {
- return detail::npy_format_descriptor<typename std::remove_cv<T>::type>::dtype();
- }
-
- /// Size of the data type in bytes.
- ssize_t itemsize() const {
- return detail::array_descriptor_proxy(m_ptr)->elsize;
- }
-
- /// Returns true for structured data types.
- bool has_fields() const {
- return detail::array_descriptor_proxy(m_ptr)->names != nullptr;
- }
-
- /// Single-character type code.
- char kind() const {
- return detail::array_descriptor_proxy(m_ptr)->kind;
- }
-
-private:
- static object _dtype_from_pep3118() {
- static PyObject *obj = module_::import("numpy.core._internal")
- .attr("_dtype_from_pep3118").cast<object>().release().ptr();
- return reinterpret_borrow<object>(obj);
- }
-
- dtype strip_padding(ssize_t itemsize) {
- // Recursively strip all void fields with empty names that are generated for
- // padding fields (as of NumPy v1.11).
- if (!has_fields())
- return *this;
-
- struct field_descr { PYBIND11_STR_TYPE name; object format; pybind11::int_ offset; };
- std::vector<field_descr> field_descriptors;
-
- for (auto field : attr("fields").attr("items")()) {
- auto spec = field.cast<tuple>();
- auto name = spec[0].cast<pybind11::str>();
- auto format = spec[1].cast<tuple>()[0].cast<dtype>();
- auto offset = spec[1].cast<tuple>()[1].cast<pybind11::int_>();
- if (!len(name) && format.kind() == 'V')
- continue;
- field_descriptors.push_back({(PYBIND11_STR_TYPE) name, format.strip_padding(format.itemsize()), offset});
- }
-
- std::sort(field_descriptors.begin(), field_descriptors.end(),
- [](const field_descr& a, const field_descr& b) {
- return a.offset.cast<int>() < b.offset.cast<int>();
- });
-
- list names, formats, offsets;
- for (auto& descr : field_descriptors) {
- names.append(descr.name);
- formats.append(descr.format);
- offsets.append(descr.offset);
- }
- return dtype(names, formats, offsets, itemsize);
- }
-};
-
-class array : public buffer {
-public:
- PYBIND11_OBJECT_CVT(array, buffer, detail::npy_api::get().PyArray_Check_, raw_array)
-
- enum {
- c_style = detail::npy_api::NPY_ARRAY_C_CONTIGUOUS_,
- f_style = detail::npy_api::NPY_ARRAY_F_CONTIGUOUS_,
- forcecast = detail::npy_api::NPY_ARRAY_FORCECAST_
- };
-
- array() : array(0, static_cast<const double *>(nullptr)) {}
-
- using ShapeContainer = detail::any_container<ssize_t>;
- using StridesContainer = detail::any_container<ssize_t>;
-
- // Constructs an array taking shape/strides from arbitrary container types
- array(const pybind11::dtype &dt, ShapeContainer shape, StridesContainer strides,
- const void *ptr = nullptr, handle base = handle()) {
-
- if (strides->empty())
- *strides = detail::c_strides(*shape, dt.itemsize());
-
- auto ndim = shape->size();
- if (ndim != strides->size())
- pybind11_fail("NumPy: shape ndim doesn't match strides ndim");
- auto descr = dt;
-
- int flags = 0;
- if (base && ptr) {
- if (isinstance<array>(base))
- /* Copy flags from base (except ownership bit) */
- flags = reinterpret_borrow<array>(base).flags() & ~detail::npy_api::NPY_ARRAY_OWNDATA_;
- else
- /* Writable by default, easy to downgrade later on if needed */
- flags = detail::npy_api::NPY_ARRAY_WRITEABLE_;
- }
-
- auto &api = detail::npy_api::get();
- auto tmp = reinterpret_steal<object>(api.PyArray_NewFromDescr_(
- api.PyArray_Type_, descr.release().ptr(), (int) ndim,
- // Use reinterpret_cast for PyPy on Windows (remove if fixed, checked on 7.3.1)
- reinterpret_cast<Py_intptr_t*>(shape->data()),
- reinterpret_cast<Py_intptr_t*>(strides->data()),
- const_cast<void *>(ptr), flags, nullptr));
- if (!tmp)
- throw error_already_set();
- if (ptr) {
- if (base) {
- api.PyArray_SetBaseObject_(tmp.ptr(), base.inc_ref().ptr());
- } else {
- tmp = reinterpret_steal<object>(api.PyArray_NewCopy_(tmp.ptr(), -1 /* any order */));
- }
- }
- m_ptr = tmp.release().ptr();
- }
-
- array(const pybind11::dtype &dt, ShapeContainer shape, const void *ptr = nullptr, handle base = handle())
- : array(dt, std::move(shape), {}, ptr, base) { }
-
- template <typename T, typename = detail::enable_if_t<std::is_integral<T>::value && !std::is_same<bool, T>::value>>
- array(const pybind11::dtype &dt, T count, const void *ptr = nullptr, handle base = handle())
- : array(dt, {{count}}, ptr, base) { }
-
- template <typename T>
- array(ShapeContainer shape, StridesContainer strides, const T *ptr, handle base = handle())
- : array(pybind11::dtype::of<T>(), std::move(shape), std::move(strides), ptr, base) { }
-
- template <typename T>
- array(ShapeContainer shape, const T *ptr, handle base = handle())
- : array(std::move(shape), {}, ptr, base) { }
-
- template <typename T>
- explicit array(ssize_t count, const T *ptr, handle base = handle()) : array({count}, {}, ptr, base) { }
-
- explicit array(const buffer_info &info, handle base = handle())
- : array(pybind11::dtype(info), info.shape, info.strides, info.ptr, base) { }
-
- /// Array descriptor (dtype)
- pybind11::dtype dtype() const {
- return reinterpret_borrow<pybind11::dtype>(detail::array_proxy(m_ptr)->descr);
- }
-
- /// Total number of elements
- ssize_t size() const {
- return std::accumulate(shape(), shape() + ndim(), (ssize_t) 1, std::multiplies<ssize_t>());
- }
-
- /// Byte size of a single element
- ssize_t itemsize() const {
- return detail::array_descriptor_proxy(detail::array_proxy(m_ptr)->descr)->elsize;
- }
-
- /// Total number of bytes
- ssize_t nbytes() const {
- return size() * itemsize();
- }
-
- /// Number of dimensions
- ssize_t ndim() const {
- return detail::array_proxy(m_ptr)->nd;
- }
-
- /// Base object
- object base() const {
- return reinterpret_borrow<object>(detail::array_proxy(m_ptr)->base);
- }
-
- /// Dimensions of the array
- const ssize_t* shape() const {
- return detail::array_proxy(m_ptr)->dimensions;
- }
-
- /// Dimension along a given axis
- ssize_t shape(ssize_t dim) const {
- if (dim >= ndim())
- fail_dim_check(dim, "invalid axis");
- return shape()[dim];
- }
-
- /// Strides of the array
- const ssize_t* strides() const {
- return detail::array_proxy(m_ptr)->strides;
- }
-
- /// Stride along a given axis
- ssize_t strides(ssize_t dim) const {
- if (dim >= ndim())
- fail_dim_check(dim, "invalid axis");
- return strides()[dim];
- }
-
- /// Return the NumPy array flags
- int flags() const {
- return detail::array_proxy(m_ptr)->flags;
- }
-
- /// If set, the array is writeable (otherwise the buffer is read-only)
- bool writeable() const {
- return detail::check_flags(m_ptr, detail::npy_api::NPY_ARRAY_WRITEABLE_);
- }
-
- /// If set, the array owns the data (will be freed when the array is deleted)
- bool owndata() const {
- return detail::check_flags(m_ptr, detail::npy_api::NPY_ARRAY_OWNDATA_);
- }
-
- /// Pointer to the contained data. If index is not provided, points to the
- /// beginning of the buffer. May throw if the index would lead to out of bounds access.
- template<typename... Ix> const void* data(Ix... index) const {
- return static_cast<const void *>(detail::array_proxy(m_ptr)->data + offset_at(index...));
- }
-
- /// Mutable pointer to the contained data. If index is not provided, points to the
- /// beginning of the buffer. May throw if the index would lead to out of bounds access.
- /// May throw if the array is not writeable.
- template<typename... Ix> void* mutable_data(Ix... index) {
- check_writeable();
- return static_cast<void *>(detail::array_proxy(m_ptr)->data + offset_at(index...));
- }
-
- /// Byte offset from beginning of the array to a given index (full or partial).
- /// May throw if the index would lead to out of bounds access.
- template<typename... Ix> ssize_t offset_at(Ix... index) const {
- if ((ssize_t) sizeof...(index) > ndim())
- fail_dim_check(sizeof...(index), "too many indices for an array");
- return byte_offset(ssize_t(index)...);
- }
-
- ssize_t offset_at() const { return 0; }
-
- /// Item count from beginning of the array to a given index (full or partial).
- /// May throw if the index would lead to out of bounds access.
- template<typename... Ix> ssize_t index_at(Ix... index) const {
- return offset_at(index...) / itemsize();
- }
-
- /**
- * Returns a proxy object that provides access to the array's data without bounds or
- * dimensionality checking. Will throw if the array is missing the `writeable` flag. Use with
- * care: the array must not be destroyed or reshaped for the duration of the returned object,
- * and the caller must take care not to access invalid dimensions or dimension indices.
- */
- template <typename T, ssize_t Dims = -1> detail::unchecked_mutable_reference<T, Dims> mutable_unchecked() & {
- if (Dims >= 0 && ndim() != Dims)
- throw std::domain_error("array has incorrect number of dimensions: " + std::to_string(ndim()) +
- "; expected " + std::to_string(Dims));
- return detail::unchecked_mutable_reference<T, Dims>(mutable_data(), shape(), strides(), ndim());
- }
-
- /**
- * Returns a proxy object that provides const access to the array's data without bounds or
- * dimensionality checking. Unlike `mutable_unchecked()`, this does not require that the
- * underlying array have the `writable` flag. Use with care: the array must not be destroyed or
- * reshaped for the duration of the returned object, and the caller must take care not to access
- * invalid dimensions or dimension indices.
- */
- template <typename T, ssize_t Dims = -1> detail::unchecked_reference<T, Dims> unchecked() const & {
- if (Dims >= 0 && ndim() != Dims)
- throw std::domain_error("array has incorrect number of dimensions: " + std::to_string(ndim()) +
- "; expected " + std::to_string(Dims));
- return detail::unchecked_reference<T, Dims>(data(), shape(), strides(), ndim());
- }
-
- /// Return a new view with all of the dimensions of length 1 removed
- array squeeze() {
- auto& api = detail::npy_api::get();
- return reinterpret_steal<array>(api.PyArray_Squeeze_(m_ptr));
- }
-
- /// Resize array to given shape
- /// If refcheck is true and more that one reference exist to this array
- /// then resize will succeed only if it makes a reshape, i.e. original size doesn't change
- void resize(ShapeContainer new_shape, bool refcheck = true) {
- detail::npy_api::PyArray_Dims d = {
- // Use reinterpret_cast for PyPy on Windows (remove if fixed, checked on 7.3.1)
- reinterpret_cast<Py_intptr_t*>(new_shape->data()),
- int(new_shape->size())
- };
- // try to resize, set ordering param to -1 cause it's not used anyway
- object new_array = reinterpret_steal<object>(
- detail::npy_api::get().PyArray_Resize_(m_ptr, &d, int(refcheck), -1)
- );
- if (!new_array) throw error_already_set();
- if (isinstance<array>(new_array)) { *this = std::move(new_array); }
- }
-
- /// Ensure that the argument is a NumPy array
- /// In case of an error, nullptr is returned and the Python error is cleared.
- static array ensure(handle h, int ExtraFlags = 0) {
- auto result = reinterpret_steal<array>(raw_array(h.ptr(), ExtraFlags));
- if (!result)
- PyErr_Clear();
- return result;
- }
-
-protected:
- template<typename, typename> friend struct detail::npy_format_descriptor;
-
- void fail_dim_check(ssize_t dim, const std::string& msg) const {
- throw index_error(msg + ": " + std::to_string(dim) +
- " (ndim = " + std::to_string(ndim()) + ")");
- }
-
- template<typename... Ix> ssize_t byte_offset(Ix... index) const {
- check_dimensions(index...);
- return detail::byte_offset_unsafe(strides(), ssize_t(index)...);
- }
-
- void check_writeable() const {
- if (!writeable())
- throw std::domain_error("array is not writeable");
- }
-
- template<typename... Ix> void check_dimensions(Ix... index) const {
- check_dimensions_impl(ssize_t(0), shape(), ssize_t(index)...);
- }
-
- void check_dimensions_impl(ssize_t, const ssize_t*) const { }
-
- template<typename... Ix> void check_dimensions_impl(ssize_t axis, const ssize_t* shape, ssize_t i, Ix... index) const {
- if (i >= *shape) {
- throw index_error(std::string("index ") + std::to_string(i) +
- " is out of bounds for axis " + std::to_string(axis) +
- " with size " + std::to_string(*shape));
- }
- check_dimensions_impl(axis + 1, shape + 1, index...);
- }
-
- /// Create array from any object -- always returns a new reference
- static PyObject *raw_array(PyObject *ptr, int ExtraFlags = 0) {
- if (ptr == nullptr) {
- PyErr_SetString(PyExc_ValueError, "cannot create a pybind11::array from a nullptr");
- return nullptr;
- }
- return detail::npy_api::get().PyArray_FromAny_(
- ptr, nullptr, 0, 0, detail::npy_api::NPY_ARRAY_ENSUREARRAY_ | ExtraFlags, nullptr);
- }
-};
-
-template <typename T, int ExtraFlags = array::forcecast> class array_t : public array {
-private:
- struct private_ctor {};
- // Delegating constructor needed when both moving and accessing in the same constructor
- array_t(private_ctor, ShapeContainer &&shape, StridesContainer &&strides, const T *ptr, handle base)
- : array(std::move(shape), std::move(strides), ptr, base) {}
-public:
- static_assert(!detail::array_info<T>::is_array, "Array types cannot be used with array_t");
-
- using value_type = T;
-
- array_t() : array(0, static_cast<const T *>(nullptr)) {}
- array_t(handle h, borrowed_t) : array(h, borrowed_t{}) { }
- array_t(handle h, stolen_t) : array(h, stolen_t{}) { }
-
- PYBIND11_DEPRECATED("Use array_t<T>::ensure() instead")
- array_t(handle h, bool is_borrowed) : array(raw_array_t(h.ptr()), stolen_t{}) {
- if (!m_ptr) PyErr_Clear();
- if (!is_borrowed) Py_XDECREF(h.ptr());
- }
-
- array_t(const object &o) : array(raw_array_t(o.ptr()), stolen_t{}) {
- if (!m_ptr) throw error_already_set();
- }
-
- explicit array_t(const buffer_info& info, handle base = handle()) : array(info, base) { }
-
- array_t(ShapeContainer shape, StridesContainer strides, const T *ptr = nullptr, handle base = handle())
- : array(std::move(shape), std::move(strides), ptr, base) { }
-
- explicit array_t(ShapeContainer shape, const T *ptr = nullptr, handle base = handle())
- : array_t(private_ctor{}, std::move(shape),
- ExtraFlags & f_style
- ? detail::f_strides(*shape, itemsize())
- : detail::c_strides(*shape, itemsize()),
- ptr, base) { }
-
- explicit array_t(ssize_t count, const T *ptr = nullptr, handle base = handle())
- : array({count}, {}, ptr, base) { }
-
- constexpr ssize_t itemsize() const {
- return sizeof(T);
- }
-
- template<typename... Ix> ssize_t index_at(Ix... index) const {
- return offset_at(index...) / itemsize();
- }
-
- template<typename... Ix> const T* data(Ix... index) const {
- return static_cast<const T*>(array::data(index...));
- }
-
- template<typename... Ix> T* mutable_data(Ix... index) {
- return static_cast<T*>(array::mutable_data(index...));
- }
-
- // Reference to element at a given index
- template<typename... Ix> const T& at(Ix... index) const {
- if ((ssize_t) sizeof...(index) != ndim())
- fail_dim_check(sizeof...(index), "index dimension mismatch");
- return *(static_cast<const T*>(array::data()) + byte_offset(ssize_t(index)...) / itemsize());
- }
-
- // Mutable reference to element at a given index
- template<typename... Ix> T& mutable_at(Ix... index) {
- if ((ssize_t) sizeof...(index) != ndim())
- fail_dim_check(sizeof...(index), "index dimension mismatch");
- return *(static_cast<T*>(array::mutable_data()) + byte_offset(ssize_t(index)...) / itemsize());
- }
-
- /**
- * Returns a proxy object that provides access to the array's data without bounds or
- * dimensionality checking. Will throw if the array is missing the `writeable` flag. Use with
- * care: the array must not be destroyed or reshaped for the duration of the returned object,
- * and the caller must take care not to access invalid dimensions or dimension indices.
- */
- template <ssize_t Dims = -1> detail::unchecked_mutable_reference<T, Dims> mutable_unchecked() & {
- return array::mutable_unchecked<T, Dims>();
- }
-
- /**
- * Returns a proxy object that provides const access to the array's data without bounds or
- * dimensionality checking. Unlike `unchecked()`, this does not require that the underlying
- * array have the `writable` flag. Use with care: the array must not be destroyed or reshaped
- * for the duration of the returned object, and the caller must take care not to access invalid
- * dimensions or dimension indices.
- */
- template <ssize_t Dims = -1> detail::unchecked_reference<T, Dims> unchecked() const & {
- return array::unchecked<T, Dims>();
- }
-
- /// Ensure that the argument is a NumPy array of the correct dtype (and if not, try to convert
- /// it). In case of an error, nullptr is returned and the Python error is cleared.
- static array_t ensure(handle h) {
- auto result = reinterpret_steal<array_t>(raw_array_t(h.ptr()));
- if (!result)
- PyErr_Clear();
- return result;
- }
-
- static bool check_(handle h) {
- const auto &api = detail::npy_api::get();
- return api.PyArray_Check_(h.ptr())
- && api.PyArray_EquivTypes_(detail::array_proxy(h.ptr())->descr, dtype::of<T>().ptr())
- && detail::check_flags(h.ptr(), ExtraFlags & (array::c_style | array::f_style));
- }
-
-protected:
- /// Create array from any object -- always returns a new reference
- static PyObject *raw_array_t(PyObject *ptr) {
- if (ptr == nullptr) {
- PyErr_SetString(PyExc_ValueError, "cannot create a pybind11::array_t from a nullptr");
- return nullptr;
- }
- return detail::npy_api::get().PyArray_FromAny_(
- ptr, dtype::of<T>().release().ptr(), 0, 0,
- detail::npy_api::NPY_ARRAY_ENSUREARRAY_ | ExtraFlags, nullptr);
- }
-};
-
-template <typename T>
-struct format_descriptor<T, detail::enable_if_t<detail::is_pod_struct<T>::value>> {
- static std::string format() {
- return detail::npy_format_descriptor<typename std::remove_cv<T>::type>::format();
- }
-};
-
-template <size_t N> struct format_descriptor<char[N]> {
- static std::string format() { return std::to_string(N) + "s"; }
-};
-template <size_t N> struct format_descriptor<std::array<char, N>> {
- static std::string format() { return std::to_string(N) + "s"; }
-};
-
-template <typename T>
-struct format_descriptor<T, detail::enable_if_t<std::is_enum<T>::value>> {
- static std::string format() {
- return format_descriptor<
- typename std::remove_cv<typename std::underlying_type<T>::type>::type>::format();
- }
-};
-
-template <typename T>
-struct format_descriptor<T, detail::enable_if_t<detail::array_info<T>::is_array>> {
- static std::string format() {
- using namespace detail;
- static constexpr auto extents = _("(") + array_info<T>::extents + _(")");
- return extents.text + format_descriptor<remove_all_extents_t<T>>::format();
- }
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-template <typename T, int ExtraFlags>
-struct pyobject_caster<array_t<T, ExtraFlags>> {
- using type = array_t<T, ExtraFlags>;
-
- bool load(handle src, bool convert) {
- if (!convert && !type::check_(src))
- return false;
- value = type::ensure(src);
- return static_cast<bool>(value);
- }
-
- static handle cast(const handle &src, return_value_policy /* policy */, handle /* parent */) {
- return src.inc_ref();
- }
- PYBIND11_TYPE_CASTER(type, handle_type_name<type>::name);
-};
-
-template <typename T>
-struct compare_buffer_info<T, detail::enable_if_t<detail::is_pod_struct<T>::value>> {
- static bool compare(const buffer_info& b) {
- return npy_api::get().PyArray_EquivTypes_(dtype::of<T>().ptr(), dtype(b).ptr());
- }
-};
-
-template <typename T, typename = void>
-struct npy_format_descriptor_name;
-
-template <typename T>
-struct npy_format_descriptor_name<T, enable_if_t<std::is_integral<T>::value>> {
- static constexpr auto name = _<std::is_same<T, bool>::value>(
- _("bool"), _<std::is_signed<T>::value>("numpy.int", "numpy.uint") + _<sizeof(T)*8>()
- );
-};
-
-template <typename T>
-struct npy_format_descriptor_name<T, enable_if_t<std::is_floating_point<T>::value>> {
- static constexpr auto name = _<std::is_same<T, float>::value || std::is_same<T, double>::value>(
- _("numpy.float") + _<sizeof(T)*8>(), _("numpy.longdouble")
- );
-};
-
-template <typename T>
-struct npy_format_descriptor_name<T, enable_if_t<is_complex<T>::value>> {
- static constexpr auto name = _<std::is_same<typename T::value_type, float>::value
- || std::is_same<typename T::value_type, double>::value>(
- _("numpy.complex") + _<sizeof(typename T::value_type)*16>(), _("numpy.longcomplex")
- );
-};
-
-template <typename T>
-struct npy_format_descriptor<T, enable_if_t<satisfies_any_of<T, std::is_arithmetic, is_complex>::value>>
- : npy_format_descriptor_name<T> {
-private:
- // NB: the order here must match the one in common.h
- constexpr static const int values[15] = {
- npy_api::NPY_BOOL_,
- npy_api::NPY_BYTE_, npy_api::NPY_UBYTE_, npy_api::NPY_INT16_, npy_api::NPY_UINT16_,
- npy_api::NPY_INT32_, npy_api::NPY_UINT32_, npy_api::NPY_INT64_, npy_api::NPY_UINT64_,
- npy_api::NPY_FLOAT_, npy_api::NPY_DOUBLE_, npy_api::NPY_LONGDOUBLE_,
- npy_api::NPY_CFLOAT_, npy_api::NPY_CDOUBLE_, npy_api::NPY_CLONGDOUBLE_
- };
-
-public:
- static constexpr int value = values[detail::is_fmt_numeric<T>::index];
-
- static pybind11::dtype dtype() {
- if (auto ptr = npy_api::get().PyArray_DescrFromType_(value))
- return reinterpret_steal<pybind11::dtype>(ptr);
- pybind11_fail("Unsupported buffer format!");
- }
-};
-
-#define PYBIND11_DECL_CHAR_FMT \
- static constexpr auto name = _("S") + _<N>(); \
- static pybind11::dtype dtype() { return pybind11::dtype(std::string("S") + std::to_string(N)); }
-template <size_t N> struct npy_format_descriptor<char[N]> { PYBIND11_DECL_CHAR_FMT };
-template <size_t N> struct npy_format_descriptor<std::array<char, N>> { PYBIND11_DECL_CHAR_FMT };
-#undef PYBIND11_DECL_CHAR_FMT
-
-template<typename T> struct npy_format_descriptor<T, enable_if_t<array_info<T>::is_array>> {
-private:
- using base_descr = npy_format_descriptor<typename array_info<T>::type>;
-public:
- static_assert(!array_info<T>::is_empty, "Zero-sized arrays are not supported");
-
- static constexpr auto name = _("(") + array_info<T>::extents + _(")") + base_descr::name;
- static pybind11::dtype dtype() {
- list shape;
- array_info<T>::append_extents(shape);
- return pybind11::dtype::from_args(pybind11::make_tuple(base_descr::dtype(), shape));
- }
-};
-
-template<typename T> struct npy_format_descriptor<T, enable_if_t<std::is_enum<T>::value>> {
-private:
- using base_descr = npy_format_descriptor<typename std::underlying_type<T>::type>;
-public:
- static constexpr auto name = base_descr::name;
- static pybind11::dtype dtype() { return base_descr::dtype(); }
-};
-
-struct field_descriptor {
- const char *name;
- ssize_t offset;
- ssize_t size;
- std::string format;
- dtype descr;
-};
-
-inline PYBIND11_NOINLINE void register_structured_dtype(
- any_container<field_descriptor> fields,
- const std::type_info& tinfo, ssize_t itemsize,
- bool (*direct_converter)(PyObject *, void *&)) {
-
- auto& numpy_internals = get_numpy_internals();
- if (numpy_internals.get_type_info(tinfo, false))
- pybind11_fail("NumPy: dtype is already registered");
-
- // Use ordered fields because order matters as of NumPy 1.14:
- // https://docs.scipy.org/doc/numpy/release.html#multiple-field-indexing-assignment-of-structured-arrays
- std::vector<field_descriptor> ordered_fields(std::move(fields));
- std::sort(ordered_fields.begin(), ordered_fields.end(),
- [](const field_descriptor &a, const field_descriptor &b) { return a.offset < b.offset; });
-
- list names, formats, offsets;
- for (auto& field : ordered_fields) {
- if (!field.descr)
- pybind11_fail(std::string("NumPy: unsupported field dtype: `") +
- field.name + "` @ " + tinfo.name());
- names.append(PYBIND11_STR_TYPE(field.name));
- formats.append(field.descr);
- offsets.append(pybind11::int_(field.offset));
- }
- auto dtype_ptr = pybind11::dtype(names, formats, offsets, itemsize).release().ptr();
-
- // There is an existing bug in NumPy (as of v1.11): trailing bytes are
- // not encoded explicitly into the format string. This will supposedly
- // get fixed in v1.12; for further details, see these:
- // - https://github.com/numpy/numpy/issues/7797
- // - https://github.com/numpy/numpy/pull/7798
- // Because of this, we won't use numpy's logic to generate buffer format
- // strings and will just do it ourselves.
- ssize_t offset = 0;
- std::ostringstream oss;
- // mark the structure as unaligned with '^', because numpy and C++ don't
- // always agree about alignment (particularly for complex), and we're
- // explicitly listing all our padding. This depends on none of the fields
- // overriding the endianness. Putting the ^ in front of individual fields
- // isn't guaranteed to work due to https://github.com/numpy/numpy/issues/9049
- oss << "^T{";
- for (auto& field : ordered_fields) {
- if (field.offset > offset)
- oss << (field.offset - offset) << 'x';
- oss << field.format << ':' << field.name << ':';
- offset = field.offset + field.size;
- }
- if (itemsize > offset)
- oss << (itemsize - offset) << 'x';
- oss << '}';
- auto format_str = oss.str();
-
- // Sanity check: verify that NumPy properly parses our buffer format string
- auto& api = npy_api::get();
- auto arr = array(buffer_info(nullptr, itemsize, format_str, 1));
- if (!api.PyArray_EquivTypes_(dtype_ptr, arr.dtype().ptr()))
- pybind11_fail("NumPy: invalid buffer descriptor!");
-
- auto tindex = std::type_index(tinfo);
- numpy_internals.registered_dtypes[tindex] = { dtype_ptr, format_str };
- get_internals().direct_conversions[tindex].push_back(direct_converter);
-}
-
-template <typename T, typename SFINAE> struct npy_format_descriptor {
- static_assert(is_pod_struct<T>::value, "Attempt to use a non-POD or unimplemented POD type as a numpy dtype");
-
- static constexpr auto name = make_caster<T>::name;
-
- static pybind11::dtype dtype() {
- return reinterpret_borrow<pybind11::dtype>(dtype_ptr());
- }
-
- static std::string format() {
- static auto format_str = get_numpy_internals().get_type_info<T>(true)->format_str;
- return format_str;
- }
-
- static void register_dtype(any_container<field_descriptor> fields) {
- register_structured_dtype(std::move(fields), typeid(typename std::remove_cv<T>::type),
- sizeof(T), &direct_converter);
- }
-
-private:
- static PyObject* dtype_ptr() {
- static PyObject* ptr = get_numpy_internals().get_type_info<T>(true)->dtype_ptr;
- return ptr;
- }
-
- static bool direct_converter(PyObject *obj, void*& value) {
- auto& api = npy_api::get();
- if (!PyObject_TypeCheck(obj, api.PyVoidArrType_Type_))
- return false;
- if (auto descr = reinterpret_steal<object>(api.PyArray_DescrFromScalar_(obj))) {
- if (api.PyArray_EquivTypes_(dtype_ptr(), descr.ptr())) {
- value = ((PyVoidScalarObject_Proxy *) obj)->obval;
- return true;
- }
- }
- return false;
- }
-};
-
-#ifdef __CLION_IDE__ // replace heavy macro with dummy code for the IDE (doesn't affect code)
-# define PYBIND11_NUMPY_DTYPE(Type, ...) ((void)0)
-# define PYBIND11_NUMPY_DTYPE_EX(Type, ...) ((void)0)
-#else
-
-#define PYBIND11_FIELD_DESCRIPTOR_EX(T, Field, Name) \
- ::pybind11::detail::field_descriptor { \
- Name, offsetof(T, Field), sizeof(decltype(std::declval<T>().Field)), \
- ::pybind11::format_descriptor<decltype(std::declval<T>().Field)>::format(), \
- ::pybind11::detail::npy_format_descriptor<decltype(std::declval<T>().Field)>::dtype() \
- }
-
-// Extract name, offset and format descriptor for a struct field
-#define PYBIND11_FIELD_DESCRIPTOR(T, Field) PYBIND11_FIELD_DESCRIPTOR_EX(T, Field, #Field)
-
-// The main idea of this macro is borrowed from https://github.com/swansontec/map-macro
-// (C) William Swanson, Paul Fultz
-#define PYBIND11_EVAL0(...) __VA_ARGS__
-#define PYBIND11_EVAL1(...) PYBIND11_EVAL0 (PYBIND11_EVAL0 (PYBIND11_EVAL0 (__VA_ARGS__)))
-#define PYBIND11_EVAL2(...) PYBIND11_EVAL1 (PYBIND11_EVAL1 (PYBIND11_EVAL1 (__VA_ARGS__)))
-#define PYBIND11_EVAL3(...) PYBIND11_EVAL2 (PYBIND11_EVAL2 (PYBIND11_EVAL2 (__VA_ARGS__)))
-#define PYBIND11_EVAL4(...) PYBIND11_EVAL3 (PYBIND11_EVAL3 (PYBIND11_EVAL3 (__VA_ARGS__)))
-#define PYBIND11_EVAL(...) PYBIND11_EVAL4 (PYBIND11_EVAL4 (PYBIND11_EVAL4 (__VA_ARGS__)))
-#define PYBIND11_MAP_END(...)
-#define PYBIND11_MAP_OUT
-#define PYBIND11_MAP_COMMA ,
-#define PYBIND11_MAP_GET_END() 0, PYBIND11_MAP_END
-#define PYBIND11_MAP_NEXT0(test, next, ...) next PYBIND11_MAP_OUT
-#define PYBIND11_MAP_NEXT1(test, next) PYBIND11_MAP_NEXT0 (test, next, 0)
-#define PYBIND11_MAP_NEXT(test, next) PYBIND11_MAP_NEXT1 (PYBIND11_MAP_GET_END test, next)
-#if defined(_MSC_VER) && !defined(__clang__) // MSVC is not as eager to expand macros, hence this workaround
-#define PYBIND11_MAP_LIST_NEXT1(test, next) \
- PYBIND11_EVAL0 (PYBIND11_MAP_NEXT0 (test, PYBIND11_MAP_COMMA next, 0))
-#else
-#define PYBIND11_MAP_LIST_NEXT1(test, next) \
- PYBIND11_MAP_NEXT0 (test, PYBIND11_MAP_COMMA next, 0)
-#endif
-#define PYBIND11_MAP_LIST_NEXT(test, next) \
- PYBIND11_MAP_LIST_NEXT1 (PYBIND11_MAP_GET_END test, next)
-#define PYBIND11_MAP_LIST0(f, t, x, peek, ...) \
- f(t, x) PYBIND11_MAP_LIST_NEXT (peek, PYBIND11_MAP_LIST1) (f, t, peek, __VA_ARGS__)
-#define PYBIND11_MAP_LIST1(f, t, x, peek, ...) \
- f(t, x) PYBIND11_MAP_LIST_NEXT (peek, PYBIND11_MAP_LIST0) (f, t, peek, __VA_ARGS__)
-// PYBIND11_MAP_LIST(f, t, a1, a2, ...) expands to f(t, a1), f(t, a2), ...
-#define PYBIND11_MAP_LIST(f, t, ...) \
- PYBIND11_EVAL (PYBIND11_MAP_LIST1 (f, t, __VA_ARGS__, (), 0))
-
-#define PYBIND11_NUMPY_DTYPE(Type, ...) \
- ::pybind11::detail::npy_format_descriptor<Type>::register_dtype \
- (::std::vector<::pybind11::detail::field_descriptor> \
- {PYBIND11_MAP_LIST (PYBIND11_FIELD_DESCRIPTOR, Type, __VA_ARGS__)})
-
-#if defined(_MSC_VER) && !defined(__clang__)
-#define PYBIND11_MAP2_LIST_NEXT1(test, next) \
- PYBIND11_EVAL0 (PYBIND11_MAP_NEXT0 (test, PYBIND11_MAP_COMMA next, 0))
-#else
-#define PYBIND11_MAP2_LIST_NEXT1(test, next) \
- PYBIND11_MAP_NEXT0 (test, PYBIND11_MAP_COMMA next, 0)
-#endif
-#define PYBIND11_MAP2_LIST_NEXT(test, next) \
- PYBIND11_MAP2_LIST_NEXT1 (PYBIND11_MAP_GET_END test, next)
-#define PYBIND11_MAP2_LIST0(f, t, x1, x2, peek, ...) \
- f(t, x1, x2) PYBIND11_MAP2_LIST_NEXT (peek, PYBIND11_MAP2_LIST1) (f, t, peek, __VA_ARGS__)
-#define PYBIND11_MAP2_LIST1(f, t, x1, x2, peek, ...) \
- f(t, x1, x2) PYBIND11_MAP2_LIST_NEXT (peek, PYBIND11_MAP2_LIST0) (f, t, peek, __VA_ARGS__)
-// PYBIND11_MAP2_LIST(f, t, a1, a2, ...) expands to f(t, a1, a2), f(t, a3, a4), ...
-#define PYBIND11_MAP2_LIST(f, t, ...) \
- PYBIND11_EVAL (PYBIND11_MAP2_LIST1 (f, t, __VA_ARGS__, (), 0))
-
-#define PYBIND11_NUMPY_DTYPE_EX(Type, ...) \
- ::pybind11::detail::npy_format_descriptor<Type>::register_dtype \
- (::std::vector<::pybind11::detail::field_descriptor> \
- {PYBIND11_MAP2_LIST (PYBIND11_FIELD_DESCRIPTOR_EX, Type, __VA_ARGS__)})
-
-#endif // __CLION_IDE__
-
-class common_iterator {
-public:
- using container_type = std::vector<ssize_t>;
- using value_type = container_type::value_type;
- using size_type = container_type::size_type;
-
- common_iterator() : p_ptr(0), m_strides() {}
-
- common_iterator(void* ptr, const container_type& strides, const container_type& shape)
- : p_ptr(reinterpret_cast<char*>(ptr)), m_strides(strides.size()) {
- m_strides.back() = static_cast<value_type>(strides.back());
- for (size_type i = m_strides.size() - 1; i != 0; --i) {
- size_type j = i - 1;
- auto s = static_cast<value_type>(shape[i]);
- m_strides[j] = strides[j] + m_strides[i] - strides[i] * s;
- }
- }
-
- void increment(size_type dim) {
- p_ptr += m_strides[dim];
- }
-
- void* data() const {
- return p_ptr;
- }
-
-private:
- char* p_ptr;
- container_type m_strides;
-};
-
-template <size_t N> class multi_array_iterator {
-public:
- using container_type = std::vector<ssize_t>;
-
- multi_array_iterator(const std::array<buffer_info, N> &buffers,
- const container_type &shape)
- : m_shape(shape.size()), m_index(shape.size(), 0),
- m_common_iterator() {
-
- // Manual copy to avoid conversion warning if using std::copy
- for (size_t i = 0; i < shape.size(); ++i)
- m_shape[i] = shape[i];
-
- container_type strides(shape.size());
- for (size_t i = 0; i < N; ++i)
- init_common_iterator(buffers[i], shape, m_common_iterator[i], strides);
- }
-
- multi_array_iterator& operator++() {
- for (size_t j = m_index.size(); j != 0; --j) {
- size_t i = j - 1;
- if (++m_index[i] != m_shape[i]) {
- increment_common_iterator(i);
- break;
- } else {
- m_index[i] = 0;
- }
- }
- return *this;
- }
-
- template <size_t K, class T = void> T* data() const {
- return reinterpret_cast<T*>(m_common_iterator[K].data());
- }
-
-private:
-
- using common_iter = common_iterator;
-
- void init_common_iterator(const buffer_info &buffer,
- const container_type &shape,
- common_iter &iterator,
- container_type &strides) {
- auto buffer_shape_iter = buffer.shape.rbegin();
- auto buffer_strides_iter = buffer.strides.rbegin();
- auto shape_iter = shape.rbegin();
- auto strides_iter = strides.rbegin();
-
- while (buffer_shape_iter != buffer.shape.rend()) {
- if (*shape_iter == *buffer_shape_iter)
- *strides_iter = *buffer_strides_iter;
- else
- *strides_iter = 0;
-
- ++buffer_shape_iter;
- ++buffer_strides_iter;
- ++shape_iter;
- ++strides_iter;
- }
-
- std::fill(strides_iter, strides.rend(), 0);
- iterator = common_iter(buffer.ptr, strides, shape);
- }
-
- void increment_common_iterator(size_t dim) {
- for (auto &iter : m_common_iterator)
- iter.increment(dim);
- }
-
- container_type m_shape;
- container_type m_index;
- std::array<common_iter, N> m_common_iterator;
-};
-
-enum class broadcast_trivial { non_trivial, c_trivial, f_trivial };
-
-// Populates the shape and number of dimensions for the set of buffers. Returns a broadcast_trivial
-// enum value indicating whether the broadcast is "trivial"--that is, has each buffer being either a
-// singleton or a full-size, C-contiguous (`c_trivial`) or Fortran-contiguous (`f_trivial`) storage
-// buffer; returns `non_trivial` otherwise.
-template <size_t N>
-broadcast_trivial broadcast(const std::array<buffer_info, N> &buffers, ssize_t &ndim, std::vector<ssize_t> &shape) {
- ndim = std::accumulate(buffers.begin(), buffers.end(), ssize_t(0), [](ssize_t res, const buffer_info &buf) {
- return std::max(res, buf.ndim);
- });
-
- shape.clear();
- shape.resize((size_t) ndim, 1);
-
- // Figure out the output size, and make sure all input arrays conform (i.e. are either size 1 or
- // the full size).
- for (size_t i = 0; i < N; ++i) {
- auto res_iter = shape.rbegin();
- auto end = buffers[i].shape.rend();
- for (auto shape_iter = buffers[i].shape.rbegin(); shape_iter != end; ++shape_iter, ++res_iter) {
- const auto &dim_size_in = *shape_iter;
- auto &dim_size_out = *res_iter;
-
- // Each input dimension can either be 1 or `n`, but `n` values must match across buffers
- if (dim_size_out == 1)
- dim_size_out = dim_size_in;
- else if (dim_size_in != 1 && dim_size_in != dim_size_out)
- pybind11_fail("pybind11::vectorize: incompatible size/dimension of inputs!");
- }
- }
-
- bool trivial_broadcast_c = true;
- bool trivial_broadcast_f = true;
- for (size_t i = 0; i < N && (trivial_broadcast_c || trivial_broadcast_f); ++i) {
- if (buffers[i].size == 1)
- continue;
-
- // Require the same number of dimensions:
- if (buffers[i].ndim != ndim)
- return broadcast_trivial::non_trivial;
-
- // Require all dimensions be full-size:
- if (!std::equal(buffers[i].shape.cbegin(), buffers[i].shape.cend(), shape.cbegin()))
- return broadcast_trivial::non_trivial;
-
- // Check for C contiguity (but only if previous inputs were also C contiguous)
- if (trivial_broadcast_c) {
- ssize_t expect_stride = buffers[i].itemsize;
- auto end = buffers[i].shape.crend();
- for (auto shape_iter = buffers[i].shape.crbegin(), stride_iter = buffers[i].strides.crbegin();
- trivial_broadcast_c && shape_iter != end; ++shape_iter, ++stride_iter) {
- if (expect_stride == *stride_iter)
- expect_stride *= *shape_iter;
- else
- trivial_broadcast_c = false;
- }
- }
-
- // Check for Fortran contiguity (if previous inputs were also F contiguous)
- if (trivial_broadcast_f) {
- ssize_t expect_stride = buffers[i].itemsize;
- auto end = buffers[i].shape.cend();
- for (auto shape_iter = buffers[i].shape.cbegin(), stride_iter = buffers[i].strides.cbegin();
- trivial_broadcast_f && shape_iter != end; ++shape_iter, ++stride_iter) {
- if (expect_stride == *stride_iter)
- expect_stride *= *shape_iter;
- else
- trivial_broadcast_f = false;
- }
- }
- }
-
- return
- trivial_broadcast_c ? broadcast_trivial::c_trivial :
- trivial_broadcast_f ? broadcast_trivial::f_trivial :
- broadcast_trivial::non_trivial;
-}
-
-template <typename T>
-struct vectorize_arg {
- static_assert(!std::is_rvalue_reference<T>::value, "Functions with rvalue reference arguments cannot be vectorized");
- // The wrapped function gets called with this type:
- using call_type = remove_reference_t<T>;
- // Is this a vectorized argument?
- static constexpr bool vectorize =
- satisfies_any_of<call_type, std::is_arithmetic, is_complex, is_pod>::value &&
- satisfies_none_of<call_type, std::is_pointer, std::is_array, is_std_array, std::is_enum>::value &&
- (!std::is_reference<T>::value ||
- (std::is_lvalue_reference<T>::value && std::is_const<call_type>::value));
- // Accept this type: an array for vectorized types, otherwise the type as-is:
- using type = conditional_t<vectorize, array_t<remove_cv_t<call_type>, array::forcecast>, T>;
-};
-
-
-// py::vectorize when a return type is present
-template <typename Func, typename Return, typename... Args>
-struct vectorize_returned_array {
- using Type = array_t<Return>;
-
- static Type create(broadcast_trivial trivial, const std::vector<ssize_t> &shape) {
- if (trivial == broadcast_trivial::f_trivial)
- return array_t<Return, array::f_style>(shape);
- else
- return array_t<Return>(shape);
- }
-
- static Return *mutable_data(Type &array) {
- return array.mutable_data();
- }
-
- static Return call(Func &f, Args &... args) {
- return f(args...);
- }
-
- static void call(Return *out, size_t i, Func &f, Args &... args) {
- out[i] = f(args...);
- }
-};
-
-// py::vectorize when a return type is not present
-template <typename Func, typename... Args>
-struct vectorize_returned_array<Func, void, Args...> {
- using Type = none;
-
- static Type create(broadcast_trivial, const std::vector<ssize_t> &) {
- return none();
- }
-
- static void *mutable_data(Type &) {
- return nullptr;
- }
-
- static detail::void_type call(Func &f, Args &... args) {
- f(args...);
- return {};
- }
-
- static void call(void *, size_t, Func &f, Args &... args) {
- f(args...);
- }
-};
-
-
-template <typename Func, typename Return, typename... Args>
-struct vectorize_helper {
-
-// NVCC for some reason breaks if NVectorized is private
-#ifdef __CUDACC__
-public:
-#else
-private:
-#endif
-
- static constexpr size_t N = sizeof...(Args);
- static constexpr size_t NVectorized = constexpr_sum(vectorize_arg<Args>::vectorize...);
- static_assert(NVectorized >= 1,
- "pybind11::vectorize(...) requires a function with at least one vectorizable argument");
-
-public:
- template <typename T>
- explicit vectorize_helper(T &&f) : f(std::forward<T>(f)) { }
-
- object operator()(typename vectorize_arg<Args>::type... args) {
- return run(args...,
- make_index_sequence<N>(),
- select_indices<vectorize_arg<Args>::vectorize...>(),
- make_index_sequence<NVectorized>());
- }
-
-private:
- remove_reference_t<Func> f;
-
- // Internal compiler error in MSVC 19.16.27025.1 (Visual Studio 2017 15.9.4), when compiling with "/permissive-" flag
- // when arg_call_types is manually inlined.
- using arg_call_types = std::tuple<typename vectorize_arg<Args>::call_type...>;
- template <size_t Index> using param_n_t = typename std::tuple_element<Index, arg_call_types>::type;
-
- using returned_array = vectorize_returned_array<Func, Return, Args...>;
-
- // Runs a vectorized function given arguments tuple and three index sequences:
- // - Index is the full set of 0 ... (N-1) argument indices;
- // - VIndex is the subset of argument indices with vectorized parameters, letting us access
- // vectorized arguments (anything not in this sequence is passed through)
- // - BIndex is a incremental sequence (beginning at 0) of the same size as VIndex, so that
- // we can store vectorized buffer_infos in an array (argument VIndex has its buffer at
- // index BIndex in the array).
- template <size_t... Index, size_t... VIndex, size_t... BIndex> object run(
- typename vectorize_arg<Args>::type &...args,
- index_sequence<Index...> i_seq, index_sequence<VIndex...> vi_seq, index_sequence<BIndex...> bi_seq) {
-
- // Pointers to values the function was called with; the vectorized ones set here will start
- // out as array_t<T> pointers, but they will be changed them to T pointers before we make
- // call the wrapped function. Non-vectorized pointers are left as-is.
- std::array<void *, N> params{{ &args... }};
-
- // The array of `buffer_info`s of vectorized arguments:
- std::array<buffer_info, NVectorized> buffers{{ reinterpret_cast<array *>(params[VIndex])->request()... }};
-
- /* Determine dimensions parameters of output array */
- ssize_t nd = 0;
- std::vector<ssize_t> shape(0);
- auto trivial = broadcast(buffers, nd, shape);
- auto ndim = (size_t) nd;
-
- size_t size = std::accumulate(shape.begin(), shape.end(), (size_t) 1, std::multiplies<size_t>());
-
- // If all arguments are 0-dimension arrays (i.e. single values) return a plain value (i.e.
- // not wrapped in an array).
- if (size == 1 && ndim == 0) {
- PYBIND11_EXPAND_SIDE_EFFECTS(params[VIndex] = buffers[BIndex].ptr);
- return cast(returned_array::call(f, *reinterpret_cast<param_n_t<Index> *>(params[Index])...));
- }
-
- auto result = returned_array::create(trivial, shape);
-
- if (size == 0) return std::move(result);
-
- /* Call the function */
- auto mutable_data = returned_array::mutable_data(result);
- if (trivial == broadcast_trivial::non_trivial)
- apply_broadcast(buffers, params, mutable_data, size, shape, i_seq, vi_seq, bi_seq);
- else
- apply_trivial(buffers, params, mutable_data, size, i_seq, vi_seq, bi_seq);
-
- return std::move(result);
- }
-
- template <size_t... Index, size_t... VIndex, size_t... BIndex>
- void apply_trivial(std::array<buffer_info, NVectorized> &buffers,
- std::array<void *, N> ¶ms,
- Return *out,
- size_t size,
- index_sequence<Index...>, index_sequence<VIndex...>, index_sequence<BIndex...>) {
-
- // Initialize an array of mutable byte references and sizes with references set to the
- // appropriate pointer in `params`; as we iterate, we'll increment each pointer by its size
- // (except for singletons, which get an increment of 0).
- std::array<std::pair<unsigned char *&, const size_t>, NVectorized> vecparams{{
- std::pair<unsigned char *&, const size_t>(
- reinterpret_cast<unsigned char *&>(params[VIndex] = buffers[BIndex].ptr),
- buffers[BIndex].size == 1 ? 0 : sizeof(param_n_t<VIndex>)
- )...
- }};
-
- for (size_t i = 0; i < size; ++i) {
- returned_array::call(out, i, f, *reinterpret_cast<param_n_t<Index> *>(params[Index])...);
- for (auto &x : vecparams) x.first += x.second;
- }
- }
-
- template <size_t... Index, size_t... VIndex, size_t... BIndex>
- void apply_broadcast(std::array<buffer_info, NVectorized> &buffers,
- std::array<void *, N> ¶ms,
- Return *out,
- size_t size,
- const std::vector<ssize_t> &output_shape,
- index_sequence<Index...>, index_sequence<VIndex...>, index_sequence<BIndex...>) {
-
- multi_array_iterator<NVectorized> input_iter(buffers, output_shape);
-
- for (size_t i = 0; i < size; ++i, ++input_iter) {
- PYBIND11_EXPAND_SIDE_EFFECTS((
- params[VIndex] = input_iter.template data<BIndex>()
- ));
- returned_array::call(out, i, f, *reinterpret_cast<param_n_t<Index> *>(std::get<Index>(params))...);
- }
- }
-};
-
-template <typename Func, typename Return, typename... Args>
-vectorize_helper<Func, Return, Args...>
-vectorize_extractor(const Func &f, Return (*) (Args ...)) {
- return detail::vectorize_helper<Func, Return, Args...>(f);
-}
-
-template <typename T, int Flags> struct handle_type_name<array_t<T, Flags>> {
- static constexpr auto name = _("numpy.ndarray[") + npy_format_descriptor<T>::name + _("]");
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-// Vanilla pointer vectorizer:
-template <typename Return, typename... Args>
-detail::vectorize_helper<Return (*)(Args...), Return, Args...>
-vectorize(Return (*f) (Args ...)) {
- return detail::vectorize_helper<Return (*)(Args...), Return, Args...>(f);
-}
-
-// lambda vectorizer:
-template <typename Func, detail::enable_if_t<detail::is_lambda<Func>::value, int> = 0>
-auto vectorize(Func &&f) -> decltype(
- detail::vectorize_extractor(std::forward<Func>(f), (detail::function_signature_t<Func> *) nullptr)) {
- return detail::vectorize_extractor(std::forward<Func>(f), (detail::function_signature_t<Func> *) nullptr);
-}
-
-// Vectorize a class method (non-const):
-template <typename Return, typename Class, typename... Args,
- typename Helper = detail::vectorize_helper<decltype(std::mem_fn(std::declval<Return (Class::*)(Args...)>())), Return, Class *, Args...>>
-Helper vectorize(Return (Class::*f)(Args...)) {
- return Helper(std::mem_fn(f));
-}
-
-// Vectorize a class method (const):
-template <typename Return, typename Class, typename... Args,
- typename Helper = detail::vectorize_helper<decltype(std::mem_fn(std::declval<Return (Class::*)(Args...) const>())), Return, const Class *, Args...>>
-Helper vectorize(Return (Class::*f)(Args...) const) {
- return Helper(std::mem_fn(f));
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/operators.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/operators.h
deleted file mode 100644
index 086cb4cfd838797767dd3b3caa275bdb4348fc8e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/operators.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- pybind11/operator.h: Metatemplates for operator overloading
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-#if defined(__clang__) && !defined(__INTEL_COMPILER)
-# pragma clang diagnostic ignored "-Wunsequenced" // multiple unsequenced modifications to 'self' (when using def(py::self OP Type()))
-#elif defined(_MSC_VER)
-# pragma warning(push)
-# pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// Enumeration with all supported operator types
-enum op_id : int {
- op_add, op_sub, op_mul, op_div, op_mod, op_divmod, op_pow, op_lshift,
- op_rshift, op_and, op_xor, op_or, op_neg, op_pos, op_abs, op_invert,
- op_int, op_long, op_float, op_str, op_cmp, op_gt, op_ge, op_lt, op_le,
- op_eq, op_ne, op_iadd, op_isub, op_imul, op_idiv, op_imod, op_ilshift,
- op_irshift, op_iand, op_ixor, op_ior, op_complex, op_bool, op_nonzero,
- op_repr, op_truediv, op_itruediv, op_hash
-};
-
-enum op_type : int {
- op_l, /* base type on left */
- op_r, /* base type on right */
- op_u /* unary operator */
-};
-
-struct self_t { };
-static const self_t self = self_t();
-
-/// Type for an unused type slot
-struct undefined_t { };
-
-/// Don't warn about an unused variable
-inline self_t __self() { return self; }
-
-/// base template of operator implementations
-template <op_id, op_type, typename B, typename L, typename R> struct op_impl { };
-
-/// Operator implementation generator
-template <op_id id, op_type ot, typename L, typename R> struct op_ {
- template <typename Class, typename... Extra> void execute(Class &cl, const Extra&... extra) const {
- using Base = typename Class::type;
- using L_type = conditional_t<std::is_same<L, self_t>::value, Base, L>;
- using R_type = conditional_t<std::is_same<R, self_t>::value, Base, R>;
- using op = op_impl<id, ot, Base, L_type, R_type>;
- cl.def(op::name(), &op::execute, is_operator(), extra...);
- #if PY_MAJOR_VERSION < 3
- if (id == op_truediv || id == op_itruediv)
- cl.def(id == op_itruediv ? "__idiv__" : ot == op_l ? "__div__" : "__rdiv__",
- &op::execute, is_operator(), extra...);
- #endif
- }
- template <typename Class, typename... Extra> void execute_cast(Class &cl, const Extra&... extra) const {
- using Base = typename Class::type;
- using L_type = conditional_t<std::is_same<L, self_t>::value, Base, L>;
- using R_type = conditional_t<std::is_same<R, self_t>::value, Base, R>;
- using op = op_impl<id, ot, Base, L_type, R_type>;
- cl.def(op::name(), &op::execute_cast, is_operator(), extra...);
- #if PY_MAJOR_VERSION < 3
- if (id == op_truediv || id == op_itruediv)
- cl.def(id == op_itruediv ? "__idiv__" : ot == op_l ? "__div__" : "__rdiv__",
- &op::execute, is_operator(), extra...);
- #endif
- }
-};
-
-#define PYBIND11_BINARY_OPERATOR(id, rid, op, expr) \
-template <typename B, typename L, typename R> struct op_impl<op_##id, op_l, B, L, R> { \
- static char const* name() { return "__" #id "__"; } \
- static auto execute(const L &l, const R &r) -> decltype(expr) { return (expr); } \
- static B execute_cast(const L &l, const R &r) { return B(expr); } \
-}; \
-template <typename B, typename L, typename R> struct op_impl<op_##id, op_r, B, L, R> { \
- static char const* name() { return "__" #rid "__"; } \
- static auto execute(const R &r, const L &l) -> decltype(expr) { return (expr); } \
- static B execute_cast(const R &r, const L &l) { return B(expr); } \
-}; \
-inline op_<op_##id, op_l, self_t, self_t> op(const self_t &, const self_t &) { \
- return op_<op_##id, op_l, self_t, self_t>(); \
-} \
-template <typename T> op_<op_##id, op_l, self_t, T> op(const self_t &, const T &) { \
- return op_<op_##id, op_l, self_t, T>(); \
-} \
-template <typename T> op_<op_##id, op_r, T, self_t> op(const T &, const self_t &) { \
- return op_<op_##id, op_r, T, self_t>(); \
-}
-
-#define PYBIND11_INPLACE_OPERATOR(id, op, expr) \
-template <typename B, typename L, typename R> struct op_impl<op_##id, op_l, B, L, R> { \
- static char const* name() { return "__" #id "__"; } \
- static auto execute(L &l, const R &r) -> decltype(expr) { return expr; } \
- static B execute_cast(L &l, const R &r) { return B(expr); } \
-}; \
-template <typename T> op_<op_##id, op_l, self_t, T> op(const self_t &, const T &) { \
- return op_<op_##id, op_l, self_t, T>(); \
-}
-
-#define PYBIND11_UNARY_OPERATOR(id, op, expr) \
-template <typename B, typename L> struct op_impl<op_##id, op_u, B, L, undefined_t> { \
- static char const* name() { return "__" #id "__"; } \
- static auto execute(const L &l) -> decltype(expr) { return expr; } \
- static B execute_cast(const L &l) { return B(expr); } \
-}; \
-inline op_<op_##id, op_u, self_t, undefined_t> op(const self_t &) { \
- return op_<op_##id, op_u, self_t, undefined_t>(); \
-}
-
-PYBIND11_BINARY_OPERATOR(sub, rsub, operator-, l - r)
-PYBIND11_BINARY_OPERATOR(add, radd, operator+, l + r)
-PYBIND11_BINARY_OPERATOR(mul, rmul, operator*, l * r)
-PYBIND11_BINARY_OPERATOR(truediv, rtruediv, operator/, l / r)
-PYBIND11_BINARY_OPERATOR(mod, rmod, operator%, l % r)
-PYBIND11_BINARY_OPERATOR(lshift, rlshift, operator<<, l << r)
-PYBIND11_BINARY_OPERATOR(rshift, rrshift, operator>>, l >> r)
-PYBIND11_BINARY_OPERATOR(and, rand, operator&, l & r)
-PYBIND11_BINARY_OPERATOR(xor, rxor, operator^, l ^ r)
-PYBIND11_BINARY_OPERATOR(eq, eq, operator==, l == r)
-PYBIND11_BINARY_OPERATOR(ne, ne, operator!=, l != r)
-PYBIND11_BINARY_OPERATOR(or, ror, operator|, l | r)
-PYBIND11_BINARY_OPERATOR(gt, lt, operator>, l > r)
-PYBIND11_BINARY_OPERATOR(ge, le, operator>=, l >= r)
-PYBIND11_BINARY_OPERATOR(lt, gt, operator<, l < r)
-PYBIND11_BINARY_OPERATOR(le, ge, operator<=, l <= r)
-//PYBIND11_BINARY_OPERATOR(pow, rpow, pow, std::pow(l, r))
-PYBIND11_INPLACE_OPERATOR(iadd, operator+=, l += r)
-PYBIND11_INPLACE_OPERATOR(isub, operator-=, l -= r)
-PYBIND11_INPLACE_OPERATOR(imul, operator*=, l *= r)
-PYBIND11_INPLACE_OPERATOR(itruediv, operator/=, l /= r)
-PYBIND11_INPLACE_OPERATOR(imod, operator%=, l %= r)
-PYBIND11_INPLACE_OPERATOR(ilshift, operator<<=, l <<= r)
-PYBIND11_INPLACE_OPERATOR(irshift, operator>>=, l >>= r)
-PYBIND11_INPLACE_OPERATOR(iand, operator&=, l &= r)
-PYBIND11_INPLACE_OPERATOR(ixor, operator^=, l ^= r)
-PYBIND11_INPLACE_OPERATOR(ior, operator|=, l |= r)
-PYBIND11_UNARY_OPERATOR(neg, operator-, -l)
-PYBIND11_UNARY_OPERATOR(pos, operator+, +l)
-// WARNING: This usage of `abs` should only be done for existing STL overloads.
-// Adding overloads directly in to the `std::` namespace is advised against:
-// https://en.cppreference.com/w/cpp/language/extending_std
-PYBIND11_UNARY_OPERATOR(abs, abs, std::abs(l))
-PYBIND11_UNARY_OPERATOR(hash, hash, std::hash<L>()(l))
-PYBIND11_UNARY_OPERATOR(invert, operator~, (~l))
-PYBIND11_UNARY_OPERATOR(bool, operator!, !!l)
-PYBIND11_UNARY_OPERATOR(int, int_, (int) l)
-PYBIND11_UNARY_OPERATOR(float, float_, (double) l)
-
-#undef PYBIND11_BINARY_OPERATOR
-#undef PYBIND11_INPLACE_OPERATOR
-#undef PYBIND11_UNARY_OPERATOR
-PYBIND11_NAMESPACE_END(detail)
-
-using detail::self;
-// Add named operators so that they are accessible via `py::`.
-using detail::hash;
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/options.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/options.h
deleted file mode 100644
index d74db1c68dddb3436cc0fb2674a6ef32ac77d5fd..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/options.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- pybind11/options.h: global settings that are configurable at runtime.
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-class options {
-public:
-
- // Default RAII constructor, which leaves settings as they currently are.
- options() : previous_state(global_state()) {}
-
- // Class is non-copyable.
- options(const options&) = delete;
- options& operator=(const options&) = delete;
-
- // Destructor, which restores settings that were in effect before.
- ~options() {
- global_state() = previous_state;
- }
-
- // Setter methods (affect the global state):
-
- options& disable_user_defined_docstrings() & { global_state().show_user_defined_docstrings = false; return *this; }
-
- options& enable_user_defined_docstrings() & { global_state().show_user_defined_docstrings = true; return *this; }
-
- options& disable_function_signatures() & { global_state().show_function_signatures = false; return *this; }
-
- options& enable_function_signatures() & { global_state().show_function_signatures = true; return *this; }
-
- // Getter methods (return the global state):
-
- static bool show_user_defined_docstrings() { return global_state().show_user_defined_docstrings; }
-
- static bool show_function_signatures() { return global_state().show_function_signatures; }
-
- // This type is not meant to be allocated on the heap.
- void* operator new(size_t) = delete;
-
-private:
-
- struct state {
- bool show_user_defined_docstrings = true; //< Include user-supplied texts in docstrings.
- bool show_function_signatures = true; //< Include auto-generated function signatures in docstrings.
- };
-
- static state &global_state() {
- static state instance;
- return instance;
- }
-
- state previous_state;
-};
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/pybind11.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/pybind11.h
deleted file mode 100644
index fa98f7c18be4918573e8989b729b1e1a2b5012ff..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/pybind11.h
+++ /dev/null
@@ -1,2373 +0,0 @@
-/*
- pybind11/pybind11.h: Main header file of the C++11 python
- binding generator library
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#if defined(__INTEL_COMPILER)
-# pragma warning push
-# pragma warning disable 68 // integer conversion resulted in a change of sign
-# pragma warning disable 186 // pointless comparison of unsigned integer with zero
-# pragma warning disable 878 // incompatible exception specifications
-# pragma warning disable 1334 // the "template" keyword used for syntactic disambiguation may only be used within a template
-# pragma warning disable 1682 // implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
-# pragma warning disable 1786 // function "strdup" was declared deprecated
-# pragma warning disable 1875 // offsetof applied to non-POD (Plain Old Data) types is nonstandard
-# pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
-#elif defined(_MSC_VER)
-# pragma warning(push)
-# pragma warning(disable: 4100) // warning C4100: Unreferenced formal parameter
-# pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
-# pragma warning(disable: 4512) // warning C4512: Assignment operator was implicitly defined as deleted
-# pragma warning(disable: 4800) // warning C4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
-# pragma warning(disable: 4996) // warning C4996: The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name
-# pragma warning(disable: 4702) // warning C4702: unreachable code
-# pragma warning(disable: 4522) // warning C4522: multiple assignment operators specified
-# pragma warning(disable: 4505) // warning C4505: 'PySlice_GetIndicesEx': unreferenced local function has been removed (PyPy only)
-#elif defined(__GNUG__) && !defined(__clang__)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
-# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-# pragma GCC diagnostic ignored "-Wstrict-aliasing"
-# pragma GCC diagnostic ignored "-Wattributes"
-# if __GNUC__ >= 7
-# pragma GCC diagnostic ignored "-Wnoexcept-type"
-# endif
-#endif
-
-#include "attr.h"
-#include "options.h"
-#include "detail/class.h"
-#include "detail/init.h"
-
-#include <memory>
-#include <vector>
-#include <string>
-#include <utility>
-
-#if defined(__GNUG__) && !defined(__clang__)
-# include <cxxabi.h>
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-/// Wraps an arbitrary C++ function/method/lambda function/.. into a callable Python object
-class cpp_function : public function {
-public:
- cpp_function() = default;
- cpp_function(std::nullptr_t) { }
-
- /// Construct a cpp_function from a vanilla function pointer
- template <typename Return, typename... Args, typename... Extra>
- cpp_function(Return (*f)(Args...), const Extra&... extra) {
- initialize(f, f, extra...);
- }
-
- /// Construct a cpp_function from a lambda function (possibly with internal state)
- template <typename Func, typename... Extra,
- typename = detail::enable_if_t<detail::is_lambda<Func>::value>>
- cpp_function(Func &&f, const Extra&... extra) {
- initialize(std::forward<Func>(f),
- (detail::function_signature_t<Func> *) nullptr, extra...);
- }
-
- /// Construct a cpp_function from a class method (non-const, no ref-qualifier)
- template <typename Return, typename Class, typename... Arg, typename... Extra>
- cpp_function(Return (Class::*f)(Arg...), const Extra&... extra) {
- initialize([f](Class *c, Arg... args) -> Return { return (c->*f)(std::forward<Arg>(args)...); },
- (Return (*) (Class *, Arg...)) nullptr, extra...);
- }
-
- /// Construct a cpp_function from a class method (non-const, lvalue ref-qualifier)
- /// A copy of the overload for non-const functions without explicit ref-qualifier
- /// but with an added `&`.
- template <typename Return, typename Class, typename... Arg, typename... Extra>
- cpp_function(Return (Class::*f)(Arg...)&, const Extra&... extra) {
- initialize([f](Class *c, Arg... args) -> Return { return (c->*f)(args...); },
- (Return (*) (Class *, Arg...)) nullptr, extra...);
- }
-
- /// Construct a cpp_function from a class method (const, no ref-qualifier)
- template <typename Return, typename Class, typename... Arg, typename... Extra>
- cpp_function(Return (Class::*f)(Arg...) const, const Extra&... extra) {
- initialize([f](const Class *c, Arg... args) -> Return { return (c->*f)(std::forward<Arg>(args)...); },
- (Return (*)(const Class *, Arg ...)) nullptr, extra...);
- }
-
- /// Construct a cpp_function from a class method (const, lvalue ref-qualifier)
- /// A copy of the overload for const functions without explicit ref-qualifier
- /// but with an added `&`.
- template <typename Return, typename Class, typename... Arg, typename... Extra>
- cpp_function(Return (Class::*f)(Arg...) const&, const Extra&... extra) {
- initialize([f](const Class *c, Arg... args) -> Return { return (c->*f)(args...); },
- (Return (*)(const Class *, Arg ...)) nullptr, extra...);
- }
-
- /// Return the function name
- object name() const { return attr("__name__"); }
-
-protected:
- /// Space optimization: don't inline this frequently instantiated fragment
- PYBIND11_NOINLINE detail::function_record *make_function_record() {
- return new detail::function_record();
- }
-
- /// Special internal constructor for functors, lambda functions, etc.
- template <typename Func, typename Return, typename... Args, typename... Extra>
- void initialize(Func &&f, Return (*)(Args...), const Extra&... extra) {
- using namespace detail;
- struct capture { remove_reference_t<Func> f; };
-
- /* Store the function including any extra state it might have (e.g. a lambda capture object) */
- auto rec = make_function_record();
-
- /* Store the capture object directly in the function record if there is enough space */
- if (sizeof(capture) <= sizeof(rec->data)) {
- /* Without these pragmas, GCC warns that there might not be
- enough space to use the placement new operator. However, the
- 'if' statement above ensures that this is the case. */
-#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 6
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wplacement-new"
-#endif
- new ((capture *) &rec->data) capture { std::forward<Func>(f) };
-#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 6
-# pragma GCC diagnostic pop
-#endif
- if (!std::is_trivially_destructible<Func>::value)
- rec->free_data = [](function_record *r) { ((capture *) &r->data)->~capture(); };
- } else {
- rec->data[0] = new capture { std::forward<Func>(f) };
- rec->free_data = [](function_record *r) { delete ((capture *) r->data[0]); };
- }
-
- /* Type casters for the function arguments and return value */
- using cast_in = argument_loader<Args...>;
- using cast_out = make_caster<
- conditional_t<std::is_void<Return>::value, void_type, Return>
- >;
-
- static_assert(expected_num_args<Extra...>(sizeof...(Args), cast_in::has_args, cast_in::has_kwargs),
- "The number of argument annotations does not match the number of function arguments");
-
- /* Dispatch code which converts function arguments and performs the actual function call */
- rec->impl = [](function_call &call) -> handle {
- cast_in args_converter;
-
- /* Try to cast the function arguments into the C++ domain */
- if (!args_converter.load_args(call))
- return PYBIND11_TRY_NEXT_OVERLOAD;
-
- /* Invoke call policy pre-call hook */
- process_attributes<Extra...>::precall(call);
-
- /* Get a pointer to the capture object */
- auto data = (sizeof(capture) <= sizeof(call.func.data)
- ? &call.func.data : call.func.data[0]);
- auto *cap = const_cast<capture *>(reinterpret_cast<const capture *>(data));
-
- /* Override policy for rvalues -- usually to enforce rvp::move on an rvalue */
- return_value_policy policy = return_value_policy_override<Return>::policy(call.func.policy);
-
- /* Function scope guard -- defaults to the compile-to-nothing `void_type` */
- using Guard = extract_guard_t<Extra...>;
-
- /* Perform the function call */
- handle result = cast_out::cast(
- std::move(args_converter).template call<Return, Guard>(cap->f), policy, call.parent);
-
- /* Invoke call policy post-call hook */
- process_attributes<Extra...>::postcall(call, result);
-
- return result;
- };
-
- /* Process any user-provided function attributes */
- process_attributes<Extra...>::init(extra..., rec);
-
- {
- constexpr bool has_kw_only_args = any_of<std::is_same<kw_only, Extra>...>::value,
- has_pos_only_args = any_of<std::is_same<pos_only, Extra>...>::value,
- has_args = any_of<std::is_same<args, Args>...>::value,
- has_arg_annotations = any_of<is_keyword<Extra>...>::value;
- static_assert(has_arg_annotations || !has_kw_only_args, "py::kw_only requires the use of argument annotations");
- static_assert(has_arg_annotations || !has_pos_only_args, "py::pos_only requires the use of argument annotations (for docstrings and aligning the annotations to the argument)");
- static_assert(!(has_args && has_kw_only_args), "py::kw_only cannot be combined with a py::args argument");
- }
-
- /* Generate a readable signature describing the function's arguments and return value types */
- static constexpr auto signature = _("(") + cast_in::arg_names + _(") -> ") + cast_out::name;
- PYBIND11_DESCR_CONSTEXPR auto types = decltype(signature)::types();
-
- /* Register the function with Python from generic (non-templated) code */
- initialize_generic(rec, signature.text, types.data(), sizeof...(Args));
-
- if (cast_in::has_args) rec->has_args = true;
- if (cast_in::has_kwargs) rec->has_kwargs = true;
-
- /* Stash some additional information used by an important optimization in 'functional.h' */
- using FunctionType = Return (*)(Args...);
- constexpr bool is_function_ptr =
- std::is_convertible<Func, FunctionType>::value &&
- sizeof(capture) == sizeof(void *);
- if (is_function_ptr) {
- rec->is_stateless = true;
- rec->data[1] = const_cast<void *>(reinterpret_cast<const void *>(&typeid(FunctionType)));
- }
- }
-
- /// Register a function call with Python (generic non-templated code goes here)
- void initialize_generic(detail::function_record *rec, const char *text,
- const std::type_info *const *types, size_t args) {
-
- /* Create copies of all referenced C-style strings */
- rec->name = strdup(rec->name ? rec->name : "");
- if (rec->doc) rec->doc = strdup(rec->doc);
- for (auto &a: rec->args) {
- if (a.name)
- a.name = strdup(a.name);
- if (a.descr)
- a.descr = strdup(a.descr);
- else if (a.value)
- a.descr = strdup(repr(a.value).cast<std::string>().c_str());
- }
-
- rec->is_constructor = !strcmp(rec->name, "__init__") || !strcmp(rec->name, "__setstate__");
-
-#if !defined(NDEBUG) && !defined(PYBIND11_DISABLE_NEW_STYLE_INIT_WARNING)
- if (rec->is_constructor && !rec->is_new_style_constructor) {
- const auto class_name = detail::get_fully_qualified_tp_name((PyTypeObject *) rec->scope.ptr());
- const auto func_name = std::string(rec->name);
- PyErr_WarnEx(
- PyExc_FutureWarning,
- ("pybind11-bound class '" + class_name + "' is using an old-style "
- "placement-new '" + func_name + "' which has been deprecated. See "
- "the upgrade guide in pybind11's docs. This message is only visible "
- "when compiled in debug mode.").c_str(), 0
- );
- }
-#endif
-
- /* Generate a proper function signature */
- std::string signature;
- size_t type_index = 0, arg_index = 0;
- for (auto *pc = text; *pc != '\0'; ++pc) {
- const auto c = *pc;
-
- if (c == '{') {
- // Write arg name for everything except *args and **kwargs.
- if (*(pc + 1) == '*')
- continue;
- // Separator for keyword-only arguments, placed before the kw
- // arguments start
- if (rec->nargs_kw_only > 0 && arg_index + rec->nargs_kw_only == args)
- signature += "*, ";
- if (arg_index < rec->args.size() && rec->args[arg_index].name) {
- signature += rec->args[arg_index].name;
- } else if (arg_index == 0 && rec->is_method) {
- signature += "self";
- } else {
- signature += "arg" + std::to_string(arg_index - (rec->is_method ? 1 : 0));
- }
- signature += ": ";
- } else if (c == '}') {
- // Write default value if available.
- if (arg_index < rec->args.size() && rec->args[arg_index].descr) {
- signature += " = ";
- signature += rec->args[arg_index].descr;
- }
- // Separator for positional-only arguments (placed after the
- // argument, rather than before like *
- if (rec->nargs_pos_only > 0 && (arg_index + 1) == rec->nargs_pos_only)
- signature += ", /";
- arg_index++;
- } else if (c == '%') {
- const std::type_info *t = types[type_index++];
- if (!t)
- pybind11_fail("Internal error while parsing type signature (1)");
- if (auto tinfo = detail::get_type_info(*t)) {
- handle th((PyObject *) tinfo->type);
- signature +=
- th.attr("__module__").cast<std::string>() + "." +
- th.attr("__qualname__").cast<std::string>(); // Python 3.3+, but we backport it to earlier versions
- } else if (rec->is_new_style_constructor && arg_index == 0) {
- // A new-style `__init__` takes `self` as `value_and_holder`.
- // Rewrite it to the proper class type.
- signature +=
- rec->scope.attr("__module__").cast<std::string>() + "." +
- rec->scope.attr("__qualname__").cast<std::string>();
- } else {
- std::string tname(t->name());
- detail::clean_type_id(tname);
- signature += tname;
- }
- } else {
- signature += c;
- }
- }
-
- if (arg_index != args || types[type_index] != nullptr)
- pybind11_fail("Internal error while parsing type signature (2)");
-
-#if PY_MAJOR_VERSION < 3
- if (strcmp(rec->name, "__next__") == 0) {
- std::free(rec->name);
- rec->name = strdup("next");
- } else if (strcmp(rec->name, "__bool__") == 0) {
- std::free(rec->name);
- rec->name = strdup("__nonzero__");
- }
-#endif
- rec->signature = strdup(signature.c_str());
- rec->args.shrink_to_fit();
- rec->nargs = (std::uint16_t) args;
-
- if (rec->sibling && PYBIND11_INSTANCE_METHOD_CHECK(rec->sibling.ptr()))
- rec->sibling = PYBIND11_INSTANCE_METHOD_GET_FUNCTION(rec->sibling.ptr());
-
- detail::function_record *chain = nullptr, *chain_start = rec;
- if (rec->sibling) {
- if (PyCFunction_Check(rec->sibling.ptr())) {
- auto rec_capsule = reinterpret_borrow<capsule>(PyCFunction_GET_SELF(rec->sibling.ptr()));
- chain = (detail::function_record *) rec_capsule;
- /* Never append a method to an overload chain of a parent class;
- instead, hide the parent's overloads in this case */
- if (!chain->scope.is(rec->scope))
- chain = nullptr;
- }
- // Don't trigger for things like the default __init__, which are wrapper_descriptors that we are intentionally replacing
- else if (!rec->sibling.is_none() && rec->name[0] != '_')
- pybind11_fail("Cannot overload existing non-function object \"" + std::string(rec->name) +
- "\" with a function of the same name");
- }
-
- if (!chain) {
- /* No existing overload was found, create a new function object */
- rec->def = new PyMethodDef();
- std::memset(rec->def, 0, sizeof(PyMethodDef));
- rec->def->ml_name = rec->name;
- rec->def->ml_meth = reinterpret_cast<PyCFunction>(reinterpret_cast<void (*) (void)>(*dispatcher));
- rec->def->ml_flags = METH_VARARGS | METH_KEYWORDS;
-
- capsule rec_capsule(rec, [](void *ptr) {
- destruct((detail::function_record *) ptr);
- });
-
- object scope_module;
- if (rec->scope) {
- if (hasattr(rec->scope, "__module__")) {
- scope_module = rec->scope.attr("__module__");
- } else if (hasattr(rec->scope, "__name__")) {
- scope_module = rec->scope.attr("__name__");
- }
- }
-
- m_ptr = PyCFunction_NewEx(rec->def, rec_capsule.ptr(), scope_module.ptr());
- if (!m_ptr)
- pybind11_fail("cpp_function::cpp_function(): Could not allocate function object");
- } else {
- /* Append at the beginning or end of the overload chain */
- m_ptr = rec->sibling.ptr();
- inc_ref();
- if (chain->is_method != rec->is_method)
- pybind11_fail("overloading a method with both static and instance methods is not supported; "
- #if defined(NDEBUG)
- "compile in debug mode for more details"
- #else
- "error while attempting to bind " + std::string(rec->is_method ? "instance" : "static") + " method " +
- std::string(pybind11::str(rec->scope.attr("__name__"))) + "." + std::string(rec->name) + signature
- #endif
- );
-
- if (rec->prepend) {
- // Beginning of chain; we need to replace the capsule's current head-of-the-chain
- // pointer with this one, then make this one point to the previous head of the
- // chain.
- chain_start = rec;
- rec->next = chain;
- auto rec_capsule = reinterpret_borrow<capsule>(((PyCFunctionObject *) m_ptr)->m_self);
- rec_capsule.set_pointer(rec);
- } else {
- // Or end of chain (normal behavior)
- chain_start = chain;
- while (chain->next)
- chain = chain->next;
- chain->next = rec;
- }
- }
-
- std::string signatures;
- int index = 0;
- /* Create a nice pydoc rec including all signatures and
- docstrings of the functions in the overload chain */
- if (chain && options::show_function_signatures()) {
- // First a generic signature
- signatures += rec->name;
- signatures += "(*args, **kwargs)\n";
- signatures += "Overloaded function.\n\n";
- }
- // Then specific overload signatures
- bool first_user_def = true;
- for (auto it = chain_start; it != nullptr; it = it->next) {
- if (options::show_function_signatures()) {
- if (index > 0) signatures += "\n";
- if (chain)
- signatures += std::to_string(++index) + ". ";
- signatures += rec->name;
- signatures += it->signature;
- signatures += "\n";
- }
- if (it->doc && strlen(it->doc) > 0 && options::show_user_defined_docstrings()) {
- // If we're appending another docstring, and aren't printing function signatures, we
- // need to append a newline first:
- if (!options::show_function_signatures()) {
- if (first_user_def) first_user_def = false;
- else signatures += "\n";
- }
- if (options::show_function_signatures()) signatures += "\n";
- signatures += it->doc;
- if (options::show_function_signatures()) signatures += "\n";
- }
- }
-
- /* Install docstring */
- auto *func = (PyCFunctionObject *) m_ptr;
- if (func->m_ml->ml_doc)
- std::free(const_cast<char *>(func->m_ml->ml_doc));
- func->m_ml->ml_doc = strdup(signatures.c_str());
-
- if (rec->is_method) {
- m_ptr = PYBIND11_INSTANCE_METHOD_NEW(m_ptr, rec->scope.ptr());
- if (!m_ptr)
- pybind11_fail("cpp_function::cpp_function(): Could not allocate instance method object");
- Py_DECREF(func);
- }
- }
-
- /// When a cpp_function is GCed, release any memory allocated by pybind11
- static void destruct(detail::function_record *rec) {
- // If on Python 3.9, check the interpreter "MICRO" (patch) version.
- // If this is running on 3.9.0, we have to work around a bug.
- #if !defined(PYPY_VERSION) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION == 9
- static bool is_zero = Py_GetVersion()[4] == '0';
- #endif
-
- while (rec) {
- detail::function_record *next = rec->next;
- if (rec->free_data)
- rec->free_data(rec);
- std::free((char *) rec->name);
- std::free((char *) rec->doc);
- std::free((char *) rec->signature);
- for (auto &arg: rec->args) {
- std::free(const_cast<char *>(arg.name));
- std::free(const_cast<char *>(arg.descr));
- arg.value.dec_ref();
- }
- if (rec->def) {
- std::free(const_cast<char *>(rec->def->ml_doc));
- // Python 3.9.0 decref's these in the wrong order; rec->def
- // If loaded on 3.9.0, let these leak (use Python 3.9.1 at runtime to fix)
- // See https://github.com/python/cpython/pull/22670
- #if !defined(PYPY_VERSION) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION == 9
- if (!is_zero)
- delete rec->def;
- #else
- delete rec->def;
- #endif
- }
- delete rec;
- rec = next;
- }
- }
-
- /// Main dispatch logic for calls to functions bound using pybind11
- static PyObject *dispatcher(PyObject *self, PyObject *args_in, PyObject *kwargs_in) {
- using namespace detail;
-
- /* Iterator over the list of potentially admissible overloads */
- const function_record *overloads = (function_record *) PyCapsule_GetPointer(self, nullptr),
- *it = overloads;
-
- /* Need to know how many arguments + keyword arguments there are to pick the right overload */
- const auto n_args_in = (size_t) PyTuple_GET_SIZE(args_in);
-
- handle parent = n_args_in > 0 ? PyTuple_GET_ITEM(args_in, 0) : nullptr,
- result = PYBIND11_TRY_NEXT_OVERLOAD;
-
- auto self_value_and_holder = value_and_holder();
- if (overloads->is_constructor) {
- const auto tinfo = get_type_info((PyTypeObject *) overloads->scope.ptr());
- const auto pi = reinterpret_cast<instance *>(parent.ptr());
- self_value_and_holder = pi->get_value_and_holder(tinfo, false);
-
- if (!self_value_and_holder.type || !self_value_and_holder.inst) {
- PyErr_SetString(PyExc_TypeError, "__init__(self, ...) called with invalid `self` argument");
- return nullptr;
- }
-
- // If this value is already registered it must mean __init__ is invoked multiple times;
- // we really can't support that in C++, so just ignore the second __init__.
- if (self_value_and_holder.instance_registered())
- return none().release().ptr();
- }
-
- try {
- // We do this in two passes: in the first pass, we load arguments with `convert=false`;
- // in the second, we allow conversion (except for arguments with an explicit
- // py::arg().noconvert()). This lets us prefer calls without conversion, with
- // conversion as a fallback.
- std::vector<function_call> second_pass;
-
- // However, if there are no overloads, we can just skip the no-convert pass entirely
- const bool overloaded = it != nullptr && it->next != nullptr;
-
- for (; it != nullptr; it = it->next) {
-
- /* For each overload:
- 1. Copy all positional arguments we were given, also checking to make sure that
- named positional arguments weren't *also* specified via kwarg.
- 2. If we weren't given enough, try to make up the omitted ones by checking
- whether they were provided by a kwarg matching the `py::arg("name")` name. If
- so, use it (and remove it from kwargs; if not, see if the function binding
- provided a default that we can use.
- 3. Ensure that either all keyword arguments were "consumed", or that the function
- takes a kwargs argument to accept unconsumed kwargs.
- 4. Any positional arguments still left get put into a tuple (for args), and any
- leftover kwargs get put into a dict.
- 5. Pack everything into a vector; if we have py::args or py::kwargs, they are an
- extra tuple or dict at the end of the positional arguments.
- 6. Call the function call dispatcher (function_record::impl)
-
- If one of these fail, move on to the next overload and keep trying until we get a
- result other than PYBIND11_TRY_NEXT_OVERLOAD.
- */
-
- const function_record &func = *it;
- size_t num_args = func.nargs; // Number of positional arguments that we need
- if (func.has_args) --num_args; // (but don't count py::args
- if (func.has_kwargs) --num_args; // or py::kwargs)
- size_t pos_args = num_args - func.nargs_kw_only;
-
- if (!func.has_args && n_args_in > pos_args)
- continue; // Too many positional arguments for this overload
-
- if (n_args_in < pos_args && func.args.size() < pos_args)
- continue; // Not enough positional arguments given, and not enough defaults to fill in the blanks
-
- function_call call(func, parent);
-
- size_t args_to_copy = (std::min)(pos_args, n_args_in); // Protect std::min with parentheses
- size_t args_copied = 0;
-
- // 0. Inject new-style `self` argument
- if (func.is_new_style_constructor) {
- // The `value` may have been preallocated by an old-style `__init__`
- // if it was a preceding candidate for overload resolution.
- if (self_value_and_holder)
- self_value_and_holder.type->dealloc(self_value_and_holder);
-
- call.init_self = PyTuple_GET_ITEM(args_in, 0);
- call.args.emplace_back(reinterpret_cast<PyObject *>(&self_value_and_holder));
- call.args_convert.push_back(false);
- ++args_copied;
- }
-
- // 1. Copy any position arguments given.
- bool bad_arg = false;
- for (; args_copied < args_to_copy; ++args_copied) {
- const argument_record *arg_rec = args_copied < func.args.size() ? &func.args[args_copied] : nullptr;
- if (kwargs_in && arg_rec && arg_rec->name && PyDict_GetItemString(kwargs_in, arg_rec->name)) {
- bad_arg = true;
- break;
- }
-
- handle arg(PyTuple_GET_ITEM(args_in, args_copied));
- if (arg_rec && !arg_rec->none && arg.is_none()) {
- bad_arg = true;
- break;
- }
- call.args.push_back(arg);
- call.args_convert.push_back(arg_rec ? arg_rec->convert : true);
- }
- if (bad_arg)
- continue; // Maybe it was meant for another overload (issue #688)
-
- // We'll need to copy this if we steal some kwargs for defaults
- dict kwargs = reinterpret_borrow<dict>(kwargs_in);
-
- // 1.5. Fill in any missing pos_only args from defaults if they exist
- if (args_copied < func.nargs_pos_only) {
- for (; args_copied < func.nargs_pos_only; ++args_copied) {
- const auto &arg_rec = func.args[args_copied];
- handle value;
-
- if (arg_rec.value) {
- value = arg_rec.value;
- }
- if (value) {
- call.args.push_back(value);
- call.args_convert.push_back(arg_rec.convert);
- } else
- break;
- }
-
- if (args_copied < func.nargs_pos_only)
- continue; // Not enough defaults to fill the positional arguments
- }
-
- // 2. Check kwargs and, failing that, defaults that may help complete the list
- if (args_copied < num_args) {
- bool copied_kwargs = false;
-
- for (; args_copied < num_args; ++args_copied) {
- const auto &arg_rec = func.args[args_copied];
-
- handle value;
- if (kwargs_in && arg_rec.name)
- value = PyDict_GetItemString(kwargs.ptr(), arg_rec.name);
-
- if (value) {
- // Consume a kwargs value
- if (!copied_kwargs) {
- kwargs = reinterpret_steal<dict>(PyDict_Copy(kwargs.ptr()));
- copied_kwargs = true;
- }
- PyDict_DelItemString(kwargs.ptr(), arg_rec.name);
- } else if (arg_rec.value) {
- value = arg_rec.value;
- }
-
- if (!arg_rec.none && value.is_none()) {
- break;
- }
-
- if (value) {
- call.args.push_back(value);
- call.args_convert.push_back(arg_rec.convert);
- }
- else
- break;
- }
-
- if (args_copied < num_args)
- continue; // Not enough arguments, defaults, or kwargs to fill the positional arguments
- }
-
- // 3. Check everything was consumed (unless we have a kwargs arg)
- if (kwargs && !kwargs.empty() && !func.has_kwargs)
- continue; // Unconsumed kwargs, but no py::kwargs argument to accept them
-
- // 4a. If we have a py::args argument, create a new tuple with leftovers
- if (func.has_args) {
- tuple extra_args;
- if (args_to_copy == 0) {
- // We didn't copy out any position arguments from the args_in tuple, so we
- // can reuse it directly without copying:
- extra_args = reinterpret_borrow<tuple>(args_in);
- } else if (args_copied >= n_args_in) {
- extra_args = tuple(0);
- } else {
- size_t args_size = n_args_in - args_copied;
- extra_args = tuple(args_size);
- for (size_t i = 0; i < args_size; ++i) {
- extra_args[i] = PyTuple_GET_ITEM(args_in, args_copied + i);
- }
- }
- call.args.push_back(extra_args);
- call.args_convert.push_back(false);
- call.args_ref = std::move(extra_args);
- }
-
- // 4b. If we have a py::kwargs, pass on any remaining kwargs
- if (func.has_kwargs) {
- if (!kwargs.ptr())
- kwargs = dict(); // If we didn't get one, send an empty one
- call.args.push_back(kwargs);
- call.args_convert.push_back(false);
- call.kwargs_ref = std::move(kwargs);
- }
-
- // 5. Put everything in a vector. Not technically step 5, we've been building it
- // in `call.args` all along.
- #if !defined(NDEBUG)
- if (call.args.size() != func.nargs || call.args_convert.size() != func.nargs)
- pybind11_fail("Internal error: function call dispatcher inserted wrong number of arguments!");
- #endif
-
- std::vector<bool> second_pass_convert;
- if (overloaded) {
- // We're in the first no-convert pass, so swap out the conversion flags for a
- // set of all-false flags. If the call fails, we'll swap the flags back in for
- // the conversion-allowed call below.
- second_pass_convert.resize(func.nargs, false);
- call.args_convert.swap(second_pass_convert);
- }
-
- // 6. Call the function.
- try {
- loader_life_support guard{};
- result = func.impl(call);
- } catch (reference_cast_error &) {
- result = PYBIND11_TRY_NEXT_OVERLOAD;
- }
-
- if (result.ptr() != PYBIND11_TRY_NEXT_OVERLOAD)
- break;
-
- if (overloaded) {
- // The (overloaded) call failed; if the call has at least one argument that
- // permits conversion (i.e. it hasn't been explicitly specified `.noconvert()`)
- // then add this call to the list of second pass overloads to try.
- for (size_t i = func.is_method ? 1 : 0; i < pos_args; i++) {
- if (second_pass_convert[i]) {
- // Found one: swap the converting flags back in and store the call for
- // the second pass.
- call.args_convert.swap(second_pass_convert);
- second_pass.push_back(std::move(call));
- break;
- }
- }
- }
- }
-
- if (overloaded && !second_pass.empty() && result.ptr() == PYBIND11_TRY_NEXT_OVERLOAD) {
- // The no-conversion pass finished without success, try again with conversion allowed
- for (auto &call : second_pass) {
- try {
- loader_life_support guard{};
- result = call.func.impl(call);
- } catch (reference_cast_error &) {
- result = PYBIND11_TRY_NEXT_OVERLOAD;
- }
-
- if (result.ptr() != PYBIND11_TRY_NEXT_OVERLOAD) {
- // The error reporting logic below expects 'it' to be valid, as it would be
- // if we'd encountered this failure in the first-pass loop.
- if (!result)
- it = &call.func;
- break;
- }
- }
- }
- } catch (error_already_set &e) {
- e.restore();
- return nullptr;
-#ifdef __GLIBCXX__
- } catch ( abi::__forced_unwind& ) {
- throw;
-#endif
- } catch (...) {
- /* When an exception is caught, give each registered exception
- translator a chance to translate it to a Python exception
- in reverse order of registration.
-
- A translator may choose to do one of the following:
-
- - catch the exception and call PyErr_SetString or PyErr_SetObject
- to set a standard (or custom) Python exception, or
- - do nothing and let the exception fall through to the next translator, or
- - delegate translation to the next translator by throwing a new type of exception. */
-
- auto last_exception = std::current_exception();
- auto ®istered_exception_translators = get_internals().registered_exception_translators;
- for (auto& translator : registered_exception_translators) {
- try {
- translator(last_exception);
- } catch (...) {
- last_exception = std::current_exception();
- continue;
- }
- return nullptr;
- }
- PyErr_SetString(PyExc_SystemError, "Exception escaped from default exception translator!");
- return nullptr;
- }
-
- auto append_note_if_missing_header_is_suspected = [](std::string &msg) {
- if (msg.find("std::") != std::string::npos) {
- msg += "\n\n"
- "Did you forget to `#include <pybind11/stl.h>`? Or <pybind11/complex.h>,\n"
- "<pybind11/functional.h>, <pybind11/chrono.h>, etc. Some automatic\n"
- "conversions are optional and require extra headers to be included\n"
- "when compiling your pybind11 module.";
- }
- };
-
- if (result.ptr() == PYBIND11_TRY_NEXT_OVERLOAD) {
- if (overloads->is_operator)
- return handle(Py_NotImplemented).inc_ref().ptr();
-
- std::string msg = std::string(overloads->name) + "(): incompatible " +
- std::string(overloads->is_constructor ? "constructor" : "function") +
- " arguments. The following argument types are supported:\n";
-
- int ctr = 0;
- for (const function_record *it2 = overloads; it2 != nullptr; it2 = it2->next) {
- msg += " "+ std::to_string(++ctr) + ". ";
-
- bool wrote_sig = false;
- if (overloads->is_constructor) {
- // For a constructor, rewrite `(self: Object, arg0, ...) -> NoneType` as `Object(arg0, ...)`
- std::string sig = it2->signature;
- size_t start = sig.find('(') + 7; // skip "(self: "
- if (start < sig.size()) {
- // End at the , for the next argument
- size_t end = sig.find(", "), next = end + 2;
- size_t ret = sig.rfind(" -> ");
- // Or the ), if there is no comma:
- if (end >= sig.size()) next = end = sig.find(')');
- if (start < end && next < sig.size()) {
- msg.append(sig, start, end - start);
- msg += '(';
- msg.append(sig, next, ret - next);
- wrote_sig = true;
- }
- }
- }
- if (!wrote_sig) msg += it2->signature;
-
- msg += "\n";
- }
- msg += "\nInvoked with: ";
- auto args_ = reinterpret_borrow<tuple>(args_in);
- bool some_args = false;
- for (size_t ti = overloads->is_constructor ? 1 : 0; ti < args_.size(); ++ti) {
- if (!some_args) some_args = true;
- else msg += ", ";
- try {
- msg += pybind11::repr(args_[ti]);
- } catch (const error_already_set&) {
- msg += "<repr raised Error>";
- }
- }
- if (kwargs_in) {
- auto kwargs = reinterpret_borrow<dict>(kwargs_in);
- if (!kwargs.empty()) {
- if (some_args) msg += "; ";
- msg += "kwargs: ";
- bool first = true;
- for (auto kwarg : kwargs) {
- if (first) first = false;
- else msg += ", ";
- msg += pybind11::str("{}=").format(kwarg.first);
- try {
- msg += pybind11::repr(kwarg.second);
- } catch (const error_already_set&) {
- msg += "<repr raised Error>";
- }
- }
- }
- }
-
- append_note_if_missing_header_is_suspected(msg);
- PyErr_SetString(PyExc_TypeError, msg.c_str());
- return nullptr;
- } else if (!result) {
- std::string msg = "Unable to convert function return value to a "
- "Python type! The signature was\n\t";
- msg += it->signature;
- append_note_if_missing_header_is_suspected(msg);
- PyErr_SetString(PyExc_TypeError, msg.c_str());
- return nullptr;
- } else {
- if (overloads->is_constructor && !self_value_and_holder.holder_constructed()) {
- auto *pi = reinterpret_cast<instance *>(parent.ptr());
- self_value_and_holder.type->init_instance(pi, nullptr);
- }
- return result.ptr();
- }
- }
-};
-
-/// Wrapper for Python extension modules
-class module_ : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(module_, object, PyModule_Check)
-
- /// Create a new top-level Python module with the given name and docstring
- PYBIND11_DEPRECATED("Use PYBIND11_MODULE or module_::create_extension_module instead")
- explicit module_(const char *name, const char *doc = nullptr) {
-#if PY_MAJOR_VERSION >= 3
- *this = create_extension_module(name, doc, new PyModuleDef());
-#else
- *this = create_extension_module(name, doc, nullptr);
-#endif
- }
-
- /** \rst
- Create Python binding for a new function within the module scope. ``Func``
- can be a plain C++ function, a function pointer, or a lambda function. For
- details on the ``Extra&& ... extra`` argument, see section :ref:`extras`.
- \endrst */
- template <typename Func, typename... Extra>
- module_ &def(const char *name_, Func &&f, const Extra& ... extra) {
- cpp_function func(std::forward<Func>(f), name(name_), scope(*this),
- sibling(getattr(*this, name_, none())), extra...);
- // NB: allow overwriting here because cpp_function sets up a chain with the intention of
- // overwriting (and has already checked internally that it isn't overwriting non-functions).
- add_object(name_, func, true /* overwrite */);
- return *this;
- }
-
- /** \rst
- Create and return a new Python submodule with the given name and docstring.
- This also works recursively, i.e.
-
- .. code-block:: cpp
-
- py::module_ m("example", "pybind11 example plugin");
- py::module_ m2 = m.def_submodule("sub", "A submodule of 'example'");
- py::module_ m3 = m2.def_submodule("subsub", "A submodule of 'example.sub'");
- \endrst */
- module_ def_submodule(const char *name, const char *doc = nullptr) {
- std::string full_name = std::string(PyModule_GetName(m_ptr))
- + std::string(".") + std::string(name);
- auto result = reinterpret_borrow<module_>(PyImport_AddModule(full_name.c_str()));
- if (doc && options::show_user_defined_docstrings())
- result.attr("__doc__") = pybind11::str(doc);
- attr(name) = result;
- return result;
- }
-
- /// Import and return a module or throws `error_already_set`.
- static module_ import(const char *name) {
- PyObject *obj = PyImport_ImportModule(name);
- if (!obj)
- throw error_already_set();
- return reinterpret_steal<module_>(obj);
- }
-
- /// Reload the module or throws `error_already_set`.
- void reload() {
- PyObject *obj = PyImport_ReloadModule(ptr());
- if (!obj)
- throw error_already_set();
- *this = reinterpret_steal<module_>(obj);
- }
-
- /** \rst
- Adds an object to the module using the given name. Throws if an object with the given name
- already exists.
-
- ``overwrite`` should almost always be false: attempting to overwrite objects that pybind11 has
- established will, in most cases, break things.
- \endrst */
- PYBIND11_NOINLINE void add_object(const char *name, handle obj, bool overwrite = false) {
- if (!overwrite && hasattr(*this, name))
- pybind11_fail("Error during initialization: multiple incompatible definitions with name \"" +
- std::string(name) + "\"");
-
- PyModule_AddObject(ptr(), name, obj.inc_ref().ptr() /* steals a reference */);
- }
-
-#if PY_MAJOR_VERSION >= 3
- using module_def = PyModuleDef;
-#else
- struct module_def {};
-#endif
-
- /** \rst
- Create a new top-level module that can be used as the main module of a C extension.
-
- For Python 3, ``def`` should point to a staticly allocated module_def.
- For Python 2, ``def`` can be a nullptr and is completely ignored.
- \endrst */
- static module_ create_extension_module(const char *name, const char *doc, module_def *def) {
-#if PY_MAJOR_VERSION >= 3
- // module_def is PyModuleDef
- def = new (def) PyModuleDef { // Placement new (not an allocation).
- /* m_base */ PyModuleDef_HEAD_INIT,
- /* m_name */ name,
- /* m_doc */ options::show_user_defined_docstrings() ? doc : nullptr,
- /* m_size */ -1,
- /* m_methods */ nullptr,
- /* m_slots */ nullptr,
- /* m_traverse */ nullptr,
- /* m_clear */ nullptr,
- /* m_free */ nullptr
- };
- auto m = PyModule_Create(def);
-#else
- // Ignore module_def *def; only necessary for Python 3
- (void) def;
- auto m = Py_InitModule3(name, nullptr, options::show_user_defined_docstrings() ? doc : nullptr);
-#endif
- if (m == nullptr) {
- if (PyErr_Occurred())
- throw error_already_set();
- pybind11_fail("Internal error in module_::create_extension_module()");
- }
- // TODO: Sould be reinterpret_steal for Python 3, but Python also steals it again when returned from PyInit_...
- // For Python 2, reinterpret_borrow is correct.
- return reinterpret_borrow<module_>(m);
- }
-};
-
-// When inside a namespace (or anywhere as long as it's not the first item on a line),
-// C++20 allows "module" to be used. This is provided for backward compatibility, and for
-// simplicity, if someone wants to use py::module for example, that is perfectly safe.
-using module = module_;
-
-/// \ingroup python_builtins
-/// Return a dictionary representing the global variables in the current execution frame,
-/// or ``__main__.__dict__`` if there is no frame (usually when the interpreter is embedded).
-inline dict globals() {
- PyObject *p = PyEval_GetGlobals();
- return reinterpret_borrow<dict>(p ? p : module_::import("__main__").attr("__dict__").ptr());
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-/// Generic support for creating new Python heap types
-class generic_type : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(generic_type, object, PyType_Check)
-protected:
- void initialize(const type_record &rec) {
- if (rec.scope && hasattr(rec.scope, "__dict__") && rec.scope.attr("__dict__").contains(rec.name))
- pybind11_fail("generic_type: cannot initialize type \"" + std::string(rec.name) +
- "\": an object with that name is already defined");
-
- if (rec.module_local ? get_local_type_info(*rec.type) : get_global_type_info(*rec.type))
- pybind11_fail("generic_type: type \"" + std::string(rec.name) +
- "\" is already registered!");
-
- m_ptr = make_new_python_type(rec);
-
- /* Register supplemental type information in C++ dict */
- auto *tinfo = new detail::type_info();
- tinfo->type = (PyTypeObject *) m_ptr;
- tinfo->cpptype = rec.type;
- tinfo->type_size = rec.type_size;
- tinfo->type_align = rec.type_align;
- tinfo->operator_new = rec.operator_new;
- tinfo->holder_size_in_ptrs = size_in_ptrs(rec.holder_size);
- tinfo->init_instance = rec.init_instance;
- tinfo->dealloc = rec.dealloc;
- tinfo->simple_type = true;
- tinfo->simple_ancestors = true;
- tinfo->default_holder = rec.default_holder;
- tinfo->module_local = rec.module_local;
-
- auto &internals = get_internals();
- auto tindex = std::type_index(*rec.type);
- tinfo->direct_conversions = &internals.direct_conversions[tindex];
- if (rec.module_local)
- registered_local_types_cpp()[tindex] = tinfo;
- else
- internals.registered_types_cpp[tindex] = tinfo;
- internals.registered_types_py[(PyTypeObject *) m_ptr] = { tinfo };
-
- if (rec.bases.size() > 1 || rec.multiple_inheritance) {
- mark_parents_nonsimple(tinfo->type);
- tinfo->simple_ancestors = false;
- }
- else if (rec.bases.size() == 1) {
- auto parent_tinfo = get_type_info((PyTypeObject *) rec.bases[0].ptr());
- tinfo->simple_ancestors = parent_tinfo->simple_ancestors;
- }
-
- if (rec.module_local) {
- // Stash the local typeinfo and loader so that external modules can access it.
- tinfo->module_local_load = &type_caster_generic::local_load;
- setattr(m_ptr, PYBIND11_MODULE_LOCAL_ID, capsule(tinfo));
- }
- }
-
- /// Helper function which tags all parents of a type using mult. inheritance
- void mark_parents_nonsimple(PyTypeObject *value) {
- auto t = reinterpret_borrow<tuple>(value->tp_bases);
- for (handle h : t) {
- auto tinfo2 = get_type_info((PyTypeObject *) h.ptr());
- if (tinfo2)
- tinfo2->simple_type = false;
- mark_parents_nonsimple((PyTypeObject *) h.ptr());
- }
- }
-
- void install_buffer_funcs(
- buffer_info *(*get_buffer)(PyObject *, void *),
- void *get_buffer_data) {
- auto *type = (PyHeapTypeObject*) m_ptr;
- auto tinfo = detail::get_type_info(&type->ht_type);
-
- if (!type->ht_type.tp_as_buffer)
- pybind11_fail(
- "To be able to register buffer protocol support for the type '" +
- get_fully_qualified_tp_name(tinfo->type) +
- "' the associated class<>(..) invocation must "
- "include the pybind11::buffer_protocol() annotation!");
-
- tinfo->get_buffer = get_buffer;
- tinfo->get_buffer_data = get_buffer_data;
- }
-
- // rec_func must be set for either fget or fset.
- void def_property_static_impl(const char *name,
- handle fget, handle fset,
- detail::function_record *rec_func) {
- const auto is_static = rec_func && !(rec_func->is_method && rec_func->scope);
- const auto has_doc = rec_func && rec_func->doc && pybind11::options::show_user_defined_docstrings();
- auto property = handle((PyObject *) (is_static ? get_internals().static_property_type
- : &PyProperty_Type));
- attr(name) = property(fget.ptr() ? fget : none(),
- fset.ptr() ? fset : none(),
- /*deleter*/none(),
- pybind11::str(has_doc ? rec_func->doc : ""));
- }
-};
-
-/// Set the pointer to operator new if it exists. The cast is needed because it can be overloaded.
-template <typename T, typename = void_t<decltype(static_cast<void *(*)(size_t)>(T::operator new))>>
-void set_operator_new(type_record *r) { r->operator_new = &T::operator new; }
-
-template <typename> void set_operator_new(...) { }
-
-template <typename T, typename SFINAE = void> struct has_operator_delete : std::false_type { };
-template <typename T> struct has_operator_delete<T, void_t<decltype(static_cast<void (*)(void *)>(T::operator delete))>>
- : std::true_type { };
-template <typename T, typename SFINAE = void> struct has_operator_delete_size : std::false_type { };
-template <typename T> struct has_operator_delete_size<T, void_t<decltype(static_cast<void (*)(void *, size_t)>(T::operator delete))>>
- : std::true_type { };
-/// Call class-specific delete if it exists or global otherwise. Can also be an overload set.
-template <typename T, enable_if_t<has_operator_delete<T>::value, int> = 0>
-void call_operator_delete(T *p, size_t, size_t) { T::operator delete(p); }
-template <typename T, enable_if_t<!has_operator_delete<T>::value && has_operator_delete_size<T>::value, int> = 0>
-void call_operator_delete(T *p, size_t s, size_t) { T::operator delete(p, s); }
-
-inline void call_operator_delete(void *p, size_t s, size_t a) {
- (void)s; (void)a;
- #if defined(__cpp_aligned_new) && (!defined(_MSC_VER) || _MSC_VER >= 1912)
- if (a > __STDCPP_DEFAULT_NEW_ALIGNMENT__) {
- #ifdef __cpp_sized_deallocation
- ::operator delete(p, s, std::align_val_t(a));
- #else
- ::operator delete(p, std::align_val_t(a));
- #endif
- return;
- }
- #endif
- #ifdef __cpp_sized_deallocation
- ::operator delete(p, s);
- #else
- ::operator delete(p);
- #endif
-}
-
-inline void add_class_method(object& cls, const char *name_, const cpp_function &cf) {
- cls.attr(cf.name()) = cf;
- if (strcmp(name_, "__eq__") == 0 && !cls.attr("__dict__").contains("__hash__")) {
- cls.attr("__hash__") = none();
- }
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Given a pointer to a member function, cast it to its `Derived` version.
-/// Forward everything else unchanged.
-template <typename /*Derived*/, typename F>
-auto method_adaptor(F &&f) -> decltype(std::forward<F>(f)) { return std::forward<F>(f); }
-
-template <typename Derived, typename Return, typename Class, typename... Args>
-auto method_adaptor(Return (Class::*pmf)(Args...)) -> Return (Derived::*)(Args...) {
- static_assert(detail::is_accessible_base_of<Class, Derived>::value,
- "Cannot bind an inaccessible base class method; use a lambda definition instead");
- return pmf;
-}
-
-template <typename Derived, typename Return, typename Class, typename... Args>
-auto method_adaptor(Return (Class::*pmf)(Args...) const) -> Return (Derived::*)(Args...) const {
- static_assert(detail::is_accessible_base_of<Class, Derived>::value,
- "Cannot bind an inaccessible base class method; use a lambda definition instead");
- return pmf;
-}
-
-template <typename type_, typename... options>
-class class_ : public detail::generic_type {
- template <typename T> using is_holder = detail::is_holder_type<type_, T>;
- template <typename T> using is_subtype = detail::is_strict_base_of<type_, T>;
- template <typename T> using is_base = detail::is_strict_base_of<T, type_>;
- // struct instead of using here to help MSVC:
- template <typename T> struct is_valid_class_option :
- detail::any_of<is_holder<T>, is_subtype<T>, is_base<T>> {};
-
-public:
- using type = type_;
- using type_alias = detail::exactly_one_t<is_subtype, void, options...>;
- constexpr static bool has_alias = !std::is_void<type_alias>::value;
- using holder_type = detail::exactly_one_t<is_holder, std::unique_ptr<type>, options...>;
-
- static_assert(detail::all_of<is_valid_class_option<options>...>::value,
- "Unknown/invalid class_ template parameters provided");
-
- static_assert(!has_alias || std::is_polymorphic<type>::value,
- "Cannot use an alias class with a non-polymorphic type");
-
- PYBIND11_OBJECT(class_, generic_type, PyType_Check)
-
- template <typename... Extra>
- class_(handle scope, const char *name, const Extra &... extra) {
- using namespace detail;
-
- // MI can only be specified via class_ template options, not constructor parameters
- static_assert(
- none_of<is_pyobject<Extra>...>::value || // no base class arguments, or:
- ( constexpr_sum(is_pyobject<Extra>::value...) == 1 && // Exactly one base
- constexpr_sum(is_base<options>::value...) == 0 && // no template option bases
- none_of<std::is_same<multiple_inheritance, Extra>...>::value), // no multiple_inheritance attr
- "Error: multiple inheritance bases must be specified via class_ template options");
-
- type_record record;
- record.scope = scope;
- record.name = name;
- record.type = &typeid(type);
- record.type_size = sizeof(conditional_t<has_alias, type_alias, type>);
- record.type_align = alignof(conditional_t<has_alias, type_alias, type>&);
- record.holder_size = sizeof(holder_type);
- record.init_instance = init_instance;
- record.dealloc = dealloc;
- record.default_holder = detail::is_instantiation<std::unique_ptr, holder_type>::value;
-
- set_operator_new<type>(&record);
-
- /* Register base classes specified via template arguments to class_, if any */
- PYBIND11_EXPAND_SIDE_EFFECTS(add_base<options>(record));
-
- /* Process optional arguments, if any */
- process_attributes<Extra...>::init(extra..., &record);
-
- generic_type::initialize(record);
-
- if (has_alias) {
- auto &instances = record.module_local ? registered_local_types_cpp() : get_internals().registered_types_cpp;
- instances[std::type_index(typeid(type_alias))] = instances[std::type_index(typeid(type))];
- }
- }
-
- template <typename Base, detail::enable_if_t<is_base<Base>::value, int> = 0>
- static void add_base(detail::type_record &rec) {
- rec.add_base(typeid(Base), [](void *src) -> void * {
- return static_cast<Base *>(reinterpret_cast<type *>(src));
- });
- }
-
- template <typename Base, detail::enable_if_t<!is_base<Base>::value, int> = 0>
- static void add_base(detail::type_record &) { }
-
- template <typename Func, typename... Extra>
- class_ &def(const char *name_, Func&& f, const Extra&... extra) {
- cpp_function cf(method_adaptor<type>(std::forward<Func>(f)), name(name_), is_method(*this),
- sibling(getattr(*this, name_, none())), extra...);
- add_class_method(*this, name_, cf);
- return *this;
- }
-
- template <typename Func, typename... Extra> class_ &
- def_static(const char *name_, Func &&f, const Extra&... extra) {
- static_assert(!std::is_member_function_pointer<Func>::value,
- "def_static(...) called with a non-static member function pointer");
- cpp_function cf(std::forward<Func>(f), name(name_), scope(*this),
- sibling(getattr(*this, name_, none())), extra...);
- attr(cf.name()) = staticmethod(cf);
- return *this;
- }
-
- template <detail::op_id id, detail::op_type ot, typename L, typename R, typename... Extra>
- class_ &def(const detail::op_<id, ot, L, R> &op, const Extra&... extra) {
- op.execute(*this, extra...);
- return *this;
- }
-
- template <detail::op_id id, detail::op_type ot, typename L, typename R, typename... Extra>
- class_ & def_cast(const detail::op_<id, ot, L, R> &op, const Extra&... extra) {
- op.execute_cast(*this, extra...);
- return *this;
- }
-
- template <typename... Args, typename... Extra>
- class_ &def(const detail::initimpl::constructor<Args...> &init, const Extra&... extra) {
- init.execute(*this, extra...);
- return *this;
- }
-
- template <typename... Args, typename... Extra>
- class_ &def(const detail::initimpl::alias_constructor<Args...> &init, const Extra&... extra) {
- init.execute(*this, extra...);
- return *this;
- }
-
- template <typename... Args, typename... Extra>
- class_ &def(detail::initimpl::factory<Args...> &&init, const Extra&... extra) {
- std::move(init).execute(*this, extra...);
- return *this;
- }
-
- template <typename... Args, typename... Extra>
- class_ &def(detail::initimpl::pickle_factory<Args...> &&pf, const Extra &...extra) {
- std::move(pf).execute(*this, extra...);
- return *this;
- }
-
- template <typename Func> class_& def_buffer(Func &&func) {
- struct capture { Func func; };
- auto *ptr = new capture { std::forward<Func>(func) };
- install_buffer_funcs([](PyObject *obj, void *ptr) -> buffer_info* {
- detail::make_caster<type> caster;
- if (!caster.load(obj, false))
- return nullptr;
- return new buffer_info(((capture *) ptr)->func(caster));
- }, ptr);
- return *this;
- }
-
- template <typename Return, typename Class, typename... Args>
- class_ &def_buffer(Return (Class::*func)(Args...)) {
- return def_buffer([func] (type &obj) { return (obj.*func)(); });
- }
-
- template <typename Return, typename Class, typename... Args>
- class_ &def_buffer(Return (Class::*func)(Args...) const) {
- return def_buffer([func] (const type &obj) { return (obj.*func)(); });
- }
-
- template <typename C, typename D, typename... Extra>
- class_ &def_readwrite(const char *name, D C::*pm, const Extra&... extra) {
- static_assert(std::is_same<C, type>::value || std::is_base_of<C, type>::value, "def_readwrite() requires a class member (or base class member)");
- cpp_function fget([pm](const type &c) -> const D &{ return c.*pm; }, is_method(*this)),
- fset([pm](type &c, const D &value) { c.*pm = value; }, is_method(*this));
- def_property(name, fget, fset, return_value_policy::reference_internal, extra...);
- return *this;
- }
-
- template <typename C, typename D, typename... Extra>
- class_ &def_readonly(const char *name, const D C::*pm, const Extra& ...extra) {
- static_assert(std::is_same<C, type>::value || std::is_base_of<C, type>::value, "def_readonly() requires a class member (or base class member)");
- cpp_function fget([pm](const type &c) -> const D &{ return c.*pm; }, is_method(*this));
- def_property_readonly(name, fget, return_value_policy::reference_internal, extra...);
- return *this;
- }
-
- template <typename D, typename... Extra>
- class_ &def_readwrite_static(const char *name, D *pm, const Extra& ...extra) {
- cpp_function fget([pm](object) -> const D &{ return *pm; }, scope(*this)),
- fset([pm](object, const D &value) { *pm = value; }, scope(*this));
- def_property_static(name, fget, fset, return_value_policy::reference, extra...);
- return *this;
- }
-
- template <typename D, typename... Extra>
- class_ &def_readonly_static(const char *name, const D *pm, const Extra& ...extra) {
- cpp_function fget([pm](object) -> const D &{ return *pm; }, scope(*this));
- def_property_readonly_static(name, fget, return_value_policy::reference, extra...);
- return *this;
- }
-
- /// Uses return_value_policy::reference_internal by default
- template <typename Getter, typename... Extra>
- class_ &def_property_readonly(const char *name, const Getter &fget, const Extra& ...extra) {
- return def_property_readonly(name, cpp_function(method_adaptor<type>(fget)),
- return_value_policy::reference_internal, extra...);
- }
-
- /// Uses cpp_function's return_value_policy by default
- template <typename... Extra>
- class_ &def_property_readonly(const char *name, const cpp_function &fget, const Extra& ...extra) {
- return def_property(name, fget, nullptr, extra...);
- }
-
- /// Uses return_value_policy::reference by default
- template <typename Getter, typename... Extra>
- class_ &def_property_readonly_static(const char *name, const Getter &fget, const Extra& ...extra) {
- return def_property_readonly_static(name, cpp_function(fget), return_value_policy::reference, extra...);
- }
-
- /// Uses cpp_function's return_value_policy by default
- template <typename... Extra>
- class_ &def_property_readonly_static(const char *name, const cpp_function &fget, const Extra& ...extra) {
- return def_property_static(name, fget, nullptr, extra...);
- }
-
- /// Uses return_value_policy::reference_internal by default
- template <typename Getter, typename Setter, typename... Extra>
- class_ &def_property(const char *name, const Getter &fget, const Setter &fset, const Extra& ...extra) {
- return def_property(name, fget, cpp_function(method_adaptor<type>(fset)), extra...);
- }
- template <typename Getter, typename... Extra>
- class_ &def_property(const char *name, const Getter &fget, const cpp_function &fset, const Extra& ...extra) {
- return def_property(name, cpp_function(method_adaptor<type>(fget)), fset,
- return_value_policy::reference_internal, extra...);
- }
-
- /// Uses cpp_function's return_value_policy by default
- template <typename... Extra>
- class_ &def_property(const char *name, const cpp_function &fget, const cpp_function &fset, const Extra& ...extra) {
- return def_property_static(name, fget, fset, is_method(*this), extra...);
- }
-
- /// Uses return_value_policy::reference by default
- template <typename Getter, typename... Extra>
- class_ &def_property_static(const char *name, const Getter &fget, const cpp_function &fset, const Extra& ...extra) {
- return def_property_static(name, cpp_function(fget), fset, return_value_policy::reference, extra...);
- }
-
- /// Uses cpp_function's return_value_policy by default
- template <typename... Extra>
- class_ &def_property_static(const char *name, const cpp_function &fget, const cpp_function &fset, const Extra& ...extra) {
- static_assert( 0 == detail::constexpr_sum(std::is_base_of<arg, Extra>::value...),
- "Argument annotations are not allowed for properties");
- auto rec_fget = get_function_record(fget), rec_fset = get_function_record(fset);
- auto *rec_active = rec_fget;
- if (rec_fget) {
- char *doc_prev = rec_fget->doc; /* 'extra' field may include a property-specific documentation string */
- detail::process_attributes<Extra...>::init(extra..., rec_fget);
- if (rec_fget->doc && rec_fget->doc != doc_prev) {
- free(doc_prev);
- rec_fget->doc = strdup(rec_fget->doc);
- }
- }
- if (rec_fset) {
- char *doc_prev = rec_fset->doc;
- detail::process_attributes<Extra...>::init(extra..., rec_fset);
- if (rec_fset->doc && rec_fset->doc != doc_prev) {
- free(doc_prev);
- rec_fset->doc = strdup(rec_fset->doc);
- }
- if (! rec_active) rec_active = rec_fset;
- }
- def_property_static_impl(name, fget, fset, rec_active);
- return *this;
- }
-
-private:
- /// Initialize holder object, variant 1: object derives from enable_shared_from_this
- template <typename T>
- static void init_holder(detail::instance *inst, detail::value_and_holder &v_h,
- const holder_type * /* unused */, const std::enable_shared_from_this<T> * /* dummy */) {
- try {
- auto sh = std::dynamic_pointer_cast<typename holder_type::element_type>(
- v_h.value_ptr<type>()->shared_from_this());
- if (sh) {
- new (std::addressof(v_h.holder<holder_type>())) holder_type(std::move(sh));
- v_h.set_holder_constructed();
- }
- } catch (const std::bad_weak_ptr &) {}
-
- if (!v_h.holder_constructed() && inst->owned) {
- new (std::addressof(v_h.holder<holder_type>())) holder_type(v_h.value_ptr<type>());
- v_h.set_holder_constructed();
- }
- }
-
- static void init_holder_from_existing(const detail::value_and_holder &v_h,
- const holder_type *holder_ptr, std::true_type /*is_copy_constructible*/) {
- new (std::addressof(v_h.holder<holder_type>())) holder_type(*reinterpret_cast<const holder_type *>(holder_ptr));
- }
-
- static void init_holder_from_existing(const detail::value_and_holder &v_h,
- const holder_type *holder_ptr, std::false_type /*is_copy_constructible*/) {
- new (std::addressof(v_h.holder<holder_type>())) holder_type(std::move(*const_cast<holder_type *>(holder_ptr)));
- }
-
- /// Initialize holder object, variant 2: try to construct from existing holder object, if possible
- static void init_holder(detail::instance *inst, detail::value_and_holder &v_h,
- const holder_type *holder_ptr, const void * /* dummy -- not enable_shared_from_this<T>) */) {
- if (holder_ptr) {
- init_holder_from_existing(v_h, holder_ptr, std::is_copy_constructible<holder_type>());
- v_h.set_holder_constructed();
- } else if (inst->owned || detail::always_construct_holder<holder_type>::value) {
- new (std::addressof(v_h.holder<holder_type>())) holder_type(v_h.value_ptr<type>());
- v_h.set_holder_constructed();
- }
- }
-
- /// Performs instance initialization including constructing a holder and registering the known
- /// instance. Should be called as soon as the `type` value_ptr is set for an instance. Takes an
- /// optional pointer to an existing holder to use; if not specified and the instance is
- /// `.owned`, a new holder will be constructed to manage the value pointer.
- static void init_instance(detail::instance *inst, const void *holder_ptr) {
- auto v_h = inst->get_value_and_holder(detail::get_type_info(typeid(type)));
- if (!v_h.instance_registered()) {
- register_instance(inst, v_h.value_ptr(), v_h.type);
- v_h.set_instance_registered();
- }
- init_holder(inst, v_h, (const holder_type *) holder_ptr, v_h.value_ptr<type>());
- }
-
- /// Deallocates an instance; via holder, if constructed; otherwise via operator delete.
- static void dealloc(detail::value_and_holder &v_h) {
- // We could be deallocating because we are cleaning up after a Python exception.
- // If so, the Python error indicator will be set. We need to clear that before
- // running the destructor, in case the destructor code calls more Python.
- // If we don't, the Python API will exit with an exception, and pybind11 will
- // throw error_already_set from the C++ destructor which is forbidden and triggers
- // std::terminate().
- error_scope scope;
- if (v_h.holder_constructed()) {
- v_h.holder<holder_type>().~holder_type();
- v_h.set_holder_constructed(false);
- }
- else {
- detail::call_operator_delete(v_h.value_ptr<type>(),
- v_h.type->type_size,
- v_h.type->type_align
- );
- }
- v_h.value_ptr() = nullptr;
- }
-
- static detail::function_record *get_function_record(handle h) {
- h = detail::get_function(h);
- return h ? (detail::function_record *) reinterpret_borrow<capsule>(PyCFunction_GET_SELF(h.ptr()))
- : nullptr;
- }
-};
-
-/// Binds an existing constructor taking arguments Args...
-template <typename... Args> detail::initimpl::constructor<Args...> init() { return {}; }
-/// Like `init<Args...>()`, but the instance is always constructed through the alias class (even
-/// when not inheriting on the Python side).
-template <typename... Args> detail::initimpl::alias_constructor<Args...> init_alias() { return {}; }
-
-/// Binds a factory function as a constructor
-template <typename Func, typename Ret = detail::initimpl::factory<Func>>
-Ret init(Func &&f) { return {std::forward<Func>(f)}; }
-
-/// Dual-argument factory function: the first function is called when no alias is needed, the second
-/// when an alias is needed (i.e. due to python-side inheritance). Arguments must be identical.
-template <typename CFunc, typename AFunc, typename Ret = detail::initimpl::factory<CFunc, AFunc>>
-Ret init(CFunc &&c, AFunc &&a) {
- return {std::forward<CFunc>(c), std::forward<AFunc>(a)};
-}
-
-/// Binds pickling functions `__getstate__` and `__setstate__` and ensures that the type
-/// returned by `__getstate__` is the same as the argument accepted by `__setstate__`.
-template <typename GetState, typename SetState>
-detail::initimpl::pickle_factory<GetState, SetState> pickle(GetState &&g, SetState &&s) {
- return {std::forward<GetState>(g), std::forward<SetState>(s)};
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-inline str enum_name(handle arg) {
- dict entries = arg.get_type().attr("__entries");
- for (auto kv : entries) {
- if (handle(kv.second[int_(0)]).equal(arg))
- return pybind11::str(kv.first);
- }
- return "???";
-}
-
-struct enum_base {
- enum_base(handle base, handle parent) : m_base(base), m_parent(parent) { }
-
- PYBIND11_NOINLINE void init(bool is_arithmetic, bool is_convertible) {
- m_base.attr("__entries") = dict();
- auto property = handle((PyObject *) &PyProperty_Type);
- auto static_property = handle((PyObject *) get_internals().static_property_type);
-
- m_base.attr("__repr__") = cpp_function(
- [](object arg) -> str {
- handle type = type::handle_of(arg);
- object type_name = type.attr("__name__");
- return pybind11::str("<{}.{}: {}>").format(type_name, enum_name(arg), int_(arg));
- }, name("__repr__"), is_method(m_base)
- );
-
- m_base.attr("name") = property(cpp_function(&enum_name, name("name"), is_method(m_base)));
-
- m_base.attr("__str__") = cpp_function(
- [](handle arg) -> str {
- object type_name = type::handle_of(arg).attr("__name__");
- return pybind11::str("{}.{}").format(type_name, enum_name(arg));
- }, name("name"), is_method(m_base)
- );
-
- m_base.attr("__doc__") = static_property(cpp_function(
- [](handle arg) -> std::string {
- std::string docstring;
- dict entries = arg.attr("__entries");
- if (((PyTypeObject *) arg.ptr())->tp_doc)
- docstring += std::string(((PyTypeObject *) arg.ptr())->tp_doc) + "\n\n";
- docstring += "Members:";
- for (auto kv : entries) {
- auto key = std::string(pybind11::str(kv.first));
- auto comment = kv.second[int_(1)];
- docstring += "\n\n " + key;
- if (!comment.is_none())
- docstring += " : " + (std::string) pybind11::str(comment);
- }
- return docstring;
- }, name("__doc__")
- ), none(), none(), "");
-
- m_base.attr("__members__") = static_property(cpp_function(
- [](handle arg) -> dict {
- dict entries = arg.attr("__entries"), m;
- for (auto kv : entries)
- m[kv.first] = kv.second[int_(0)];
- return m;
- }, name("__members__")), none(), none(), ""
- );
-
- #define PYBIND11_ENUM_OP_STRICT(op, expr, strict_behavior) \
- m_base.attr(op) = cpp_function( \
- [](object a, object b) { \
- if (!type::handle_of(a).is(type::handle_of(b))) \
- strict_behavior; \
- return expr; \
- }, \
- name(op), is_method(m_base))
-
- #define PYBIND11_ENUM_OP_CONV(op, expr) \
- m_base.attr(op) = cpp_function( \
- [](object a_, object b_) { \
- int_ a(a_), b(b_); \
- return expr; \
- }, \
- name(op), is_method(m_base))
-
- #define PYBIND11_ENUM_OP_CONV_LHS(op, expr) \
- m_base.attr(op) = cpp_function( \
- [](object a_, object b) { \
- int_ a(a_); \
- return expr; \
- }, \
- name(op), is_method(m_base))
-
- if (is_convertible) {
- PYBIND11_ENUM_OP_CONV_LHS("__eq__", !b.is_none() && a.equal(b));
- PYBIND11_ENUM_OP_CONV_LHS("__ne__", b.is_none() || !a.equal(b));
-
- if (is_arithmetic) {
- PYBIND11_ENUM_OP_CONV("__lt__", a < b);
- PYBIND11_ENUM_OP_CONV("__gt__", a > b);
- PYBIND11_ENUM_OP_CONV("__le__", a <= b);
- PYBIND11_ENUM_OP_CONV("__ge__", a >= b);
- PYBIND11_ENUM_OP_CONV("__and__", a & b);
- PYBIND11_ENUM_OP_CONV("__rand__", a & b);
- PYBIND11_ENUM_OP_CONV("__or__", a | b);
- PYBIND11_ENUM_OP_CONV("__ror__", a | b);
- PYBIND11_ENUM_OP_CONV("__xor__", a ^ b);
- PYBIND11_ENUM_OP_CONV("__rxor__", a ^ b);
- m_base.attr("__invert__") = cpp_function(
- [](object arg) { return ~(int_(arg)); }, name("__invert__"), is_method(m_base));
- }
- } else {
- PYBIND11_ENUM_OP_STRICT("__eq__", int_(a).equal(int_(b)), return false);
- PYBIND11_ENUM_OP_STRICT("__ne__", !int_(a).equal(int_(b)), return true);
-
- if (is_arithmetic) {
- #define PYBIND11_THROW throw type_error("Expected an enumeration of matching type!");
- PYBIND11_ENUM_OP_STRICT("__lt__", int_(a) < int_(b), PYBIND11_THROW);
- PYBIND11_ENUM_OP_STRICT("__gt__", int_(a) > int_(b), PYBIND11_THROW);
- PYBIND11_ENUM_OP_STRICT("__le__", int_(a) <= int_(b), PYBIND11_THROW);
- PYBIND11_ENUM_OP_STRICT("__ge__", int_(a) >= int_(b), PYBIND11_THROW);
- #undef PYBIND11_THROW
- }
- }
-
- #undef PYBIND11_ENUM_OP_CONV_LHS
- #undef PYBIND11_ENUM_OP_CONV
- #undef PYBIND11_ENUM_OP_STRICT
-
- m_base.attr("__getstate__") = cpp_function(
- [](object arg) { return int_(arg); }, name("__getstate__"), is_method(m_base));
-
- m_base.attr("__hash__") = cpp_function(
- [](object arg) { return int_(arg); }, name("__hash__"), is_method(m_base));
- }
-
- PYBIND11_NOINLINE void value(char const* name_, object value, const char *doc = nullptr) {
- dict entries = m_base.attr("__entries");
- str name(name_);
- if (entries.contains(name)) {
- std::string type_name = (std::string) str(m_base.attr("__name__"));
- throw value_error(type_name + ": element \"" + std::string(name_) + "\" already exists!");
- }
-
- entries[name] = std::make_pair(value, doc);
- m_base.attr(name) = value;
- }
-
- PYBIND11_NOINLINE void export_values() {
- dict entries = m_base.attr("__entries");
- for (auto kv : entries)
- m_parent.attr(kv.first) = kv.second[int_(0)];
- }
-
- handle m_base;
- handle m_parent;
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Binds C++ enumerations and enumeration classes to Python
-template <typename Type> class enum_ : public class_<Type> {
-public:
- using Base = class_<Type>;
- using Base::def;
- using Base::attr;
- using Base::def_property_readonly;
- using Base::def_property_readonly_static;
- using Scalar = typename std::underlying_type<Type>::type;
-
- template <typename... Extra>
- enum_(const handle &scope, const char *name, const Extra&... extra)
- : class_<Type>(scope, name, extra...), m_base(*this, scope) {
- constexpr bool is_arithmetic = detail::any_of<std::is_same<arithmetic, Extra>...>::value;
- constexpr bool is_convertible = std::is_convertible<Type, Scalar>::value;
- m_base.init(is_arithmetic, is_convertible);
-
- def(init([](Scalar i) { return static_cast<Type>(i); }));
- def("__int__", [](Type value) { return (Scalar) value; });
- #if PY_MAJOR_VERSION < 3
- def("__long__", [](Type value) { return (Scalar) value; });
- #endif
- #if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 8)
- def("__index__", [](Type value) { return (Scalar) value; });
- #endif
-
- attr("__setstate__") = cpp_function(
- [](detail::value_and_holder &v_h, Scalar arg) {
- detail::initimpl::setstate<Base>(v_h, static_cast<Type>(arg),
- Py_TYPE(v_h.inst) != v_h.type->type); },
- detail::is_new_style_constructor(),
- pybind11::name("__setstate__"), is_method(*this));
- }
-
- /// Export enumeration entries into the parent scope
- enum_& export_values() {
- m_base.export_values();
- return *this;
- }
-
- /// Add an enumeration entry
- enum_& value(char const* name, Type value, const char *doc = nullptr) {
- m_base.value(name, pybind11::cast(value, return_value_policy::copy), doc);
- return *this;
- }
-
-private:
- detail::enum_base m_base;
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-
-inline void keep_alive_impl(handle nurse, handle patient) {
- if (!nurse || !patient)
- pybind11_fail("Could not activate keep_alive!");
-
- if (patient.is_none() || nurse.is_none())
- return; /* Nothing to keep alive or nothing to be kept alive by */
-
- auto tinfo = all_type_info(Py_TYPE(nurse.ptr()));
- if (!tinfo.empty()) {
- /* It's a pybind-registered type, so we can store the patient in the
- * internal list. */
- add_patient(nurse.ptr(), patient.ptr());
- }
- else {
- /* Fall back to clever approach based on weak references taken from
- * Boost.Python. This is not used for pybind-registered types because
- * the objects can be destroyed out-of-order in a GC pass. */
- cpp_function disable_lifesupport(
- [patient](handle weakref) { patient.dec_ref(); weakref.dec_ref(); });
-
- weakref wr(nurse, disable_lifesupport);
-
- patient.inc_ref(); /* reference patient and leak the weak reference */
- (void) wr.release();
- }
-}
-
-PYBIND11_NOINLINE inline void keep_alive_impl(size_t Nurse, size_t Patient, function_call &call, handle ret) {
- auto get_arg = [&](size_t n) {
- if (n == 0)
- return ret;
- else if (n == 1 && call.init_self)
- return call.init_self;
- else if (n <= call.args.size())
- return call.args[n - 1];
- return handle();
- };
-
- keep_alive_impl(get_arg(Nurse), get_arg(Patient));
-}
-
-inline std::pair<decltype(internals::registered_types_py)::iterator, bool> all_type_info_get_cache(PyTypeObject *type) {
- auto res = get_internals().registered_types_py
-#ifdef __cpp_lib_unordered_map_try_emplace
- .try_emplace(type);
-#else
- .emplace(type, std::vector<detail::type_info *>());
-#endif
- if (res.second) {
- // New cache entry created; set up a weak reference to automatically remove it if the type
- // gets destroyed:
- weakref((PyObject *) type, cpp_function([type](handle wr) {
- get_internals().registered_types_py.erase(type);
- wr.dec_ref();
- })).release();
- }
-
- return res;
-}
-
-template <typename Iterator, typename Sentinel, bool KeyIterator, return_value_policy Policy>
-struct iterator_state {
- Iterator it;
- Sentinel end;
- bool first_or_done;
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Makes a python iterator from a first and past-the-end C++ InputIterator.
-template <return_value_policy Policy = return_value_policy::reference_internal,
- typename Iterator,
- typename Sentinel,
- typename ValueType = decltype(*std::declval<Iterator>()),
- typename... Extra>
-iterator make_iterator(Iterator first, Sentinel last, Extra &&... extra) {
- typedef detail::iterator_state<Iterator, Sentinel, false, Policy> state;
-
- if (!detail::get_type_info(typeid(state), false)) {
- class_<state>(handle(), "iterator", pybind11::module_local())
- .def("__iter__", [](state &s) -> state& { return s; })
- .def("__next__", [](state &s) -> ValueType {
- if (!s.first_or_done)
- ++s.it;
- else
- s.first_or_done = false;
- if (s.it == s.end) {
- s.first_or_done = true;
- throw stop_iteration();
- }
- return *s.it;
- }, std::forward<Extra>(extra)..., Policy);
- }
-
- return cast(state{first, last, true});
-}
-
-/// Makes an python iterator over the keys (`.first`) of a iterator over pairs from a
-/// first and past-the-end InputIterator.
-template <return_value_policy Policy = return_value_policy::reference_internal,
- typename Iterator,
- typename Sentinel,
- typename KeyType = decltype((*std::declval<Iterator>()).first),
- typename... Extra>
-iterator make_key_iterator(Iterator first, Sentinel last, Extra &&... extra) {
- using state = detail::iterator_state<Iterator, Sentinel, true, Policy>;
-
- if (!detail::get_type_info(typeid(state), false)) {
- class_<state>(handle(), "iterator", pybind11::module_local())
- .def("__iter__", [](state &s) -> state& { return s; })
- .def("__next__", [](state &s) -> KeyType {
- if (!s.first_or_done)
- ++s.it;
- else
- s.first_or_done = false;
- if (s.it == s.end) {
- s.first_or_done = true;
- throw stop_iteration();
- }
- return (*s.it).first;
- }, std::forward<Extra>(extra)..., Policy);
- }
-
- return cast(state{first, last, true});
-}
-
-/// Makes an iterator over values of an stl container or other container supporting
-/// `std::begin()`/`std::end()`
-template <return_value_policy Policy = return_value_policy::reference_internal,
- typename Type, typename... Extra> iterator make_iterator(Type &value, Extra&&... extra) {
- return make_iterator<Policy>(std::begin(value), std::end(value), extra...);
-}
-
-/// Makes an iterator over the keys (`.first`) of a stl map-like container supporting
-/// `std::begin()`/`std::end()`
-template <return_value_policy Policy = return_value_policy::reference_internal,
- typename Type, typename... Extra> iterator make_key_iterator(Type &value, Extra&&... extra) {
- return make_key_iterator<Policy>(std::begin(value), std::end(value), extra...);
-}
-
-template <typename InputType, typename OutputType> void implicitly_convertible() {
- struct set_flag {
- bool &flag;
- set_flag(bool &flag) : flag(flag) { flag = true; }
- ~set_flag() { flag = false; }
- };
- auto implicit_caster = [](PyObject *obj, PyTypeObject *type) -> PyObject * {
- static bool currently_used = false;
- if (currently_used) // implicit conversions are non-reentrant
- return nullptr;
- set_flag flag_helper(currently_used);
- if (!detail::make_caster<InputType>().load(obj, false))
- return nullptr;
- tuple args(1);
- args[0] = obj;
- PyObject *result = PyObject_Call((PyObject *) type, args.ptr(), nullptr);
- if (result == nullptr)
- PyErr_Clear();
- return result;
- };
-
- if (auto tinfo = detail::get_type_info(typeid(OutputType)))
- tinfo->implicit_conversions.push_back(implicit_caster);
- else
- pybind11_fail("implicitly_convertible: Unable to find type " + type_id<OutputType>());
-}
-
-template <typename ExceptionTranslator>
-void register_exception_translator(ExceptionTranslator&& translator) {
- detail::get_internals().registered_exception_translators.push_front(
- std::forward<ExceptionTranslator>(translator));
-}
-
-/**
- * Wrapper to generate a new Python exception type.
- *
- * This should only be used with PyErr_SetString for now.
- * It is not (yet) possible to use as a py::base.
- * Template type argument is reserved for future use.
- */
-template <typename type>
-class exception : public object {
-public:
- exception() = default;
- exception(handle scope, const char *name, handle base = PyExc_Exception) {
- std::string full_name = scope.attr("__name__").cast<std::string>() +
- std::string(".") + name;
- m_ptr = PyErr_NewException(const_cast<char *>(full_name.c_str()), base.ptr(), NULL);
- if (hasattr(scope, "__dict__") && scope.attr("__dict__").contains(name))
- pybind11_fail("Error during initialization: multiple incompatible "
- "definitions with name \"" + std::string(name) + "\"");
- scope.attr(name) = *this;
- }
-
- // Sets the current python exception to this exception object with the given message
- void operator()(const char *message) {
- PyErr_SetString(m_ptr, message);
- }
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-// Returns a reference to a function-local static exception object used in the simple
-// register_exception approach below. (It would be simpler to have the static local variable
-// directly in register_exception, but that makes clang <3.5 segfault - issue #1349).
-template <typename CppException>
-exception<CppException> &get_exception_object() { static exception<CppException> ex; return ex; }
-PYBIND11_NAMESPACE_END(detail)
-
-/**
- * Registers a Python exception in `m` of the given `name` and installs an exception translator to
- * translate the C++ exception to the created Python exception using the exceptions what() method.
- * This is intended for simple exception translations; for more complex translation, register the
- * exception object and translator directly.
- */
-template <typename CppException>
-exception<CppException> ®ister_exception(handle scope,
- const char *name,
- handle base = PyExc_Exception) {
- auto &ex = detail::get_exception_object<CppException>();
- if (!ex) ex = exception<CppException>(scope, name, base);
-
- register_exception_translator([](std::exception_ptr p) {
- if (!p) return;
- try {
- std::rethrow_exception(p);
- } catch (const CppException &e) {
- detail::get_exception_object<CppException>()(e.what());
- }
- });
- return ex;
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-PYBIND11_NOINLINE inline void print(tuple args, dict kwargs) {
- auto strings = tuple(args.size());
- for (size_t i = 0; i < args.size(); ++i) {
- strings[i] = str(args[i]);
- }
- auto sep = kwargs.contains("sep") ? kwargs["sep"] : cast(" ");
- auto line = sep.attr("join")(strings);
-
- object file;
- if (kwargs.contains("file")) {
- file = kwargs["file"].cast<object>();
- } else {
- try {
- file = module_::import("sys").attr("stdout");
- } catch (const error_already_set &) {
- /* If print() is called from code that is executed as
- part of garbage collection during interpreter shutdown,
- importing 'sys' can fail. Give up rather than crashing the
- interpreter in this case. */
- return;
- }
- }
-
- auto write = file.attr("write");
- write(line);
- write(kwargs.contains("end") ? kwargs["end"] : cast("\n"));
-
- if (kwargs.contains("flush") && kwargs["flush"].cast<bool>())
- file.attr("flush")();
-}
-PYBIND11_NAMESPACE_END(detail)
-
-template <return_value_policy policy = return_value_policy::automatic_reference, typename... Args>
-void print(Args &&...args) {
- auto c = detail::collect_arguments<policy>(std::forward<Args>(args)...);
- detail::print(c.args(), c.kwargs());
-}
-
-#if defined(WITH_THREAD) && !defined(PYPY_VERSION)
-
-/* The functions below essentially reproduce the PyGILState_* API using a RAII
- * pattern, but there are a few important differences:
- *
- * 1. When acquiring the GIL from an non-main thread during the finalization
- * phase, the GILState API blindly terminates the calling thread, which
- * is often not what is wanted. This API does not do this.
- *
- * 2. The gil_scoped_release function can optionally cut the relationship
- * of a PyThreadState and its associated thread, which allows moving it to
- * another thread (this is a fairly rare/advanced use case).
- *
- * 3. The reference count of an acquired thread state can be controlled. This
- * can be handy to prevent cases where callbacks issued from an external
- * thread would otherwise constantly construct and destroy thread state data
- * structures.
- *
- * See the Python bindings of NanoGUI (http://github.com/wjakob/nanogui) for an
- * example which uses features 2 and 3 to migrate the Python thread of
- * execution to another thread (to run the event loop on the original thread,
- * in this case).
- */
-
-class gil_scoped_acquire {
-public:
- PYBIND11_NOINLINE gil_scoped_acquire() {
- auto const &internals = detail::get_internals();
- tstate = (PyThreadState *) PYBIND11_TLS_GET_VALUE(internals.tstate);
-
- if (!tstate) {
- /* Check if the GIL was acquired using the PyGILState_* API instead (e.g. if
- calling from a Python thread). Since we use a different key, this ensures
- we don't create a new thread state and deadlock in PyEval_AcquireThread
- below. Note we don't save this state with internals.tstate, since we don't
- create it we would fail to clear it (its reference count should be > 0). */
- tstate = PyGILState_GetThisThreadState();
- }
-
- if (!tstate) {
- tstate = PyThreadState_New(internals.istate);
- #if !defined(NDEBUG)
- if (!tstate)
- pybind11_fail("scoped_acquire: could not create thread state!");
- #endif
- tstate->gilstate_counter = 0;
- PYBIND11_TLS_REPLACE_VALUE(internals.tstate, tstate);
- } else {
- release = detail::get_thread_state_unchecked() != tstate;
- }
-
- if (release) {
- /* Work around an annoying assertion in PyThreadState_Swap */
- #if defined(Py_DEBUG)
- PyInterpreterState *interp = tstate->interp;
- tstate->interp = nullptr;
- #endif
- PyEval_AcquireThread(tstate);
- #if defined(Py_DEBUG)
- tstate->interp = interp;
- #endif
- }
-
- inc_ref();
- }
-
- void inc_ref() {
- ++tstate->gilstate_counter;
- }
-
- PYBIND11_NOINLINE void dec_ref() {
- --tstate->gilstate_counter;
- #if !defined(NDEBUG)
- if (detail::get_thread_state_unchecked() != tstate)
- pybind11_fail("scoped_acquire::dec_ref(): thread state must be current!");
- if (tstate->gilstate_counter < 0)
- pybind11_fail("scoped_acquire::dec_ref(): reference count underflow!");
- #endif
- if (tstate->gilstate_counter == 0) {
- #if !defined(NDEBUG)
- if (!release)
- pybind11_fail("scoped_acquire::dec_ref(): internal error!");
- #endif
- PyThreadState_Clear(tstate);
- PyThreadState_DeleteCurrent();
- PYBIND11_TLS_DELETE_VALUE(detail::get_internals().tstate);
- release = false;
- }
- }
-
- PYBIND11_NOINLINE ~gil_scoped_acquire() {
- dec_ref();
- if (release)
- PyEval_SaveThread();
- }
-private:
- PyThreadState *tstate = nullptr;
- bool release = true;
-};
-
-class gil_scoped_release {
-public:
- explicit gil_scoped_release(bool disassoc = false) : disassoc(disassoc) {
- // `get_internals()` must be called here unconditionally in order to initialize
- // `internals.tstate` for subsequent `gil_scoped_acquire` calls. Otherwise, an
- // initialization race could occur as multiple threads try `gil_scoped_acquire`.
- const auto &internals = detail::get_internals();
- tstate = PyEval_SaveThread();
- if (disassoc) {
- auto key = internals.tstate;
- PYBIND11_TLS_DELETE_VALUE(key);
- }
- }
- ~gil_scoped_release() {
- if (!tstate)
- return;
- PyEval_RestoreThread(tstate);
- if (disassoc) {
- auto key = detail::get_internals().tstate;
- PYBIND11_TLS_REPLACE_VALUE(key, tstate);
- }
- }
-private:
- PyThreadState *tstate;
- bool disassoc;
-};
-#elif defined(PYPY_VERSION)
-class gil_scoped_acquire {
- PyGILState_STATE state;
-public:
- gil_scoped_acquire() { state = PyGILState_Ensure(); }
- ~gil_scoped_acquire() { PyGILState_Release(state); }
-};
-
-class gil_scoped_release {
- PyThreadState *state;
-public:
- gil_scoped_release() { state = PyEval_SaveThread(); }
- ~gil_scoped_release() { PyEval_RestoreThread(state); }
-};
-#else
-class gil_scoped_acquire { };
-class gil_scoped_release { };
-#endif
-
-error_already_set::~error_already_set() {
- if (m_type) {
- gil_scoped_acquire gil;
- error_scope scope;
- m_type.release().dec_ref();
- m_value.release().dec_ref();
- m_trace.release().dec_ref();
- }
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-inline function get_type_override(const void *this_ptr, const type_info *this_type, const char *name) {
- handle self = get_object_handle(this_ptr, this_type);
- if (!self)
- return function();
- handle type = type::handle_of(self);
- auto key = std::make_pair(type.ptr(), name);
-
- /* Cache functions that aren't overridden in Python to avoid
- many costly Python dictionary lookups below */
- auto &cache = get_internals().inactive_override_cache;
- if (cache.find(key) != cache.end())
- return function();
-
- function override = getattr(self, name, function());
- if (override.is_cpp_function()) {
- cache.insert(key);
- return function();
- }
-
- /* Don't call dispatch code if invoked from overridden function.
- Unfortunately this doesn't work on PyPy. */
-#if !defined(PYPY_VERSION)
- PyFrameObject *frame = PyThreadState_Get()->frame;
- if (frame && (std::string) str(frame->f_code->co_name) == name &&
- frame->f_code->co_argcount > 0) {
- PyFrame_FastToLocals(frame);
- PyObject *self_caller = PyDict_GetItem(
- frame->f_locals, PyTuple_GET_ITEM(frame->f_code->co_varnames, 0));
- if (self_caller == self.ptr())
- return function();
- }
-#else
- /* PyPy currently doesn't provide a detailed cpyext emulation of
- frame objects, so we have to emulate this using Python. This
- is going to be slow..*/
- dict d; d["self"] = self; d["name"] = pybind11::str(name);
- PyObject *result = PyRun_String(
- "import inspect\n"
- "frame = inspect.currentframe()\n"
- "if frame is not None:\n"
- " frame = frame.f_back\n"
- " if frame is not None and str(frame.f_code.co_name) == name and "
- "frame.f_code.co_argcount > 0:\n"
- " self_caller = frame.f_locals[frame.f_code.co_varnames[0]]\n"
- " if self_caller == self:\n"
- " self = None\n",
- Py_file_input, d.ptr(), d.ptr());
- if (result == nullptr)
- throw error_already_set();
- if (d["self"].is_none())
- return function();
- Py_DECREF(result);
-#endif
-
- return override;
-}
-PYBIND11_NAMESPACE_END(detail)
-
-/** \rst
- Try to retrieve a python method by the provided name from the instance pointed to by the this_ptr.
-
- :this_ptr: The pointer to the object the overriden method should be retrieved for. This should be
- the first non-trampoline class encountered in the inheritance chain.
- :name: The name of the overridden Python method to retrieve.
- :return: The Python method by this name from the object or an empty function wrapper.
- \endrst */
-template <class T> function get_override(const T *this_ptr, const char *name) {
- auto tinfo = detail::get_type_info(typeid(T));
- return tinfo ? detail::get_type_override(this_ptr, tinfo, name) : function();
-}
-
-#define PYBIND11_OVERRIDE_IMPL(ret_type, cname, name, ...) \
- do { \
- pybind11::gil_scoped_acquire gil; \
- pybind11::function override = pybind11::get_override(static_cast<const cname *>(this), name); \
- if (override) { \
- auto o = override(__VA_ARGS__); \
- if (pybind11::detail::cast_is_temporary_value_reference<ret_type>::value) { \
- static pybind11::detail::override_caster_t<ret_type> caster; \
- return pybind11::detail::cast_ref<ret_type>(std::move(o), caster); \
- } \
- else return pybind11::detail::cast_safe<ret_type>(std::move(o)); \
- } \
- } while (false)
-
-/** \rst
- Macro to populate the virtual method in the trampoline class. This macro tries to look up a method named 'fn'
- from the Python side, deals with the :ref:`gil` and necessary argument conversions to call this method and return
- the appropriate type. See :ref:`overriding_virtuals` for more information. This macro should be used when the method
- name in C is not the same as the method name in Python. For example with `__str__`.
-
- .. code-block:: cpp
-
- std::string toString() override {
- PYBIND11_OVERRIDE_NAME(
- std::string, // Return type (ret_type)
- Animal, // Parent class (cname)
- "__str__", // Name of method in Python (name)
- toString, // Name of function in C++ (fn)
- );
- }
-\endrst */
-#define PYBIND11_OVERRIDE_NAME(ret_type, cname, name, fn, ...) \
- do { \
- PYBIND11_OVERRIDE_IMPL(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, __VA_ARGS__); \
- return cname::fn(__VA_ARGS__); \
- } while (false)
-
-/** \rst
- Macro for pure virtual functions, this function is identical to :c:macro:`PYBIND11_OVERRIDE_NAME`, except that it
- throws if no override can be found.
-\endrst */
-#define PYBIND11_OVERRIDE_PURE_NAME(ret_type, cname, name, fn, ...) \
- do { \
- PYBIND11_OVERRIDE_IMPL(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, __VA_ARGS__); \
- pybind11::pybind11_fail("Tried to call pure virtual function \"" PYBIND11_STRINGIFY(cname) "::" name "\""); \
- } while (false)
-
-/** \rst
- Macro to populate the virtual method in the trampoline class. This macro tries to look up the method
- from the Python side, deals with the :ref:`gil` and necessary argument conversions to call this method and return
- the appropriate type. This macro should be used if the method name in C and in Python are identical.
- See :ref:`overriding_virtuals` for more information.
-
- .. code-block:: cpp
-
- class PyAnimal : public Animal {
- public:
- // Inherit the constructors
- using Animal::Animal;
-
- // Trampoline (need one for each virtual function)
- std::string go(int n_times) override {
- PYBIND11_OVERRIDE_PURE(
- std::string, // Return type (ret_type)
- Animal, // Parent class (cname)
- go, // Name of function in C++ (must match Python name) (fn)
- n_times // Argument(s) (...)
- );
- }
- };
-\endrst */
-#define PYBIND11_OVERRIDE(ret_type, cname, fn, ...) \
- PYBIND11_OVERRIDE_NAME(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), #fn, fn, __VA_ARGS__)
-
-/** \rst
- Macro for pure virtual functions, this function is identical to :c:macro:`PYBIND11_OVERRIDE`, except that it throws
- if no override can be found.
-\endrst */
-#define PYBIND11_OVERRIDE_PURE(ret_type, cname, fn, ...) \
- PYBIND11_OVERRIDE_PURE_NAME(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), #fn, fn, __VA_ARGS__)
-
-
-// Deprecated versions
-
-PYBIND11_DEPRECATED("get_type_overload has been deprecated")
-inline function get_type_overload(const void *this_ptr, const detail::type_info *this_type, const char *name) {
- return detail::get_type_override(this_ptr, this_type, name);
-}
-
-template <class T>
-inline function get_overload(const T *this_ptr, const char *name) {
- return get_override(this_ptr, name);
-}
-
-#define PYBIND11_OVERLOAD_INT(ret_type, cname, name, ...) \
- PYBIND11_OVERRIDE_IMPL(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, __VA_ARGS__)
-#define PYBIND11_OVERLOAD_NAME(ret_type, cname, name, fn, ...) \
- PYBIND11_OVERRIDE_NAME(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, fn, __VA_ARGS__)
-#define PYBIND11_OVERLOAD_PURE_NAME(ret_type, cname, name, fn, ...) \
- PYBIND11_OVERRIDE_PURE_NAME(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, fn, __VA_ARGS__);
-#define PYBIND11_OVERLOAD(ret_type, cname, fn, ...) \
- PYBIND11_OVERRIDE(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), fn, __VA_ARGS__)
-#define PYBIND11_OVERLOAD_PURE(ret_type, cname, fn, ...) \
- PYBIND11_OVERRIDE_PURE(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), fn, __VA_ARGS__);
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-# pragma warning(pop)
-#elif defined(__GNUG__) && !defined(__clang__)
-# pragma GCC diagnostic pop
-#endif
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/pytypes.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/pytypes.h
deleted file mode 100644
index 1010ad713cd29ef05aed3ae5fd92c36b6f73a8d9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/pytypes.h
+++ /dev/null
@@ -1,1659 +0,0 @@
-/*
- pybind11/pytypes.h: Convenience wrapper classes for basic Python types
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-#include "buffer_info.h"
-#include <utility>
-#include <type_traits>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-/* A few forward declarations */
-class handle; class object;
-class str; class iterator;
-class type;
-struct arg; struct arg_v;
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-class args_proxy;
-inline bool isinstance_generic(handle obj, const std::type_info &tp);
-
-// Accessor forward declarations
-template <typename Policy> class accessor;
-namespace accessor_policies {
- struct obj_attr;
- struct str_attr;
- struct generic_item;
- struct sequence_item;
- struct list_item;
- struct tuple_item;
-} // namespace accessor_policies
-using obj_attr_accessor = accessor<accessor_policies::obj_attr>;
-using str_attr_accessor = accessor<accessor_policies::str_attr>;
-using item_accessor = accessor<accessor_policies::generic_item>;
-using sequence_accessor = accessor<accessor_policies::sequence_item>;
-using list_accessor = accessor<accessor_policies::list_item>;
-using tuple_accessor = accessor<accessor_policies::tuple_item>;
-
-/// Tag and check to identify a class which implements the Python object API
-class pyobject_tag { };
-template <typename T> using is_pyobject = std::is_base_of<pyobject_tag, remove_reference_t<T>>;
-
-/** \rst
- A mixin class which adds common functions to `handle`, `object` and various accessors.
- The only requirement for `Derived` is to implement ``PyObject *Derived::ptr() const``.
-\endrst */
-template <typename Derived>
-class object_api : public pyobject_tag {
- const Derived &derived() const { return static_cast<const Derived &>(*this); }
-
-public:
- /** \rst
- Return an iterator equivalent to calling ``iter()`` in Python. The object
- must be a collection which supports the iteration protocol.
- \endrst */
- iterator begin() const;
- /// Return a sentinel which ends iteration.
- iterator end() const;
-
- /** \rst
- Return an internal functor to invoke the object's sequence protocol. Casting
- the returned ``detail::item_accessor`` instance to a `handle` or `object`
- subclass causes a corresponding call to ``__getitem__``. Assigning a `handle`
- or `object` subclass causes a call to ``__setitem__``.
- \endrst */
- item_accessor operator[](handle key) const;
- /// See above (the only difference is that they key is provided as a string literal)
- item_accessor operator[](const char *key) const;
-
- /** \rst
- Return an internal functor to access the object's attributes. Casting the
- returned ``detail::obj_attr_accessor`` instance to a `handle` or `object`
- subclass causes a corresponding call to ``getattr``. Assigning a `handle`
- or `object` subclass causes a call to ``setattr``.
- \endrst */
- obj_attr_accessor attr(handle key) const;
- /// See above (the only difference is that they key is provided as a string literal)
- str_attr_accessor attr(const char *key) const;
-
- /** \rst
- Matches * unpacking in Python, e.g. to unpack arguments out of a ``tuple``
- or ``list`` for a function call. Applying another * to the result yields
- ** unpacking, e.g. to unpack a dict as function keyword arguments.
- See :ref:`calling_python_functions`.
- \endrst */
- args_proxy operator*() const;
-
- /// Check if the given item is contained within this object, i.e. ``item in obj``.
- template <typename T> bool contains(T &&item) const;
-
- /** \rst
- Assuming the Python object is a function or implements the ``__call__``
- protocol, ``operator()`` invokes the underlying function, passing an
- arbitrary set of parameters. The result is returned as a `object` and
- may need to be converted back into a Python object using `handle::cast()`.
-
- When some of the arguments cannot be converted to Python objects, the
- function will throw a `cast_error` exception. When the Python function
- call fails, a `error_already_set` exception is thrown.
- \endrst */
- template <return_value_policy policy = return_value_policy::automatic_reference, typename... Args>
- object operator()(Args &&...args) const;
- template <return_value_policy policy = return_value_policy::automatic_reference, typename... Args>
- PYBIND11_DEPRECATED("call(...) was deprecated in favor of operator()(...)")
- object call(Args&&... args) const;
-
- /// Equivalent to ``obj is other`` in Python.
- bool is(object_api const& other) const { return derived().ptr() == other.derived().ptr(); }
- /// Equivalent to ``obj is None`` in Python.
- bool is_none() const { return derived().ptr() == Py_None; }
- /// Equivalent to obj == other in Python
- bool equal(object_api const &other) const { return rich_compare(other, Py_EQ); }
- bool not_equal(object_api const &other) const { return rich_compare(other, Py_NE); }
- bool operator<(object_api const &other) const { return rich_compare(other, Py_LT); }
- bool operator<=(object_api const &other) const { return rich_compare(other, Py_LE); }
- bool operator>(object_api const &other) const { return rich_compare(other, Py_GT); }
- bool operator>=(object_api const &other) const { return rich_compare(other, Py_GE); }
-
- object operator-() const;
- object operator~() const;
- object operator+(object_api const &other) const;
- object operator+=(object_api const &other) const;
- object operator-(object_api const &other) const;
- object operator-=(object_api const &other) const;
- object operator*(object_api const &other) const;
- object operator*=(object_api const &other) const;
- object operator/(object_api const &other) const;
- object operator/=(object_api const &other) const;
- object operator|(object_api const &other) const;
- object operator|=(object_api const &other) const;
- object operator&(object_api const &other) const;
- object operator&=(object_api const &other) const;
- object operator^(object_api const &other) const;
- object operator^=(object_api const &other) const;
- object operator<<(object_api const &other) const;
- object operator<<=(object_api const &other) const;
- object operator>>(object_api const &other) const;
- object operator>>=(object_api const &other) const;
-
- PYBIND11_DEPRECATED("Use py::str(obj) instead")
- pybind11::str str() const;
-
- /// Get or set the object's docstring, i.e. ``obj.__doc__``.
- str_attr_accessor doc() const;
-
- /// Return the object's current reference count
- int ref_count() const { return static_cast<int>(Py_REFCNT(derived().ptr())); }
-
- // TODO PYBIND11_DEPRECATED("Call py::type::handle_of(h) or py::type::of(h) instead of h.get_type()")
- handle get_type() const;
-
-private:
- bool rich_compare(object_api const &other, int value) const;
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-/** \rst
- Holds a reference to a Python object (no reference counting)
-
- The `handle` class is a thin wrapper around an arbitrary Python object (i.e. a
- ``PyObject *`` in Python's C API). It does not perform any automatic reference
- counting and merely provides a basic C++ interface to various Python API functions.
-
- .. seealso::
- The `object` class inherits from `handle` and adds automatic reference
- counting features.
-\endrst */
-class handle : public detail::object_api<handle> {
-public:
- /// The default constructor creates a handle with a ``nullptr``-valued pointer
- handle() = default;
- /// Creates a ``handle`` from the given raw Python object pointer
- handle(PyObject *ptr) : m_ptr(ptr) { } // Allow implicit conversion from PyObject*
-
- /// Return the underlying ``PyObject *`` pointer
- PyObject *ptr() const { return m_ptr; }
- PyObject *&ptr() { return m_ptr; }
-
- /** \rst
- Manually increase the reference count of the Python object. Usually, it is
- preferable to use the `object` class which derives from `handle` and calls
- this function automatically. Returns a reference to itself.
- \endrst */
- const handle& inc_ref() const & { Py_XINCREF(m_ptr); return *this; }
-
- /** \rst
- Manually decrease the reference count of the Python object. Usually, it is
- preferable to use the `object` class which derives from `handle` and calls
- this function automatically. Returns a reference to itself.
- \endrst */
- const handle& dec_ref() const & { Py_XDECREF(m_ptr); return *this; }
-
- /** \rst
- Attempt to cast the Python object into the given C++ type. A `cast_error`
- will be throw upon failure.
- \endrst */
- template <typename T> T cast() const;
- /// Return ``true`` when the `handle` wraps a valid Python object
- explicit operator bool() const { return m_ptr != nullptr; }
- /** \rst
- Deprecated: Check that the underlying pointers are the same.
- Equivalent to ``obj1 is obj2`` in Python.
- \endrst */
- PYBIND11_DEPRECATED("Use obj1.is(obj2) instead")
- bool operator==(const handle &h) const { return m_ptr == h.m_ptr; }
- PYBIND11_DEPRECATED("Use !obj1.is(obj2) instead")
- bool operator!=(const handle &h) const { return m_ptr != h.m_ptr; }
- PYBIND11_DEPRECATED("Use handle::operator bool() instead")
- bool check() const { return m_ptr != nullptr; }
-protected:
- PyObject *m_ptr = nullptr;
-};
-
-/** \rst
- Holds a reference to a Python object (with reference counting)
-
- Like `handle`, the `object` class is a thin wrapper around an arbitrary Python
- object (i.e. a ``PyObject *`` in Python's C API). In contrast to `handle`, it
- optionally increases the object's reference count upon construction, and it
- *always* decreases the reference count when the `object` instance goes out of
- scope and is destructed. When using `object` instances consistently, it is much
- easier to get reference counting right at the first attempt.
-\endrst */
-class object : public handle {
-public:
- object() = default;
- PYBIND11_DEPRECATED("Use reinterpret_borrow<object>() or reinterpret_steal<object>()")
- object(handle h, bool is_borrowed) : handle(h) { if (is_borrowed) inc_ref(); }
- /// Copy constructor; always increases the reference count
- object(const object &o) : handle(o) { inc_ref(); }
- /// Move constructor; steals the object from ``other`` and preserves its reference count
- object(object &&other) noexcept { m_ptr = other.m_ptr; other.m_ptr = nullptr; }
- /// Destructor; automatically calls `handle::dec_ref()`
- ~object() { dec_ref(); }
-
- /** \rst
- Resets the internal pointer to ``nullptr`` without decreasing the
- object's reference count. The function returns a raw handle to the original
- Python object.
- \endrst */
- handle release() {
- PyObject *tmp = m_ptr;
- m_ptr = nullptr;
- return handle(tmp);
- }
-
- object& operator=(const object &other) {
- other.inc_ref();
- dec_ref();
- m_ptr = other.m_ptr;
- return *this;
- }
-
- object& operator=(object &&other) noexcept {
- if (this != &other) {
- handle temp(m_ptr);
- m_ptr = other.m_ptr;
- other.m_ptr = nullptr;
- temp.dec_ref();
- }
- return *this;
- }
-
- // Calling cast() on an object lvalue just copies (via handle::cast)
- template <typename T> T cast() const &;
- // Calling on an object rvalue does a move, if needed and/or possible
- template <typename T> T cast() &&;
-
-protected:
- // Tags for choosing constructors from raw PyObject *
- struct borrowed_t { };
- struct stolen_t { };
-
- template <typename T> friend T reinterpret_borrow(handle);
- template <typename T> friend T reinterpret_steal(handle);
-
-public:
- // Only accessible from derived classes and the reinterpret_* functions
- object(handle h, borrowed_t) : handle(h) { inc_ref(); }
- object(handle h, stolen_t) : handle(h) { }
-};
-
-/** \rst
- Declare that a `handle` or ``PyObject *`` is a certain type and borrow the reference.
- The target type ``T`` must be `object` or one of its derived classes. The function
- doesn't do any conversions or checks. It's up to the user to make sure that the
- target type is correct.
-
- .. code-block:: cpp
-
- PyObject *p = PyList_GetItem(obj, index);
- py::object o = reinterpret_borrow<py::object>(p);
- // or
- py::tuple t = reinterpret_borrow<py::tuple>(p); // <-- `p` must be already be a `tuple`
-\endrst */
-template <typename T> T reinterpret_borrow(handle h) { return {h, object::borrowed_t{}}; }
-
-/** \rst
- Like `reinterpret_borrow`, but steals the reference.
-
- .. code-block:: cpp
-
- PyObject *p = PyObject_Str(obj);
- py::str s = reinterpret_steal<py::str>(p); // <-- `p` must be already be a `str`
-\endrst */
-template <typename T> T reinterpret_steal(handle h) { return {h, object::stolen_t{}}; }
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-inline std::string error_string();
-PYBIND11_NAMESPACE_END(detail)
-
-/// Fetch and hold an error which was already set in Python. An instance of this is typically
-/// thrown to propagate python-side errors back through C++ which can either be caught manually or
-/// else falls back to the function dispatcher (which then raises the captured error back to
-/// python).
-class error_already_set : public std::runtime_error {
-public:
- /// Constructs a new exception from the current Python error indicator, if any. The current
- /// Python error indicator will be cleared.
- error_already_set() : std::runtime_error(detail::error_string()) {
- PyErr_Fetch(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());
- }
-
- error_already_set(const error_already_set &) = default;
- error_already_set(error_already_set &&) = default;
-
- inline ~error_already_set() override;
-
- /// Give the currently-held error back to Python, if any. If there is currently a Python error
- /// already set it is cleared first. After this call, the current object no longer stores the
- /// error variables (but the `.what()` string is still available).
- void restore() { PyErr_Restore(m_type.release().ptr(), m_value.release().ptr(), m_trace.release().ptr()); }
-
- /// If it is impossible to raise the currently-held error, such as in destructor, we can write
- /// it out using Python's unraisable hook (sys.unraisablehook). The error context should be
- /// some object whose repr() helps identify the location of the error. Python already knows the
- /// type and value of the error, so there is no need to repeat that. For example, __func__ could
- /// be helpful. After this call, the current object no longer stores the error variables,
- /// and neither does Python.
- void discard_as_unraisable(object err_context) {
- restore();
- PyErr_WriteUnraisable(err_context.ptr());
- }
- void discard_as_unraisable(const char *err_context) {
- discard_as_unraisable(reinterpret_steal<object>(PYBIND11_FROM_STRING(err_context)));
- }
-
- // Does nothing; provided for backwards compatibility.
- PYBIND11_DEPRECATED("Use of error_already_set.clear() is deprecated")
- void clear() {}
-
- /// Check if the currently trapped error type matches the given Python exception class (or a
- /// subclass thereof). May also be passed a tuple to search for any exception class matches in
- /// the given tuple.
- bool matches(handle exc) const { return PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()); }
-
- const object& type() const { return m_type; }
- const object& value() const { return m_value; }
- const object& trace() const { return m_trace; }
-
-private:
- object m_type, m_value, m_trace;
-};
-
-/** \defgroup python_builtins _
- Unless stated otherwise, the following C++ functions behave the same
- as their Python counterparts.
- */
-
-/** \ingroup python_builtins
- \rst
- Return true if ``obj`` is an instance of ``T``. Type ``T`` must be a subclass of
- `object` or a class which was exposed to Python as ``py::class_<T>``.
-\endrst */
-template <typename T, detail::enable_if_t<std::is_base_of<object, T>::value, int> = 0>
-bool isinstance(handle obj) { return T::check_(obj); }
-
-template <typename T, detail::enable_if_t<!std::is_base_of<object, T>::value, int> = 0>
-bool isinstance(handle obj) { return detail::isinstance_generic(obj, typeid(T)); }
-
-template <> inline bool isinstance<handle>(handle) = delete;
-template <> inline bool isinstance<object>(handle obj) { return obj.ptr() != nullptr; }
-
-/// \ingroup python_builtins
-/// Return true if ``obj`` is an instance of the ``type``.
-inline bool isinstance(handle obj, handle type) {
- const auto result = PyObject_IsInstance(obj.ptr(), type.ptr());
- if (result == -1)
- throw error_already_set();
- return result != 0;
-}
-
-/// \addtogroup python_builtins
-/// @{
-inline bool hasattr(handle obj, handle name) {
- return PyObject_HasAttr(obj.ptr(), name.ptr()) == 1;
-}
-
-inline bool hasattr(handle obj, const char *name) {
- return PyObject_HasAttrString(obj.ptr(), name) == 1;
-}
-
-inline void delattr(handle obj, handle name) {
- if (PyObject_DelAttr(obj.ptr(), name.ptr()) != 0) { throw error_already_set(); }
-}
-
-inline void delattr(handle obj, const char *name) {
- if (PyObject_DelAttrString(obj.ptr(), name) != 0) { throw error_already_set(); }
-}
-
-inline object getattr(handle obj, handle name) {
- PyObject *result = PyObject_GetAttr(obj.ptr(), name.ptr());
- if (!result) { throw error_already_set(); }
- return reinterpret_steal<object>(result);
-}
-
-inline object getattr(handle obj, const char *name) {
- PyObject *result = PyObject_GetAttrString(obj.ptr(), name);
- if (!result) { throw error_already_set(); }
- return reinterpret_steal<object>(result);
-}
-
-inline object getattr(handle obj, handle name, handle default_) {
- if (PyObject *result = PyObject_GetAttr(obj.ptr(), name.ptr())) {
- return reinterpret_steal<object>(result);
- } else {
- PyErr_Clear();
- return reinterpret_borrow<object>(default_);
- }
-}
-
-inline object getattr(handle obj, const char *name, handle default_) {
- if (PyObject *result = PyObject_GetAttrString(obj.ptr(), name)) {
- return reinterpret_steal<object>(result);
- } else {
- PyErr_Clear();
- return reinterpret_borrow<object>(default_);
- }
-}
-
-inline void setattr(handle obj, handle name, handle value) {
- if (PyObject_SetAttr(obj.ptr(), name.ptr(), value.ptr()) != 0) { throw error_already_set(); }
-}
-
-inline void setattr(handle obj, const char *name, handle value) {
- if (PyObject_SetAttrString(obj.ptr(), name, value.ptr()) != 0) { throw error_already_set(); }
-}
-
-inline ssize_t hash(handle obj) {
- auto h = PyObject_Hash(obj.ptr());
- if (h == -1) { throw error_already_set(); }
- return h;
-}
-
-/// @} python_builtins
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-inline handle get_function(handle value) {
- if (value) {
-#if PY_MAJOR_VERSION >= 3
- if (PyInstanceMethod_Check(value.ptr()))
- value = PyInstanceMethod_GET_FUNCTION(value.ptr());
- else
-#endif
- if (PyMethod_Check(value.ptr()))
- value = PyMethod_GET_FUNCTION(value.ptr());
- }
- return value;
-}
-
-// Helper aliases/functions to support implicit casting of values given to python accessors/methods.
-// When given a pyobject, this simply returns the pyobject as-is; for other C++ type, the value goes
-// through pybind11::cast(obj) to convert it to an `object`.
-template <typename T, enable_if_t<is_pyobject<T>::value, int> = 0>
-auto object_or_cast(T &&o) -> decltype(std::forward<T>(o)) { return std::forward<T>(o); }
-// The following casting version is implemented in cast.h:
-template <typename T, enable_if_t<!is_pyobject<T>::value, int> = 0>
-object object_or_cast(T &&o);
-// Match a PyObject*, which we want to convert directly to handle via its converting constructor
-inline handle object_or_cast(PyObject *ptr) { return ptr; }
-
-template <typename Policy>
-class accessor : public object_api<accessor<Policy>> {
- using key_type = typename Policy::key_type;
-
-public:
- accessor(handle obj, key_type key) : obj(obj), key(std::move(key)) { }
- accessor(const accessor &) = default;
- accessor(accessor &&) = default;
-
- // accessor overload required to override default assignment operator (templates are not allowed
- // to replace default compiler-generated assignments).
- void operator=(const accessor &a) && { std::move(*this).operator=(handle(a)); }
- void operator=(const accessor &a) & { operator=(handle(a)); }
-
- template <typename T> void operator=(T &&value) && {
- Policy::set(obj, key, object_or_cast(std::forward<T>(value)));
- }
- template <typename T> void operator=(T &&value) & {
- get_cache() = reinterpret_borrow<object>(object_or_cast(std::forward<T>(value)));
- }
-
- template <typename T = Policy>
- PYBIND11_DEPRECATED("Use of obj.attr(...) as bool is deprecated in favor of pybind11::hasattr(obj, ...)")
- explicit operator enable_if_t<std::is_same<T, accessor_policies::str_attr>::value ||
- std::is_same<T, accessor_policies::obj_attr>::value, bool>() const {
- return hasattr(obj, key);
- }
- template <typename T = Policy>
- PYBIND11_DEPRECATED("Use of obj[key] as bool is deprecated in favor of obj.contains(key)")
- explicit operator enable_if_t<std::is_same<T, accessor_policies::generic_item>::value, bool>() const {
- return obj.contains(key);
- }
-
- operator object() const { return get_cache(); }
- PyObject *ptr() const { return get_cache().ptr(); }
- template <typename T> T cast() const { return get_cache().template cast<T>(); }
-
-private:
- object &get_cache() const {
- if (!cache) { cache = Policy::get(obj, key); }
- return cache;
- }
-
-private:
- handle obj;
- key_type key;
- mutable object cache;
-};
-
-PYBIND11_NAMESPACE_BEGIN(accessor_policies)
-struct obj_attr {
- using key_type = object;
- static object get(handle obj, handle key) { return getattr(obj, key); }
- static void set(handle obj, handle key, handle val) { setattr(obj, key, val); }
-};
-
-struct str_attr {
- using key_type = const char *;
- static object get(handle obj, const char *key) { return getattr(obj, key); }
- static void set(handle obj, const char *key, handle val) { setattr(obj, key, val); }
-};
-
-struct generic_item {
- using key_type = object;
-
- static object get(handle obj, handle key) {
- PyObject *result = PyObject_GetItem(obj.ptr(), key.ptr());
- if (!result) { throw error_already_set(); }
- return reinterpret_steal<object>(result);
- }
-
- static void set(handle obj, handle key, handle val) {
- if (PyObject_SetItem(obj.ptr(), key.ptr(), val.ptr()) != 0) { throw error_already_set(); }
- }
-};
-
-struct sequence_item {
- using key_type = size_t;
-
- static object get(handle obj, size_t index) {
- PyObject *result = PySequence_GetItem(obj.ptr(), static_cast<ssize_t>(index));
- if (!result) { throw error_already_set(); }
- return reinterpret_steal<object>(result);
- }
-
- static void set(handle obj, size_t index, handle val) {
- // PySequence_SetItem does not steal a reference to 'val'
- if (PySequence_SetItem(obj.ptr(), static_cast<ssize_t>(index), val.ptr()) != 0) {
- throw error_already_set();
- }
- }
-};
-
-struct list_item {
- using key_type = size_t;
-
- static object get(handle obj, size_t index) {
- PyObject *result = PyList_GetItem(obj.ptr(), static_cast<ssize_t>(index));
- if (!result) { throw error_already_set(); }
- return reinterpret_borrow<object>(result);
- }
-
- static void set(handle obj, size_t index, handle val) {
- // PyList_SetItem steals a reference to 'val'
- if (PyList_SetItem(obj.ptr(), static_cast<ssize_t>(index), val.inc_ref().ptr()) != 0) {
- throw error_already_set();
- }
- }
-};
-
-struct tuple_item {
- using key_type = size_t;
-
- static object get(handle obj, size_t index) {
- PyObject *result = PyTuple_GetItem(obj.ptr(), static_cast<ssize_t>(index));
- if (!result) { throw error_already_set(); }
- return reinterpret_borrow<object>(result);
- }
-
- static void set(handle obj, size_t index, handle val) {
- // PyTuple_SetItem steals a reference to 'val'
- if (PyTuple_SetItem(obj.ptr(), static_cast<ssize_t>(index), val.inc_ref().ptr()) != 0) {
- throw error_already_set();
- }
- }
-};
-PYBIND11_NAMESPACE_END(accessor_policies)
-
-/// STL iterator template used for tuple, list, sequence and dict
-template <typename Policy>
-class generic_iterator : public Policy {
- using It = generic_iterator;
-
-public:
- using difference_type = ssize_t;
- using iterator_category = typename Policy::iterator_category;
- using value_type = typename Policy::value_type;
- using reference = typename Policy::reference;
- using pointer = typename Policy::pointer;
-
- generic_iterator() = default;
- generic_iterator(handle seq, ssize_t index) : Policy(seq, index) { }
-
- reference operator*() const { return Policy::dereference(); }
- reference operator[](difference_type n) const { return *(*this + n); }
- pointer operator->() const { return **this; }
-
- It &operator++() { Policy::increment(); return *this; }
- It operator++(int) { auto copy = *this; Policy::increment(); return copy; }
- It &operator--() { Policy::decrement(); return *this; }
- It operator--(int) { auto copy = *this; Policy::decrement(); return copy; }
- It &operator+=(difference_type n) { Policy::advance(n); return *this; }
- It &operator-=(difference_type n) { Policy::advance(-n); return *this; }
-
- friend It operator+(const It &a, difference_type n) { auto copy = a; return copy += n; }
- friend It operator+(difference_type n, const It &b) { return b + n; }
- friend It operator-(const It &a, difference_type n) { auto copy = a; return copy -= n; }
- friend difference_type operator-(const It &a, const It &b) { return a.distance_to(b); }
-
- friend bool operator==(const It &a, const It &b) { return a.equal(b); }
- friend bool operator!=(const It &a, const It &b) { return !(a == b); }
- friend bool operator< (const It &a, const It &b) { return b - a > 0; }
- friend bool operator> (const It &a, const It &b) { return b < a; }
- friend bool operator>=(const It &a, const It &b) { return !(a < b); }
- friend bool operator<=(const It &a, const It &b) { return !(a > b); }
-};
-
-PYBIND11_NAMESPACE_BEGIN(iterator_policies)
-/// Quick proxy class needed to implement ``operator->`` for iterators which can't return pointers
-template <typename T>
-struct arrow_proxy {
- T value;
-
- arrow_proxy(T &&value) : value(std::move(value)) { }
- T *operator->() const { return &value; }
-};
-
-/// Lightweight iterator policy using just a simple pointer: see ``PySequence_Fast_ITEMS``
-class sequence_fast_readonly {
-protected:
- using iterator_category = std::random_access_iterator_tag;
- using value_type = handle;
- using reference = const handle;
- using pointer = arrow_proxy<const handle>;
-
- sequence_fast_readonly(handle obj, ssize_t n) : ptr(PySequence_Fast_ITEMS(obj.ptr()) + n) { }
-
- reference dereference() const { return *ptr; }
- void increment() { ++ptr; }
- void decrement() { --ptr; }
- void advance(ssize_t n) { ptr += n; }
- bool equal(const sequence_fast_readonly &b) const { return ptr == b.ptr; }
- ssize_t distance_to(const sequence_fast_readonly &b) const { return ptr - b.ptr; }
-
-private:
- PyObject **ptr;
-};
-
-/// Full read and write access using the sequence protocol: see ``detail::sequence_accessor``
-class sequence_slow_readwrite {
-protected:
- using iterator_category = std::random_access_iterator_tag;
- using value_type = object;
- using reference = sequence_accessor;
- using pointer = arrow_proxy<const sequence_accessor>;
-
- sequence_slow_readwrite(handle obj, ssize_t index) : obj(obj), index(index) { }
-
- reference dereference() const { return {obj, static_cast<size_t>(index)}; }
- void increment() { ++index; }
- void decrement() { --index; }
- void advance(ssize_t n) { index += n; }
- bool equal(const sequence_slow_readwrite &b) const { return index == b.index; }
- ssize_t distance_to(const sequence_slow_readwrite &b) const { return index - b.index; }
-
-private:
- handle obj;
- ssize_t index;
-};
-
-/// Python's dictionary protocol permits this to be a forward iterator
-class dict_readonly {
-protected:
- using iterator_category = std::forward_iterator_tag;
- using value_type = std::pair<handle, handle>;
- using reference = const value_type;
- using pointer = arrow_proxy<const value_type>;
-
- dict_readonly() = default;
- dict_readonly(handle obj, ssize_t pos) : obj(obj), pos(pos) { increment(); }
-
- reference dereference() const { return {key, value}; }
- void increment() { if (!PyDict_Next(obj.ptr(), &pos, &key, &value)) { pos = -1; } }
- bool equal(const dict_readonly &b) const { return pos == b.pos; }
-
-private:
- handle obj;
- PyObject *key = nullptr, *value = nullptr;
- ssize_t pos = -1;
-};
-PYBIND11_NAMESPACE_END(iterator_policies)
-
-#if !defined(PYPY_VERSION)
-using tuple_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>;
-using list_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>;
-#else
-using tuple_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;
-using list_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;
-#endif
-
-using sequence_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;
-using dict_iterator = generic_iterator<iterator_policies::dict_readonly>;
-
-inline bool PyIterable_Check(PyObject *obj) {
- PyObject *iter = PyObject_GetIter(obj);
- if (iter) {
- Py_DECREF(iter);
- return true;
- } else {
- PyErr_Clear();
- return false;
- }
-}
-
-inline bool PyNone_Check(PyObject *o) { return o == Py_None; }
-inline bool PyEllipsis_Check(PyObject *o) { return o == Py_Ellipsis; }
-
-inline bool PyUnicode_Check_Permissive(PyObject *o) { return PyUnicode_Check(o) || PYBIND11_BYTES_CHECK(o); }
-
-inline bool PyStaticMethod_Check(PyObject *o) { return o->ob_type == &PyStaticMethod_Type; }
-
-class kwargs_proxy : public handle {
-public:
- explicit kwargs_proxy(handle h) : handle(h) { }
-};
-
-class args_proxy : public handle {
-public:
- explicit args_proxy(handle h) : handle(h) { }
- kwargs_proxy operator*() const { return kwargs_proxy(*this); }
-};
-
-/// Python argument categories (using PEP 448 terms)
-template <typename T> using is_keyword = std::is_base_of<arg, T>;
-template <typename T> using is_s_unpacking = std::is_same<args_proxy, T>; // * unpacking
-template <typename T> using is_ds_unpacking = std::is_same<kwargs_proxy, T>; // ** unpacking
-template <typename T> using is_positional = satisfies_none_of<T,
- is_keyword, is_s_unpacking, is_ds_unpacking
->;
-template <typename T> using is_keyword_or_ds = satisfies_any_of<T, is_keyword, is_ds_unpacking>;
-
-// Call argument collector forward declarations
-template <return_value_policy policy = return_value_policy::automatic_reference>
-class simple_collector;
-template <return_value_policy policy = return_value_policy::automatic_reference>
-class unpacking_collector;
-
-PYBIND11_NAMESPACE_END(detail)
-
-// TODO: After the deprecated constructors are removed, this macro can be simplified by
-// inheriting ctors: `using Parent::Parent`. It's not an option right now because
-// the `using` statement triggers the parent deprecation warning even if the ctor
-// isn't even used.
-#define PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun) \
- public: \
- PYBIND11_DEPRECATED("Use reinterpret_borrow<"#Name">() or reinterpret_steal<"#Name">()") \
- Name(handle h, bool is_borrowed) : Parent(is_borrowed ? Parent(h, borrowed_t{}) : Parent(h, stolen_t{})) { } \
- Name(handle h, borrowed_t) : Parent(h, borrowed_t{}) { } \
- Name(handle h, stolen_t) : Parent(h, stolen_t{}) { } \
- PYBIND11_DEPRECATED("Use py::isinstance<py::python_type>(obj) instead") \
- bool check() const { return m_ptr != nullptr && (bool) CheckFun(m_ptr); } \
- static bool check_(handle h) { return h.ptr() != nullptr && CheckFun(h.ptr()); } \
- template <typename Policy_> \
- Name(const ::pybind11::detail::accessor<Policy_> &a) : Name(object(a)) { }
-
-#define PYBIND11_OBJECT_CVT(Name, Parent, CheckFun, ConvertFun) \
- PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun) \
- /* This is deliberately not 'explicit' to allow implicit conversion from object: */ \
- Name(const object &o) \
- : Parent(check_(o) ? o.inc_ref().ptr() : ConvertFun(o.ptr()), stolen_t{}) \
- { if (!m_ptr) throw error_already_set(); } \
- Name(object &&o) \
- : Parent(check_(o) ? o.release().ptr() : ConvertFun(o.ptr()), stolen_t{}) \
- { if (!m_ptr) throw error_already_set(); }
-
-#define PYBIND11_OBJECT_CHECK_FAILED(Name, o) \
- ::pybind11::type_error("Object of type '" + \
- ::pybind11::detail::get_fully_qualified_tp_name(Py_TYPE(o.ptr())) + \
- "' is not an instance of '" #Name "'")
-
-#define PYBIND11_OBJECT(Name, Parent, CheckFun) \
- PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun) \
- /* This is deliberately not 'explicit' to allow implicit conversion from object: */ \
- Name(const object &o) : Parent(o) \
- { if (o && !check_(o)) throw PYBIND11_OBJECT_CHECK_FAILED(Name, o); } \
- Name(object &&o) : Parent(std::move(o)) \
- { if (o && !check_(o)) throw PYBIND11_OBJECT_CHECK_FAILED(Name, o); }
-
-#define PYBIND11_OBJECT_DEFAULT(Name, Parent, CheckFun) \
- PYBIND11_OBJECT(Name, Parent, CheckFun) \
- Name() : Parent() { }
-
-/// \addtogroup pytypes
-/// @{
-
-/** \rst
- Wraps a Python iterator so that it can also be used as a C++ input iterator
-
- Caveat: copying an iterator does not (and cannot) clone the internal
- state of the Python iterable. This also applies to the post-increment
- operator. This iterator should only be used to retrieve the current
- value using ``operator*()``.
-\endrst */
-class iterator : public object {
-public:
- using iterator_category = std::input_iterator_tag;
- using difference_type = ssize_t;
- using value_type = handle;
- using reference = const handle;
- using pointer = const handle *;
-
- PYBIND11_OBJECT_DEFAULT(iterator, object, PyIter_Check)
-
- iterator& operator++() {
- advance();
- return *this;
- }
-
- iterator operator++(int) {
- auto rv = *this;
- advance();
- return rv;
- }
-
- reference operator*() const {
- if (m_ptr && !value.ptr()) {
- auto& self = const_cast<iterator &>(*this);
- self.advance();
- }
- return value;
- }
-
- pointer operator->() const { operator*(); return &value; }
-
- /** \rst
- The value which marks the end of the iteration. ``it == iterator::sentinel()``
- is equivalent to catching ``StopIteration`` in Python.
-
- .. code-block:: cpp
-
- void foo(py::iterator it) {
- while (it != py::iterator::sentinel()) {
- // use `*it`
- ++it;
- }
- }
- \endrst */
- static iterator sentinel() { return {}; }
-
- friend bool operator==(const iterator &a, const iterator &b) { return a->ptr() == b->ptr(); }
- friend bool operator!=(const iterator &a, const iterator &b) { return a->ptr() != b->ptr(); }
-
-private:
- void advance() {
- value = reinterpret_steal<object>(PyIter_Next(m_ptr));
- if (PyErr_Occurred()) { throw error_already_set(); }
- }
-
-private:
- object value = {};
-};
-
-
-
-class type : public object {
-public:
- PYBIND11_OBJECT(type, object, PyType_Check)
-
- /// Return a type handle from a handle or an object
- static handle handle_of(handle h) { return handle((PyObject*) Py_TYPE(h.ptr())); }
-
- /// Return a type object from a handle or an object
- static type of(handle h) { return type(type::handle_of(h), borrowed_t{}); }
-
- // Defined in pybind11/cast.h
- /// Convert C++ type to handle if previously registered. Does not convert
- /// standard types, like int, float. etc. yet.
- /// See https://github.com/pybind/pybind11/issues/2486
- template<typename T>
- static handle handle_of();
-
- /// Convert C++ type to type if previously registered. Does not convert
- /// standard types, like int, float. etc. yet.
- /// See https://github.com/pybind/pybind11/issues/2486
- template<typename T>
- static type of() {return type(type::handle_of<T>(), borrowed_t{}); }
-};
-
-class iterable : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(iterable, object, detail::PyIterable_Check)
-};
-
-class bytes;
-
-class str : public object {
-public:
- PYBIND11_OBJECT_CVT(str, object, detail::PyUnicode_Check_Permissive, raw_str)
-
- str(const char *c, size_t n)
- : object(PyUnicode_FromStringAndSize(c, (ssize_t) n), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate string object!");
- }
-
- // 'explicit' is explicitly omitted from the following constructors to allow implicit conversion to py::str from C++ string-like objects
- str(const char *c = "")
- : object(PyUnicode_FromString(c), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate string object!");
- }
-
- str(const std::string &s) : str(s.data(), s.size()) { }
-
- explicit str(const bytes &b);
-
- /** \rst
- Return a string representation of the object. This is analogous to
- the ``str()`` function in Python.
- \endrst */
- explicit str(handle h) : object(raw_str(h.ptr()), stolen_t{}) { if (!m_ptr) throw error_already_set(); }
-
- operator std::string() const {
- object temp = *this;
- if (PyUnicode_Check(m_ptr)) {
- temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(m_ptr));
- if (!temp)
- pybind11_fail("Unable to extract string contents! (encoding issue)");
- }
- char *buffer;
- ssize_t length;
- if (PYBIND11_BYTES_AS_STRING_AND_SIZE(temp.ptr(), &buffer, &length))
- pybind11_fail("Unable to extract string contents! (invalid type)");
- return std::string(buffer, (size_t) length);
- }
-
- template <typename... Args>
- str format(Args &&...args) const {
- return attr("format")(std::forward<Args>(args)...);
- }
-
-private:
- /// Return string representation -- always returns a new reference, even if already a str
- static PyObject *raw_str(PyObject *op) {
- PyObject *str_value = PyObject_Str(op);
-#if PY_MAJOR_VERSION < 3
- if (!str_value) throw error_already_set();
- PyObject *unicode = PyUnicode_FromEncodedObject(str_value, "utf-8", nullptr);
- Py_XDECREF(str_value); str_value = unicode;
-#endif
- return str_value;
- }
-};
-/// @} pytypes
-
-inline namespace literals {
-/** \rst
- String literal version of `str`
- \endrst */
-inline str operator"" _s(const char *s, size_t size) { return {s, size}; }
-} // namespace literals
-
-/// \addtogroup pytypes
-/// @{
-class bytes : public object {
-public:
- PYBIND11_OBJECT(bytes, object, PYBIND11_BYTES_CHECK)
-
- // Allow implicit conversion:
- bytes(const char *c = "")
- : object(PYBIND11_BYTES_FROM_STRING(c), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate bytes object!");
- }
-
- bytes(const char *c, size_t n)
- : object(PYBIND11_BYTES_FROM_STRING_AND_SIZE(c, (ssize_t) n), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate bytes object!");
- }
-
- // Allow implicit conversion:
- bytes(const std::string &s) : bytes(s.data(), s.size()) { }
-
- explicit bytes(const pybind11::str &s);
-
- operator std::string() const {
- char *buffer;
- ssize_t length;
- if (PYBIND11_BYTES_AS_STRING_AND_SIZE(m_ptr, &buffer, &length))
- pybind11_fail("Unable to extract bytes contents!");
- return std::string(buffer, (size_t) length);
- }
-};
-// Note: breathe >= 4.17.0 will fail to build docs if the below two constructors
-// are included in the doxygen group; close here and reopen after as a workaround
-/// @} pytypes
-
-inline bytes::bytes(const pybind11::str &s) {
- object temp = s;
- if (PyUnicode_Check(s.ptr())) {
- temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(s.ptr()));
- if (!temp)
- pybind11_fail("Unable to extract string contents! (encoding issue)");
- }
- char *buffer;
- ssize_t length;
- if (PYBIND11_BYTES_AS_STRING_AND_SIZE(temp.ptr(), &buffer, &length))
- pybind11_fail("Unable to extract string contents! (invalid type)");
- auto obj = reinterpret_steal<object>(PYBIND11_BYTES_FROM_STRING_AND_SIZE(buffer, length));
- if (!obj)
- pybind11_fail("Could not allocate bytes object!");
- m_ptr = obj.release().ptr();
-}
-
-inline str::str(const bytes& b) {
- char *buffer;
- ssize_t length;
- if (PYBIND11_BYTES_AS_STRING_AND_SIZE(b.ptr(), &buffer, &length))
- pybind11_fail("Unable to extract bytes contents!");
- auto obj = reinterpret_steal<object>(PyUnicode_FromStringAndSize(buffer, (ssize_t) length));
- if (!obj)
- pybind11_fail("Could not allocate string object!");
- m_ptr = obj.release().ptr();
-}
-
-/// \addtogroup pytypes
-/// @{
-class none : public object {
-public:
- PYBIND11_OBJECT(none, object, detail::PyNone_Check)
- none() : object(Py_None, borrowed_t{}) { }
-};
-
-class ellipsis : public object {
-public:
- PYBIND11_OBJECT(ellipsis, object, detail::PyEllipsis_Check)
- ellipsis() : object(Py_Ellipsis, borrowed_t{}) { }
-};
-
-class bool_ : public object {
-public:
- PYBIND11_OBJECT_CVT(bool_, object, PyBool_Check, raw_bool)
- bool_() : object(Py_False, borrowed_t{}) { }
- // Allow implicit conversion from and to `bool`:
- bool_(bool value) : object(value ? Py_True : Py_False, borrowed_t{}) { }
- operator bool() const { return m_ptr && PyLong_AsLong(m_ptr) != 0; }
-
-private:
- /// Return the truth value of an object -- always returns a new reference
- static PyObject *raw_bool(PyObject *op) {
- const auto value = PyObject_IsTrue(op);
- if (value == -1) return nullptr;
- return handle(value ? Py_True : Py_False).inc_ref().ptr();
- }
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-// Converts a value to the given unsigned type. If an error occurs, you get back (Unsigned) -1;
-// otherwise you get back the unsigned long or unsigned long long value cast to (Unsigned).
-// (The distinction is critically important when casting a returned -1 error value to some other
-// unsigned type: (A)-1 != (B)-1 when A and B are unsigned types of different sizes).
-template <typename Unsigned>
-Unsigned as_unsigned(PyObject *o) {
- if (sizeof(Unsigned) <= sizeof(unsigned long)
-#if PY_VERSION_HEX < 0x03000000
- || PyInt_Check(o)
-#endif
- ) {
- unsigned long v = PyLong_AsUnsignedLong(o);
- return v == (unsigned long) -1 && PyErr_Occurred() ? (Unsigned) -1 : (Unsigned) v;
- }
- else {
- unsigned long long v = PyLong_AsUnsignedLongLong(o);
- return v == (unsigned long long) -1 && PyErr_Occurred() ? (Unsigned) -1 : (Unsigned) v;
- }
-}
-PYBIND11_NAMESPACE_END(detail)
-
-class int_ : public object {
-public:
- PYBIND11_OBJECT_CVT(int_, object, PYBIND11_LONG_CHECK, PyNumber_Long)
- int_() : object(PyLong_FromLong(0), stolen_t{}) { }
- // Allow implicit conversion from C++ integral types:
- template <typename T,
- detail::enable_if_t<std::is_integral<T>::value, int> = 0>
- int_(T value) {
- if (sizeof(T) <= sizeof(long)) {
- if (std::is_signed<T>::value)
- m_ptr = PyLong_FromLong((long) value);
- else
- m_ptr = PyLong_FromUnsignedLong((unsigned long) value);
- } else {
- if (std::is_signed<T>::value)
- m_ptr = PyLong_FromLongLong((long long) value);
- else
- m_ptr = PyLong_FromUnsignedLongLong((unsigned long long) value);
- }
- if (!m_ptr) pybind11_fail("Could not allocate int object!");
- }
-
- template <typename T,
- detail::enable_if_t<std::is_integral<T>::value, int> = 0>
- operator T() const {
- return std::is_unsigned<T>::value
- ? detail::as_unsigned<T>(m_ptr)
- : sizeof(T) <= sizeof(long)
- ? (T) PyLong_AsLong(m_ptr)
- : (T) PYBIND11_LONG_AS_LONGLONG(m_ptr);
- }
-};
-
-class float_ : public object {
-public:
- PYBIND11_OBJECT_CVT(float_, object, PyFloat_Check, PyNumber_Float)
- // Allow implicit conversion from float/double:
- float_(float value) : object(PyFloat_FromDouble((double) value), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate float object!");
- }
- float_(double value = .0) : object(PyFloat_FromDouble((double) value), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate float object!");
- }
- operator float() const { return (float) PyFloat_AsDouble(m_ptr); }
- operator double() const { return (double) PyFloat_AsDouble(m_ptr); }
-};
-
-class weakref : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(weakref, object, PyWeakref_Check)
- explicit weakref(handle obj, handle callback = {})
- : object(PyWeakref_NewRef(obj.ptr(), callback.ptr()), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate weak reference!");
- }
-};
-
-class slice : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(slice, object, PySlice_Check)
- slice(ssize_t start_, ssize_t stop_, ssize_t step_) {
- int_ start(start_), stop(stop_), step(step_);
- m_ptr = PySlice_New(start.ptr(), stop.ptr(), step.ptr());
- if (!m_ptr) pybind11_fail("Could not allocate slice object!");
- }
- bool compute(size_t length, size_t *start, size_t *stop, size_t *step,
- size_t *slicelength) const {
- return PySlice_GetIndicesEx((PYBIND11_SLICE_OBJECT *) m_ptr,
- (ssize_t) length, (ssize_t *) start,
- (ssize_t *) stop, (ssize_t *) step,
- (ssize_t *) slicelength) == 0;
- }
- bool compute(ssize_t length, ssize_t *start, ssize_t *stop, ssize_t *step,
- ssize_t *slicelength) const {
- return PySlice_GetIndicesEx((PYBIND11_SLICE_OBJECT *) m_ptr,
- length, start,
- stop, step,
- slicelength) == 0;
- }
-};
-
-class capsule : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(capsule, object, PyCapsule_CheckExact)
- PYBIND11_DEPRECATED("Use reinterpret_borrow<capsule>() or reinterpret_steal<capsule>()")
- capsule(PyObject *ptr, bool is_borrowed) : object(is_borrowed ? object(ptr, borrowed_t{}) : object(ptr, stolen_t{})) { }
-
- explicit capsule(const void *value, const char *name = nullptr, void (*destructor)(PyObject *) = nullptr)
- : object(PyCapsule_New(const_cast<void *>(value), name, destructor), stolen_t{}) {
- if (!m_ptr)
- pybind11_fail("Could not allocate capsule object!");
- }
-
- PYBIND11_DEPRECATED("Please pass a destructor that takes a void pointer as input")
- capsule(const void *value, void (*destruct)(PyObject *))
- : object(PyCapsule_New(const_cast<void*>(value), nullptr, destruct), stolen_t{}) {
- if (!m_ptr)
- pybind11_fail("Could not allocate capsule object!");
- }
-
- capsule(const void *value, void (*destructor)(void *)) {
- m_ptr = PyCapsule_New(const_cast<void *>(value), nullptr, [](PyObject *o) {
- auto destructor = reinterpret_cast<void (*)(void *)>(PyCapsule_GetContext(o));
- void *ptr = PyCapsule_GetPointer(o, nullptr);
- destructor(ptr);
- });
-
- if (!m_ptr)
- pybind11_fail("Could not allocate capsule object!");
-
- if (PyCapsule_SetContext(m_ptr, (void *) destructor) != 0)
- pybind11_fail("Could not set capsule context!");
- }
-
- capsule(void (*destructor)()) {
- m_ptr = PyCapsule_New(reinterpret_cast<void *>(destructor), nullptr, [](PyObject *o) {
- auto destructor = reinterpret_cast<void (*)()>(PyCapsule_GetPointer(o, nullptr));
- destructor();
- });
-
- if (!m_ptr)
- pybind11_fail("Could not allocate capsule object!");
- }
-
- template <typename T> operator T *() const {
- return get_pointer<T>();
- }
-
- /// Get the pointer the capsule holds.
- template<typename T = void>
- T* get_pointer() const {
- auto name = this->name();
- T *result = static_cast<T *>(PyCapsule_GetPointer(m_ptr, name));
- if (!result) pybind11_fail("Unable to extract capsule contents!");
- return result;
- }
-
- /// Replaces a capsule's pointer *without* calling the destructor on the existing one.
- void set_pointer(const void *value) {
- if (PyCapsule_SetPointer(m_ptr, const_cast<void *>(value)) != 0)
- pybind11_fail("Could not set capsule pointer");
- }
-
- const char *name() const { return PyCapsule_GetName(m_ptr); }
-};
-
-class tuple : public object {
-public:
- PYBIND11_OBJECT_CVT(tuple, object, PyTuple_Check, PySequence_Tuple)
- explicit tuple(size_t size = 0) : object(PyTuple_New((ssize_t) size), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate tuple object!");
- }
- size_t size() const { return (size_t) PyTuple_Size(m_ptr); }
- bool empty() const { return size() == 0; }
- detail::tuple_accessor operator[](size_t index) const { return {*this, index}; }
- detail::item_accessor operator[](handle h) const { return object::operator[](h); }
- detail::tuple_iterator begin() const { return {*this, 0}; }
- detail::tuple_iterator end() const { return {*this, PyTuple_GET_SIZE(m_ptr)}; }
-};
-
-class dict : public object {
-public:
- PYBIND11_OBJECT_CVT(dict, object, PyDict_Check, raw_dict)
- dict() : object(PyDict_New(), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate dict object!");
- }
- template <typename... Args,
- typename = detail::enable_if_t<detail::all_of<detail::is_keyword_or_ds<Args>...>::value>,
- // MSVC workaround: it can't compile an out-of-line definition, so defer the collector
- typename collector = detail::deferred_t<detail::unpacking_collector<>, Args...>>
- explicit dict(Args &&...args) : dict(collector(std::forward<Args>(args)...).kwargs()) { }
-
- size_t size() const { return (size_t) PyDict_Size(m_ptr); }
- bool empty() const { return size() == 0; }
- detail::dict_iterator begin() const { return {*this, 0}; }
- detail::dict_iterator end() const { return {}; }
- void clear() const { PyDict_Clear(ptr()); }
- template <typename T> bool contains(T &&key) const {
- return PyDict_Contains(m_ptr, detail::object_or_cast(std::forward<T>(key)).ptr()) == 1;
- }
-
-private:
- /// Call the `dict` Python type -- always returns a new reference
- static PyObject *raw_dict(PyObject *op) {
- if (PyDict_Check(op))
- return handle(op).inc_ref().ptr();
- return PyObject_CallFunctionObjArgs((PyObject *) &PyDict_Type, op, nullptr);
- }
-};
-
-class sequence : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(sequence, object, PySequence_Check)
- size_t size() const {
- ssize_t result = PySequence_Size(m_ptr);
- if (result == -1)
- throw error_already_set();
- return (size_t) result;
- }
- bool empty() const { return size() == 0; }
- detail::sequence_accessor operator[](size_t index) const { return {*this, index}; }
- detail::item_accessor operator[](handle h) const { return object::operator[](h); }
- detail::sequence_iterator begin() const { return {*this, 0}; }
- detail::sequence_iterator end() const { return {*this, PySequence_Size(m_ptr)}; }
-};
-
-class list : public object {
-public:
- PYBIND11_OBJECT_CVT(list, object, PyList_Check, PySequence_List)
- explicit list(size_t size = 0) : object(PyList_New((ssize_t) size), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate list object!");
- }
- size_t size() const { return (size_t) PyList_Size(m_ptr); }
- bool empty() const { return size() == 0; }
- detail::list_accessor operator[](size_t index) const { return {*this, index}; }
- detail::item_accessor operator[](handle h) const { return object::operator[](h); }
- detail::list_iterator begin() const { return {*this, 0}; }
- detail::list_iterator end() const { return {*this, PyList_GET_SIZE(m_ptr)}; }
- template <typename T> void append(T &&val) const {
- PyList_Append(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr());
- }
- template <typename T> void insert(size_t index, T &&val) const {
- PyList_Insert(m_ptr, static_cast<ssize_t>(index),
- detail::object_or_cast(std::forward<T>(val)).ptr());
- }
-};
-
-class args : public tuple { PYBIND11_OBJECT_DEFAULT(args, tuple, PyTuple_Check) };
-class kwargs : public dict { PYBIND11_OBJECT_DEFAULT(kwargs, dict, PyDict_Check) };
-
-class set : public object {
-public:
- PYBIND11_OBJECT_CVT(set, object, PySet_Check, PySet_New)
- set() : object(PySet_New(nullptr), stolen_t{}) {
- if (!m_ptr) pybind11_fail("Could not allocate set object!");
- }
- size_t size() const { return (size_t) PySet_Size(m_ptr); }
- bool empty() const { return size() == 0; }
- template <typename T> bool add(T &&val) const {
- return PySet_Add(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr()) == 0;
- }
- void clear() const { PySet_Clear(m_ptr); }
- template <typename T> bool contains(T &&val) const {
- return PySet_Contains(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr()) == 1;
- }
-};
-
-class function : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(function, object, PyCallable_Check)
- handle cpp_function() const {
- handle fun = detail::get_function(m_ptr);
- if (fun && PyCFunction_Check(fun.ptr()))
- return fun;
- return handle();
- }
- bool is_cpp_function() const { return (bool) cpp_function(); }
-};
-
-class staticmethod : public object {
-public:
- PYBIND11_OBJECT_CVT(staticmethod, object, detail::PyStaticMethod_Check, PyStaticMethod_New)
-};
-
-class buffer : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(buffer, object, PyObject_CheckBuffer)
-
- buffer_info request(bool writable = false) const {
- int flags = PyBUF_STRIDES | PyBUF_FORMAT;
- if (writable) flags |= PyBUF_WRITABLE;
- auto *view = new Py_buffer();
- if (PyObject_GetBuffer(m_ptr, view, flags) != 0) {
- delete view;
- throw error_already_set();
- }
- return buffer_info(view);
- }
-};
-
-class memoryview : public object {
-public:
- PYBIND11_OBJECT_CVT(memoryview, object, PyMemoryView_Check, PyMemoryView_FromObject)
-
- /** \rst
- Creates ``memoryview`` from ``buffer_info``.
-
- ``buffer_info`` must be created from ``buffer::request()``. Otherwise
- throws an exception.
-
- For creating a ``memoryview`` from objects that support buffer protocol,
- use ``memoryview(const object& obj)`` instead of this constructor.
- \endrst */
- explicit memoryview(const buffer_info& info) {
- if (!info.view())
- pybind11_fail("Prohibited to create memoryview without Py_buffer");
- // Note: PyMemoryView_FromBuffer never increments obj reference.
- m_ptr = (info.view()->obj) ?
- PyMemoryView_FromObject(info.view()->obj) :
- PyMemoryView_FromBuffer(info.view());
- if (!m_ptr)
- pybind11_fail("Unable to create memoryview from buffer descriptor");
- }
-
- /** \rst
- Creates ``memoryview`` from static buffer.
-
- This method is meant for providing a ``memoryview`` for C/C++ buffer not
- managed by Python. The caller is responsible for managing the lifetime
- of ``ptr`` and ``format``, which MUST outlive the memoryview constructed
- here.
-
- See also: Python C API documentation for `PyMemoryView_FromBuffer`_.
-
- .. _PyMemoryView_FromBuffer: https://docs.python.org/c-api/memoryview.html#c.PyMemoryView_FromBuffer
-
- :param ptr: Pointer to the buffer.
- :param itemsize: Byte size of an element.
- :param format: Pointer to the null-terminated format string. For
- homogeneous Buffers, this should be set to
- ``format_descriptor<T>::value``.
- :param shape: Shape of the tensor (1 entry per dimension).
- :param strides: Number of bytes between adjacent entries (for each
- per dimension).
- :param readonly: Flag to indicate if the underlying storage may be
- written to.
- \endrst */
- static memoryview from_buffer(
- void *ptr, ssize_t itemsize, const char *format,
- detail::any_container<ssize_t> shape,
- detail::any_container<ssize_t> strides, bool readonly = false);
-
- static memoryview from_buffer(
- const void *ptr, ssize_t itemsize, const char *format,
- detail::any_container<ssize_t> shape,
- detail::any_container<ssize_t> strides) {
- return memoryview::from_buffer(
- const_cast<void*>(ptr), itemsize, format, shape, strides, true);
- }
-
- template<typename T>
- static memoryview from_buffer(
- T *ptr, detail::any_container<ssize_t> shape,
- detail::any_container<ssize_t> strides, bool readonly = false) {
- return memoryview::from_buffer(
- reinterpret_cast<void*>(ptr), sizeof(T),
- format_descriptor<T>::value, shape, strides, readonly);
- }
-
- template<typename T>
- static memoryview from_buffer(
- const T *ptr, detail::any_container<ssize_t> shape,
- detail::any_container<ssize_t> strides) {
- return memoryview::from_buffer(
- const_cast<T*>(ptr), shape, strides, true);
- }
-
-#if PY_MAJOR_VERSION >= 3
- /** \rst
- Creates ``memoryview`` from static memory.
-
- This method is meant for providing a ``memoryview`` for C/C++ buffer not
- managed by Python. The caller is responsible for managing the lifetime
- of ``mem``, which MUST outlive the memoryview constructed here.
-
- This method is not available in Python 2.
-
- See also: Python C API documentation for `PyMemoryView_FromBuffer`_.
-
- .. _PyMemoryView_FromMemory: https://docs.python.org/c-api/memoryview.html#c.PyMemoryView_FromMemory
- \endrst */
- static memoryview from_memory(void *mem, ssize_t size, bool readonly = false) {
- PyObject* ptr = PyMemoryView_FromMemory(
- reinterpret_cast<char*>(mem), size,
- (readonly) ? PyBUF_READ : PyBUF_WRITE);
- if (!ptr)
- pybind11_fail("Could not allocate memoryview object!");
- return memoryview(object(ptr, stolen_t{}));
- }
-
- static memoryview from_memory(const void *mem, ssize_t size) {
- return memoryview::from_memory(const_cast<void*>(mem), size, true);
- }
-#endif
-};
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-inline memoryview memoryview::from_buffer(
- void *ptr, ssize_t itemsize, const char* format,
- detail::any_container<ssize_t> shape,
- detail::any_container<ssize_t> strides, bool readonly) {
- size_t ndim = shape->size();
- if (ndim != strides->size())
- pybind11_fail("memoryview: shape length doesn't match strides length");
- ssize_t size = ndim ? 1 : 0;
- for (size_t i = 0; i < ndim; ++i)
- size *= (*shape)[i];
- Py_buffer view;
- view.buf = ptr;
- view.obj = nullptr;
- view.len = size * itemsize;
- view.readonly = static_cast<int>(readonly);
- view.itemsize = itemsize;
- view.format = const_cast<char*>(format);
- view.ndim = static_cast<int>(ndim);
- view.shape = shape->data();
- view.strides = strides->data();
- view.suboffsets = nullptr;
- view.internal = nullptr;
- PyObject* obj = PyMemoryView_FromBuffer(&view);
- if (!obj)
- throw error_already_set();
- return memoryview(object(obj, stolen_t{}));
-}
-#endif // DOXYGEN_SHOULD_SKIP_THIS
-/// @} pytypes
-
-/// \addtogroup python_builtins
-/// @{
-
-/// Get the length of a Python object.
-inline size_t len(handle h) {
- ssize_t result = PyObject_Length(h.ptr());
- if (result < 0)
- throw error_already_set();
- return (size_t) result;
-}
-
-/// Get the length hint of a Python object.
-/// Returns 0 when this cannot be determined.
-inline size_t len_hint(handle h) {
-#if PY_VERSION_HEX >= 0x03040000
- ssize_t result = PyObject_LengthHint(h.ptr(), 0);
-#else
- ssize_t result = PyObject_Length(h.ptr());
-#endif
- if (result < 0) {
- // Sometimes a length can't be determined at all (eg generators)
- // In which case simply return 0
- PyErr_Clear();
- return 0;
- }
- return (size_t) result;
-}
-
-inline str repr(handle h) {
- PyObject *str_value = PyObject_Repr(h.ptr());
- if (!str_value) throw error_already_set();
-#if PY_MAJOR_VERSION < 3
- PyObject *unicode = PyUnicode_FromEncodedObject(str_value, "utf-8", nullptr);
- Py_XDECREF(str_value); str_value = unicode;
- if (!str_value) throw error_already_set();
-#endif
- return reinterpret_steal<str>(str_value);
-}
-
-inline iterator iter(handle obj) {
- PyObject *result = PyObject_GetIter(obj.ptr());
- if (!result) { throw error_already_set(); }
- return reinterpret_steal<iterator>(result);
-}
-/// @} python_builtins
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-template <typename D> iterator object_api<D>::begin() const { return iter(derived()); }
-template <typename D> iterator object_api<D>::end() const { return iterator::sentinel(); }
-template <typename D> item_accessor object_api<D>::operator[](handle key) const {
- return {derived(), reinterpret_borrow<object>(key)};
-}
-template <typename D> item_accessor object_api<D>::operator[](const char *key) const {
- return {derived(), pybind11::str(key)};
-}
-template <typename D> obj_attr_accessor object_api<D>::attr(handle key) const {
- return {derived(), reinterpret_borrow<object>(key)};
-}
-template <typename D> str_attr_accessor object_api<D>::attr(const char *key) const {
- return {derived(), key};
-}
-template <typename D> args_proxy object_api<D>::operator*() const {
- return args_proxy(derived().ptr());
-}
-template <typename D> template <typename T> bool object_api<D>::contains(T &&item) const {
- return attr("__contains__")(std::forward<T>(item)).template cast<bool>();
-}
-
-template <typename D>
-pybind11::str object_api<D>::str() const { return pybind11::str(derived()); }
-
-template <typename D>
-str_attr_accessor object_api<D>::doc() const { return attr("__doc__"); }
-
-template <typename D>
-handle object_api<D>::get_type() const { return type::handle_of(derived()); }
-
-template <typename D>
-bool object_api<D>::rich_compare(object_api const &other, int value) const {
- int rv = PyObject_RichCompareBool(derived().ptr(), other.derived().ptr(), value);
- if (rv == -1)
- throw error_already_set();
- return rv == 1;
-}
-
-#define PYBIND11_MATH_OPERATOR_UNARY(op, fn) \
- template <typename D> object object_api<D>::op() const { \
- object result = reinterpret_steal<object>(fn(derived().ptr())); \
- if (!result.ptr()) \
- throw error_already_set(); \
- return result; \
- }
-
-#define PYBIND11_MATH_OPERATOR_BINARY(op, fn) \
- template <typename D> \
- object object_api<D>::op(object_api const &other) const { \
- object result = reinterpret_steal<object>( \
- fn(derived().ptr(), other.derived().ptr())); \
- if (!result.ptr()) \
- throw error_already_set(); \
- return result; \
- }
-
-PYBIND11_MATH_OPERATOR_UNARY (operator~, PyNumber_Invert)
-PYBIND11_MATH_OPERATOR_UNARY (operator-, PyNumber_Negative)
-PYBIND11_MATH_OPERATOR_BINARY(operator+, PyNumber_Add)
-PYBIND11_MATH_OPERATOR_BINARY(operator+=, PyNumber_InPlaceAdd)
-PYBIND11_MATH_OPERATOR_BINARY(operator-, PyNumber_Subtract)
-PYBIND11_MATH_OPERATOR_BINARY(operator-=, PyNumber_InPlaceSubtract)
-PYBIND11_MATH_OPERATOR_BINARY(operator*, PyNumber_Multiply)
-PYBIND11_MATH_OPERATOR_BINARY(operator*=, PyNumber_InPlaceMultiply)
-PYBIND11_MATH_OPERATOR_BINARY(operator/, PyNumber_TrueDivide)
-PYBIND11_MATH_OPERATOR_BINARY(operator/=, PyNumber_InPlaceTrueDivide)
-PYBIND11_MATH_OPERATOR_BINARY(operator|, PyNumber_Or)
-PYBIND11_MATH_OPERATOR_BINARY(operator|=, PyNumber_InPlaceOr)
-PYBIND11_MATH_OPERATOR_BINARY(operator&, PyNumber_And)
-PYBIND11_MATH_OPERATOR_BINARY(operator&=, PyNumber_InPlaceAnd)
-PYBIND11_MATH_OPERATOR_BINARY(operator^, PyNumber_Xor)
-PYBIND11_MATH_OPERATOR_BINARY(operator^=, PyNumber_InPlaceXor)
-PYBIND11_MATH_OPERATOR_BINARY(operator<<, PyNumber_Lshift)
-PYBIND11_MATH_OPERATOR_BINARY(operator<<=, PyNumber_InPlaceLshift)
-PYBIND11_MATH_OPERATOR_BINARY(operator>>, PyNumber_Rshift)
-PYBIND11_MATH_OPERATOR_BINARY(operator>>=, PyNumber_InPlaceRshift)
-
-#undef PYBIND11_MATH_OPERATOR_UNARY
-#undef PYBIND11_MATH_OPERATOR_BINARY
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/stl.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/stl.h
deleted file mode 100644
index 721bb669f0279cd876b3d2cfa038348293bb29f2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/stl.h
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- pybind11/stl.h: Transparent conversion for STL data types
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-#include <set>
-#include <unordered_set>
-#include <map>
-#include <unordered_map>
-#include <iostream>
-#include <list>
-#include <deque>
-#include <valarray>
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
-#endif
-
-#ifdef __has_include
-// std::optional (but including it in c++14 mode isn't allowed)
-# if defined(PYBIND11_CPP17) && __has_include(<optional>)
-# include <optional>
-# define PYBIND11_HAS_OPTIONAL 1
-# endif
-// std::experimental::optional (but not allowed in c++11 mode)
-# if defined(PYBIND11_CPP14) && (__has_include(<experimental/optional>) && \
- !__has_include(<optional>))
-# include <experimental/optional>
-# define PYBIND11_HAS_EXP_OPTIONAL 1
-# endif
-// std::variant
-# if defined(PYBIND11_CPP17) && __has_include(<variant>)
-# include <variant>
-# define PYBIND11_HAS_VARIANT 1
-# endif
-#elif defined(_MSC_VER) && defined(PYBIND11_CPP17)
-# include <optional>
-# include <variant>
-# define PYBIND11_HAS_OPTIONAL 1
-# define PYBIND11_HAS_VARIANT 1
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// Extracts an const lvalue reference or rvalue reference for U based on the type of T (e.g. for
-/// forwarding a container element). Typically used indirect via forwarded_type(), below.
-template <typename T, typename U>
-using forwarded_type = conditional_t<
- std::is_lvalue_reference<T>::value, remove_reference_t<U> &, remove_reference_t<U> &&>;
-
-/// Forwards a value U as rvalue or lvalue according to whether T is rvalue or lvalue; typically
-/// used for forwarding a container's elements.
-template <typename T, typename U>
-forwarded_type<T, U> forward_like(U &&u) {
- return std::forward<detail::forwarded_type<T, U>>(std::forward<U>(u));
-}
-
-template <typename Type, typename Key> struct set_caster {
- using type = Type;
- using key_conv = make_caster<Key>;
-
- bool load(handle src, bool convert) {
- if (!isinstance<pybind11::set>(src))
- return false;
- auto s = reinterpret_borrow<pybind11::set>(src);
- value.clear();
- for (auto entry : s) {
- key_conv conv;
- if (!conv.load(entry, convert))
- return false;
- value.insert(cast_op<Key &&>(std::move(conv)));
- }
- return true;
- }
-
- template <typename T>
- static handle cast(T &&src, return_value_policy policy, handle parent) {
- if (!std::is_lvalue_reference<T>::value)
- policy = return_value_policy_override<Key>::policy(policy);
- pybind11::set s;
- for (auto &&value : src) {
- auto value_ = reinterpret_steal<object>(key_conv::cast(forward_like<T>(value), policy, parent));
- if (!value_ || !s.add(value_))
- return handle();
- }
- return s.release();
- }
-
- PYBIND11_TYPE_CASTER(type, _("Set[") + key_conv::name + _("]"));
-};
-
-template <typename Type, typename Key, typename Value> struct map_caster {
- using key_conv = make_caster<Key>;
- using value_conv = make_caster<Value>;
-
- bool load(handle src, bool convert) {
- if (!isinstance<dict>(src))
- return false;
- auto d = reinterpret_borrow<dict>(src);
- value.clear();
- for (auto it : d) {
- key_conv kconv;
- value_conv vconv;
- if (!kconv.load(it.first.ptr(), convert) ||
- !vconv.load(it.second.ptr(), convert))
- return false;
- value.emplace(cast_op<Key &&>(std::move(kconv)), cast_op<Value &&>(std::move(vconv)));
- }
- return true;
- }
-
- template <typename T>
- static handle cast(T &&src, return_value_policy policy, handle parent) {
- dict d;
- return_value_policy policy_key = policy;
- return_value_policy policy_value = policy;
- if (!std::is_lvalue_reference<T>::value) {
- policy_key = return_value_policy_override<Key>::policy(policy_key);
- policy_value = return_value_policy_override<Value>::policy(policy_value);
- }
- for (auto &&kv : src) {
- auto key = reinterpret_steal<object>(key_conv::cast(forward_like<T>(kv.first), policy_key, parent));
- auto value = reinterpret_steal<object>(value_conv::cast(forward_like<T>(kv.second), policy_value, parent));
- if (!key || !value)
- return handle();
- d[key] = value;
- }
- return d.release();
- }
-
- PYBIND11_TYPE_CASTER(Type, _("Dict[") + key_conv::name + _(", ") + value_conv::name + _("]"));
-};
-
-template <typename Type, typename Value> struct list_caster {
- using value_conv = make_caster<Value>;
-
- bool load(handle src, bool convert) {
- if (!isinstance<sequence>(src) || isinstance<str>(src))
- return false;
- auto s = reinterpret_borrow<sequence>(src);
- value.clear();
- reserve_maybe(s, &value);
- for (auto it : s) {
- value_conv conv;
- if (!conv.load(it, convert))
- return false;
- value.push_back(cast_op<Value &&>(std::move(conv)));
- }
- return true;
- }
-
-private:
- template <typename T = Type,
- enable_if_t<std::is_same<decltype(std::declval<T>().reserve(0)), void>::value, int> = 0>
- void reserve_maybe(sequence s, Type *) { value.reserve(s.size()); }
- void reserve_maybe(sequence, void *) { }
-
-public:
- template <typename T>
- static handle cast(T &&src, return_value_policy policy, handle parent) {
- if (!std::is_lvalue_reference<T>::value)
- policy = return_value_policy_override<Value>::policy(policy);
- list l(src.size());
- size_t index = 0;
- for (auto &&value : src) {
- auto value_ = reinterpret_steal<object>(value_conv::cast(forward_like<T>(value), policy, parent));
- if (!value_)
- return handle();
- PyList_SET_ITEM(l.ptr(), (ssize_t) index++, value_.release().ptr()); // steals a reference
- }
- return l.release();
- }
-
- PYBIND11_TYPE_CASTER(Type, _("List[") + value_conv::name + _("]"));
-};
-
-template <typename Type, typename Alloc> struct type_caster<std::vector<Type, Alloc>>
- : list_caster<std::vector<Type, Alloc>, Type> { };
-
-template <typename Type, typename Alloc> struct type_caster<std::deque<Type, Alloc>>
- : list_caster<std::deque<Type, Alloc>, Type> { };
-
-template <typename Type, typename Alloc> struct type_caster<std::list<Type, Alloc>>
- : list_caster<std::list<Type, Alloc>, Type> { };
-
-template <typename ArrayType, typename Value, bool Resizable, size_t Size = 0> struct array_caster {
- using value_conv = make_caster<Value>;
-
-private:
- template <bool R = Resizable>
- bool require_size(enable_if_t<R, size_t> size) {
- if (value.size() != size)
- value.resize(size);
- return true;
- }
- template <bool R = Resizable>
- bool require_size(enable_if_t<!R, size_t> size) {
- return size == Size;
- }
-
-public:
- bool load(handle src, bool convert) {
- if (!isinstance<sequence>(src))
- return false;
- auto l = reinterpret_borrow<sequence>(src);
- if (!require_size(l.size()))
- return false;
- size_t ctr = 0;
- for (auto it : l) {
- value_conv conv;
- if (!conv.load(it, convert))
- return false;
- value[ctr++] = cast_op<Value &&>(std::move(conv));
- }
- return true;
- }
-
- template <typename T>
- static handle cast(T &&src, return_value_policy policy, handle parent) {
- list l(src.size());
- size_t index = 0;
- for (auto &&value : src) {
- auto value_ = reinterpret_steal<object>(value_conv::cast(forward_like<T>(value), policy, parent));
- if (!value_)
- return handle();
- PyList_SET_ITEM(l.ptr(), (ssize_t) index++, value_.release().ptr()); // steals a reference
- }
- return l.release();
- }
-
- PYBIND11_TYPE_CASTER(ArrayType, _("List[") + value_conv::name + _<Resizable>(_(""), _("[") + _<Size>() + _("]")) + _("]"));
-};
-
-template <typename Type, size_t Size> struct type_caster<std::array<Type, Size>>
- : array_caster<std::array<Type, Size>, Type, false, Size> { };
-
-template <typename Type> struct type_caster<std::valarray<Type>>
- : array_caster<std::valarray<Type>, Type, true> { };
-
-template <typename Key, typename Compare, typename Alloc> struct type_caster<std::set<Key, Compare, Alloc>>
- : set_caster<std::set<Key, Compare, Alloc>, Key> { };
-
-template <typename Key, typename Hash, typename Equal, typename Alloc> struct type_caster<std::unordered_set<Key, Hash, Equal, Alloc>>
- : set_caster<std::unordered_set<Key, Hash, Equal, Alloc>, Key> { };
-
-template <typename Key, typename Value, typename Compare, typename Alloc> struct type_caster<std::map<Key, Value, Compare, Alloc>>
- : map_caster<std::map<Key, Value, Compare, Alloc>, Key, Value> { };
-
-template <typename Key, typename Value, typename Hash, typename Equal, typename Alloc> struct type_caster<std::unordered_map<Key, Value, Hash, Equal, Alloc>>
- : map_caster<std::unordered_map<Key, Value, Hash, Equal, Alloc>, Key, Value> { };
-
-// This type caster is intended to be used for std::optional and std::experimental::optional
-template<typename T> struct optional_caster {
- using value_conv = make_caster<typename T::value_type>;
-
- template <typename T_>
- static handle cast(T_ &&src, return_value_policy policy, handle parent) {
- if (!src)
- return none().inc_ref();
- if (!std::is_lvalue_reference<T>::value) {
- policy = return_value_policy_override<T>::policy(policy);
- }
- return value_conv::cast(*std::forward<T_>(src), policy, parent);
- }
-
- bool load(handle src, bool convert) {
- if (!src) {
- return false;
- } else if (src.is_none()) {
- return true; // default-constructed value is already empty
- }
- value_conv inner_caster;
- if (!inner_caster.load(src, convert))
- return false;
-
- value.emplace(cast_op<typename T::value_type &&>(std::move(inner_caster)));
- return true;
- }
-
- PYBIND11_TYPE_CASTER(T, _("Optional[") + value_conv::name + _("]"));
-};
-
-#if defined(PYBIND11_HAS_OPTIONAL)
-template<typename T> struct type_caster<std::optional<T>>
- : public optional_caster<std::optional<T>> {};
-
-template<> struct type_caster<std::nullopt_t>
- : public void_caster<std::nullopt_t> {};
-#endif
-
-#if defined(PYBIND11_HAS_EXP_OPTIONAL)
-template<typename T> struct type_caster<std::experimental::optional<T>>
- : public optional_caster<std::experimental::optional<T>> {};
-
-template<> struct type_caster<std::experimental::nullopt_t>
- : public void_caster<std::experimental::nullopt_t> {};
-#endif
-
-/// Visit a variant and cast any found type to Python
-struct variant_caster_visitor {
- return_value_policy policy;
- handle parent;
-
- using result_type = handle; // required by boost::variant in C++11
-
- template <typename T>
- result_type operator()(T &&src) const {
- return make_caster<T>::cast(std::forward<T>(src), policy, parent);
- }
-};
-
-/// Helper class which abstracts away variant's `visit` function. `std::variant` and similar
-/// `namespace::variant` types which provide a `namespace::visit()` function are handled here
-/// automatically using argument-dependent lookup. Users can provide specializations for other
-/// variant-like classes, e.g. `boost::variant` and `boost::apply_visitor`.
-template <template<typename...> class Variant>
-struct visit_helper {
- template <typename... Args>
- static auto call(Args &&...args) -> decltype(visit(std::forward<Args>(args)...)) {
- return visit(std::forward<Args>(args)...);
- }
-};
-
-/// Generic variant caster
-template <typename Variant> struct variant_caster;
-
-template <template<typename...> class V, typename... Ts>
-struct variant_caster<V<Ts...>> {
- static_assert(sizeof...(Ts) > 0, "Variant must consist of at least one alternative.");
-
- template <typename U, typename... Us>
- bool load_alternative(handle src, bool convert, type_list<U, Us...>) {
- auto caster = make_caster<U>();
- if (caster.load(src, convert)) {
- value = cast_op<U>(caster);
- return true;
- }
- return load_alternative(src, convert, type_list<Us...>{});
- }
-
- bool load_alternative(handle, bool, type_list<>) { return false; }
-
- bool load(handle src, bool convert) {
- // Do a first pass without conversions to improve constructor resolution.
- // E.g. `py::int_(1).cast<variant<double, int>>()` needs to fill the `int`
- // slot of the variant. Without two-pass loading `double` would be filled
- // because it appears first and a conversion is possible.
- if (convert && load_alternative(src, false, type_list<Ts...>{}))
- return true;
- return load_alternative(src, convert, type_list<Ts...>{});
- }
-
- template <typename Variant>
- static handle cast(Variant &&src, return_value_policy policy, handle parent) {
- return visit_helper<V>::call(variant_caster_visitor{policy, parent},
- std::forward<Variant>(src));
- }
-
- using Type = V<Ts...>;
- PYBIND11_TYPE_CASTER(Type, _("Union[") + detail::concat(make_caster<Ts>::name...) + _("]"));
-};
-
-#if defined(PYBIND11_HAS_VARIANT)
-template <typename... Ts>
-struct type_caster<std::variant<Ts...>> : variant_caster<std::variant<Ts...>> { };
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-
-inline std::ostream &operator<<(std::ostream &os, const handle &obj) {
- os << (std::string) str(obj);
- return os;
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
diff --git a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/stl_bind.h b/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/stl_bind.h
deleted file mode 100644
index 9d8ed0c8258103d9bb677e61abfa234b3ee74889..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/include/pybind11/stl_bind.h
+++ /dev/null
@@ -1,661 +0,0 @@
-/*
- pybind11/std_bind.h: Binding generators for STL data types
-
- Copyright (c) 2016 Sergey Lyskov and Wenzel Jakob
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-#include "operators.h"
-
-#include <algorithm>
-#include <sstream>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/* SFINAE helper class used by 'is_comparable */
-template <typename T> struct container_traits {
- template <typename T2> static std::true_type test_comparable(decltype(std::declval<const T2 &>() == std::declval<const T2 &>())*);
- template <typename T2> static std::false_type test_comparable(...);
- template <typename T2> static std::true_type test_value(typename T2::value_type *);
- template <typename T2> static std::false_type test_value(...);
- template <typename T2> static std::true_type test_pair(typename T2::first_type *, typename T2::second_type *);
- template <typename T2> static std::false_type test_pair(...);
-
- static constexpr const bool is_comparable = std::is_same<std::true_type, decltype(test_comparable<T>(nullptr))>::value;
- static constexpr const bool is_pair = std::is_same<std::true_type, decltype(test_pair<T>(nullptr, nullptr))>::value;
- static constexpr const bool is_vector = std::is_same<std::true_type, decltype(test_value<T>(nullptr))>::value;
- static constexpr const bool is_element = !is_pair && !is_vector;
-};
-
-/* Default: is_comparable -> std::false_type */
-template <typename T, typename SFINAE = void>
-struct is_comparable : std::false_type { };
-
-/* For non-map data structures, check whether operator== can be instantiated */
-template <typename T>
-struct is_comparable<
- T, enable_if_t<container_traits<T>::is_element &&
- container_traits<T>::is_comparable>>
- : std::true_type { };
-
-/* For a vector/map data structure, recursively check the value type (which is std::pair for maps) */
-template <typename T>
-struct is_comparable<T, enable_if_t<container_traits<T>::is_vector>> {
- static constexpr const bool value =
- is_comparable<typename T::value_type>::value;
-};
-
-/* For pairs, recursively check the two data types */
-template <typename T>
-struct is_comparable<T, enable_if_t<container_traits<T>::is_pair>> {
- static constexpr const bool value =
- is_comparable<typename T::first_type>::value &&
- is_comparable<typename T::second_type>::value;
-};
-
-/* Fallback functions */
-template <typename, typename, typename... Args> void vector_if_copy_constructible(const Args &...) { }
-template <typename, typename, typename... Args> void vector_if_equal_operator(const Args &...) { }
-template <typename, typename, typename... Args> void vector_if_insertion_operator(const Args &...) { }
-template <typename, typename, typename... Args> void vector_modifiers(const Args &...) { }
-
-template<typename Vector, typename Class_>
-void vector_if_copy_constructible(enable_if_t<is_copy_constructible<Vector>::value, Class_> &cl) {
- cl.def(init<const Vector &>(), "Copy constructor");
-}
-
-template<typename Vector, typename Class_>
-void vector_if_equal_operator(enable_if_t<is_comparable<Vector>::value, Class_> &cl) {
- using T = typename Vector::value_type;
-
- cl.def(self == self);
- cl.def(self != self);
-
- cl.def("count",
- [](const Vector &v, const T &x) {
- return std::count(v.begin(), v.end(), x);
- },
- arg("x"),
- "Return the number of times ``x`` appears in the list"
- );
-
- cl.def("remove", [](Vector &v, const T &x) {
- auto p = std::find(v.begin(), v.end(), x);
- if (p != v.end())
- v.erase(p);
- else
- throw value_error();
- },
- arg("x"),
- "Remove the first item from the list whose value is x. "
- "It is an error if there is no such item."
- );
-
- cl.def("__contains__",
- [](const Vector &v, const T &x) {
- return std::find(v.begin(), v.end(), x) != v.end();
- },
- arg("x"),
- "Return true the container contains ``x``"
- );
-}
-
-// Vector modifiers -- requires a copyable vector_type:
-// (Technically, some of these (pop and __delitem__) don't actually require copyability, but it seems
-// silly to allow deletion but not insertion, so include them here too.)
-template <typename Vector, typename Class_>
-void vector_modifiers(enable_if_t<is_copy_constructible<typename Vector::value_type>::value, Class_> &cl) {
- using T = typename Vector::value_type;
- using SizeType = typename Vector::size_type;
- using DiffType = typename Vector::difference_type;
-
- auto wrap_i = [](DiffType i, SizeType n) {
- if (i < 0)
- i += n;
- if (i < 0 || (SizeType)i >= n)
- throw index_error();
- return i;
- };
-
- cl.def("append",
- [](Vector &v, const T &value) { v.push_back(value); },
- arg("x"),
- "Add an item to the end of the list");
-
- cl.def(init([](iterable it) {
- auto v = std::unique_ptr<Vector>(new Vector());
- v->reserve(len_hint(it));
- for (handle h : it)
- v->push_back(h.cast<T>());
- return v.release();
- }));
-
- cl.def("clear",
- [](Vector &v) {
- v.clear();
- },
- "Clear the contents"
- );
-
- cl.def("extend",
- [](Vector &v, const Vector &src) {
- v.insert(v.end(), src.begin(), src.end());
- },
- arg("L"),
- "Extend the list by appending all the items in the given list"
- );
-
- cl.def("extend",
- [](Vector &v, iterable it) {
- const size_t old_size = v.size();
- v.reserve(old_size + len_hint(it));
- try {
- for (handle h : it) {
- v.push_back(h.cast<T>());
- }
- } catch (const cast_error &) {
- v.erase(v.begin() + static_cast<typename Vector::difference_type>(old_size), v.end());
- try {
- v.shrink_to_fit();
- } catch (const std::exception &) {
- // Do nothing
- }
- throw;
- }
- },
- arg("L"),
- "Extend the list by appending all the items in the given list"
- );
-
- cl.def("insert",
- [](Vector &v, DiffType i, const T &x) {
- // Can't use wrap_i; i == v.size() is OK
- if (i < 0)
- i += v.size();
- if (i < 0 || (SizeType)i > v.size())
- throw index_error();
- v.insert(v.begin() + i, x);
- },
- arg("i") , arg("x"),
- "Insert an item at a given position."
- );
-
- cl.def("pop",
- [](Vector &v) {
- if (v.empty())
- throw index_error();
- T t = v.back();
- v.pop_back();
- return t;
- },
- "Remove and return the last item"
- );
-
- cl.def("pop",
- [wrap_i](Vector &v, DiffType i) {
- i = wrap_i(i, v.size());
- T t = v[(SizeType) i];
- v.erase(v.begin() + i);
- return t;
- },
- arg("i"),
- "Remove and return the item at index ``i``"
- );
-
- cl.def("__setitem__",
- [wrap_i](Vector &v, DiffType i, const T &t) {
- i = wrap_i(i, v.size());
- v[(SizeType)i] = t;
- }
- );
-
- /// Slicing protocol
- cl.def("__getitem__",
- [](const Vector &v, slice slice) -> Vector * {
- size_t start, stop, step, slicelength;
-
- if (!slice.compute(v.size(), &start, &stop, &step, &slicelength))
- throw error_already_set();
-
- auto *seq = new Vector();
- seq->reserve((size_t) slicelength);
-
- for (size_t i=0; i<slicelength; ++i) {
- seq->push_back(v[start]);
- start += step;
- }
- return seq;
- },
- arg("s"),
- "Retrieve list elements using a slice object"
- );
-
- cl.def("__setitem__",
- [](Vector &v, slice slice, const Vector &value) {
- size_t start, stop, step, slicelength;
- if (!slice.compute(v.size(), &start, &stop, &step, &slicelength))
- throw error_already_set();
-
- if (slicelength != value.size())
- throw std::runtime_error("Left and right hand size of slice assignment have different sizes!");
-
- for (size_t i=0; i<slicelength; ++i) {
- v[start] = value[i];
- start += step;
- }
- },
- "Assign list elements using a slice object"
- );
-
- cl.def("__delitem__",
- [wrap_i](Vector &v, DiffType i) {
- i = wrap_i(i, v.size());
- v.erase(v.begin() + i);
- },
- "Delete the list elements at index ``i``"
- );
-
- cl.def("__delitem__",
- [](Vector &v, slice slice) {
- size_t start, stop, step, slicelength;
-
- if (!slice.compute(v.size(), &start, &stop, &step, &slicelength))
- throw error_already_set();
-
- if (step == 1 && false) {
- v.erase(v.begin() + (DiffType) start, v.begin() + DiffType(start + slicelength));
- } else {
- for (size_t i = 0; i < slicelength; ++i) {
- v.erase(v.begin() + DiffType(start));
- start += step - 1;
- }
- }
- },
- "Delete list elements using a slice object"
- );
-
-}
-
-// If the type has an operator[] that doesn't return a reference (most notably std::vector<bool>),
-// we have to access by copying; otherwise we return by reference.
-template <typename Vector> using vector_needs_copy = negation<
- std::is_same<decltype(std::declval<Vector>()[typename Vector::size_type()]), typename Vector::value_type &>>;
-
-// The usual case: access and iterate by reference
-template <typename Vector, typename Class_>
-void vector_accessor(enable_if_t<!vector_needs_copy<Vector>::value, Class_> &cl) {
- using T = typename Vector::value_type;
- using SizeType = typename Vector::size_type;
- using DiffType = typename Vector::difference_type;
- using ItType = typename Vector::iterator;
-
- auto wrap_i = [](DiffType i, SizeType n) {
- if (i < 0)
- i += n;
- if (i < 0 || (SizeType)i >= n)
- throw index_error();
- return i;
- };
-
- cl.def("__getitem__",
- [wrap_i](Vector &v, DiffType i) -> T & {
- i = wrap_i(i, v.size());
- return v[(SizeType)i];
- },
- return_value_policy::reference_internal // ref + keepalive
- );
-
- cl.def("__iter__",
- [](Vector &v) {
- return make_iterator<
- return_value_policy::reference_internal, ItType, ItType, T&>(
- v.begin(), v.end());
- },
- keep_alive<0, 1>() /* Essential: keep list alive while iterator exists */
- );
-}
-
-// The case for special objects, like std::vector<bool>, that have to be returned-by-copy:
-template <typename Vector, typename Class_>
-void vector_accessor(enable_if_t<vector_needs_copy<Vector>::value, Class_> &cl) {
- using T = typename Vector::value_type;
- using SizeType = typename Vector::size_type;
- using DiffType = typename Vector::difference_type;
- using ItType = typename Vector::iterator;
- cl.def("__getitem__",
- [](const Vector &v, DiffType i) -> T {
- if (i < 0 && (i += v.size()) < 0)
- throw index_error();
- if ((SizeType)i >= v.size())
- throw index_error();
- return v[(SizeType)i];
- }
- );
-
- cl.def("__iter__",
- [](Vector &v) {
- return make_iterator<
- return_value_policy::copy, ItType, ItType, T>(
- v.begin(), v.end());
- },
- keep_alive<0, 1>() /* Essential: keep list alive while iterator exists */
- );
-}
-
-template <typename Vector, typename Class_> auto vector_if_insertion_operator(Class_ &cl, std::string const &name)
- -> decltype(std::declval<std::ostream&>() << std::declval<typename Vector::value_type>(), void()) {
- using size_type = typename Vector::size_type;
-
- cl.def("__repr__",
- [name](Vector &v) {
- std::ostringstream s;
- s << name << '[';
- for (size_type i=0; i < v.size(); ++i) {
- s << v[i];
- if (i != v.size() - 1)
- s << ", ";
- }
- s << ']';
- return s.str();
- },
- "Return the canonical string representation of this list."
- );
-}
-
-// Provide the buffer interface for vectors if we have data() and we have a format for it
-// GCC seems to have "void std::vector<bool>::data()" - doing SFINAE on the existence of data() is insufficient, we need to check it returns an appropriate pointer
-template <typename Vector, typename = void>
-struct vector_has_data_and_format : std::false_type {};
-template <typename Vector>
-struct vector_has_data_and_format<Vector, enable_if_t<std::is_same<decltype(format_descriptor<typename Vector::value_type>::format(), std::declval<Vector>().data()), typename Vector::value_type*>::value>> : std::true_type {};
-
-// Add the buffer interface to a vector
-template <typename Vector, typename Class_, typename... Args>
-enable_if_t<detail::any_of<std::is_same<Args, buffer_protocol>...>::value>
-vector_buffer(Class_& cl) {
- using T = typename Vector::value_type;
-
- static_assert(vector_has_data_and_format<Vector>::value, "There is not an appropriate format descriptor for this vector");
-
- // numpy.h declares this for arbitrary types, but it may raise an exception and crash hard at runtime if PYBIND11_NUMPY_DTYPE hasn't been called, so check here
- format_descriptor<T>::format();
-
- cl.def_buffer([](Vector& v) -> buffer_info {
- return buffer_info(v.data(), static_cast<ssize_t>(sizeof(T)), format_descriptor<T>::format(), 1, {v.size()}, {sizeof(T)});
- });
-
- cl.def(init([](buffer buf) {
- auto info = buf.request();
- if (info.ndim != 1 || info.strides[0] % static_cast<ssize_t>(sizeof(T)))
- throw type_error("Only valid 1D buffers can be copied to a vector");
- if (!detail::compare_buffer_info<T>::compare(info) || (ssize_t) sizeof(T) != info.itemsize)
- throw type_error("Format mismatch (Python: " + info.format + " C++: " + format_descriptor<T>::format() + ")");
-
- T *p = static_cast<T*>(info.ptr);
- ssize_t step = info.strides[0] / static_cast<ssize_t>(sizeof(T));
- T *end = p + info.shape[0] * step;
- if (step == 1) {
- return Vector(p, end);
- }
- else {
- Vector vec;
- vec.reserve((size_t) info.shape[0]);
- for (; p != end; p += step)
- vec.push_back(*p);
- return vec;
- }
- }));
-
- return;
-}
-
-template <typename Vector, typename Class_, typename... Args>
-enable_if_t<!detail::any_of<std::is_same<Args, buffer_protocol>...>::value> vector_buffer(Class_&) {}
-
-PYBIND11_NAMESPACE_END(detail)
-
-//
-// std::vector
-//
-template <typename Vector, typename holder_type = std::unique_ptr<Vector>, typename... Args>
-class_<Vector, holder_type> bind_vector(handle scope, std::string const &name, Args&&... args) {
- using Class_ = class_<Vector, holder_type>;
-
- // If the value_type is unregistered (e.g. a converting type) or is itself registered
- // module-local then make the vector binding module-local as well:
- using vtype = typename Vector::value_type;
- auto vtype_info = detail::get_type_info(typeid(vtype));
- bool local = !vtype_info || vtype_info->module_local;
-
- Class_ cl(scope, name.c_str(), pybind11::module_local(local), std::forward<Args>(args)...);
-
- // Declare the buffer interface if a buffer_protocol() is passed in
- detail::vector_buffer<Vector, Class_, Args...>(cl);
-
- cl.def(init<>());
-
- // Register copy constructor (if possible)
- detail::vector_if_copy_constructible<Vector, Class_>(cl);
-
- // Register comparison-related operators and functions (if possible)
- detail::vector_if_equal_operator<Vector, Class_>(cl);
-
- // Register stream insertion operator (if possible)
- detail::vector_if_insertion_operator<Vector, Class_>(cl, name);
-
- // Modifiers require copyable vector value type
- detail::vector_modifiers<Vector, Class_>(cl);
-
- // Accessor and iterator; return by value if copyable, otherwise we return by ref + keep-alive
- detail::vector_accessor<Vector, Class_>(cl);
-
- cl.def("__bool__",
- [](const Vector &v) -> bool {
- return !v.empty();
- },
- "Check whether the list is nonempty"
- );
-
- cl.def("__len__", &Vector::size);
-
-
-
-
-#if 0
- // C++ style functions deprecated, leaving it here as an example
- cl.def(init<size_type>());
-
- cl.def("resize",
- (void (Vector::*) (size_type count)) & Vector::resize,
- "changes the number of elements stored");
-
- cl.def("erase",
- [](Vector &v, SizeType i) {
- if (i >= v.size())
- throw index_error();
- v.erase(v.begin() + i);
- }, "erases element at index ``i``");
-
- cl.def("empty", &Vector::empty, "checks whether the container is empty");
- cl.def("size", &Vector::size, "returns the number of elements");
- cl.def("push_back", (void (Vector::*)(const T&)) &Vector::push_back, "adds an element to the end");
- cl.def("pop_back", &Vector::pop_back, "removes the last element");
-
- cl.def("max_size", &Vector::max_size, "returns the maximum possible number of elements");
- cl.def("reserve", &Vector::reserve, "reserves storage");
- cl.def("capacity", &Vector::capacity, "returns the number of elements that can be held in currently allocated storage");
- cl.def("shrink_to_fit", &Vector::shrink_to_fit, "reduces memory usage by freeing unused memory");
-
- cl.def("clear", &Vector::clear, "clears the contents");
- cl.def("swap", &Vector::swap, "swaps the contents");
-
- cl.def("front", [](Vector &v) {
- if (v.size()) return v.front();
- else throw index_error();
- }, "access the first element");
-
- cl.def("back", [](Vector &v) {
- if (v.size()) return v.back();
- else throw index_error();
- }, "access the last element ");
-
-#endif
-
- return cl;
-}
-
-
-
-//
-// std::map, std::unordered_map
-//
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/* Fallback functions */
-template <typename, typename, typename... Args> void map_if_insertion_operator(const Args &...) { }
-template <typename, typename, typename... Args> void map_assignment(const Args &...) { }
-
-// Map assignment when copy-assignable: just copy the value
-template <typename Map, typename Class_>
-void map_assignment(enable_if_t<is_copy_assignable<typename Map::mapped_type>::value, Class_> &cl) {
- using KeyType = typename Map::key_type;
- using MappedType = typename Map::mapped_type;
-
- cl.def("__setitem__",
- [](Map &m, const KeyType &k, const MappedType &v) {
- auto it = m.find(k);
- if (it != m.end()) it->second = v;
- else m.emplace(k, v);
- }
- );
-}
-
-// Not copy-assignable, but still copy-constructible: we can update the value by erasing and reinserting
-template<typename Map, typename Class_>
-void map_assignment(enable_if_t<
- !is_copy_assignable<typename Map::mapped_type>::value &&
- is_copy_constructible<typename Map::mapped_type>::value,
- Class_> &cl) {
- using KeyType = typename Map::key_type;
- using MappedType = typename Map::mapped_type;
-
- cl.def("__setitem__",
- [](Map &m, const KeyType &k, const MappedType &v) {
- // We can't use m[k] = v; because value type might not be default constructable
- auto r = m.emplace(k, v);
- if (!r.second) {
- // value type is not copy assignable so the only way to insert it is to erase it first...
- m.erase(r.first);
- m.emplace(k, v);
- }
- }
- );
-}
-
-
-template <typename Map, typename Class_> auto map_if_insertion_operator(Class_ &cl, std::string const &name)
--> decltype(std::declval<std::ostream&>() << std::declval<typename Map::key_type>() << std::declval<typename Map::mapped_type>(), void()) {
-
- cl.def("__repr__",
- [name](Map &m) {
- std::ostringstream s;
- s << name << '{';
- bool f = false;
- for (auto const &kv : m) {
- if (f)
- s << ", ";
- s << kv.first << ": " << kv.second;
- f = true;
- }
- s << '}';
- return s.str();
- },
- "Return the canonical string representation of this map."
- );
-}
-
-
-PYBIND11_NAMESPACE_END(detail)
-
-template <typename Map, typename holder_type = std::unique_ptr<Map>, typename... Args>
-class_<Map, holder_type> bind_map(handle scope, const std::string &name, Args&&... args) {
- using KeyType = typename Map::key_type;
- using MappedType = typename Map::mapped_type;
- using Class_ = class_<Map, holder_type>;
-
- // If either type is a non-module-local bound type then make the map binding non-local as well;
- // otherwise (e.g. both types are either module-local or converting) the map will be
- // module-local.
- auto tinfo = detail::get_type_info(typeid(MappedType));
- bool local = !tinfo || tinfo->module_local;
- if (local) {
- tinfo = detail::get_type_info(typeid(KeyType));
- local = !tinfo || tinfo->module_local;
- }
-
- Class_ cl(scope, name.c_str(), pybind11::module_local(local), std::forward<Args>(args)...);
-
- cl.def(init<>());
-
- // Register stream insertion operator (if possible)
- detail::map_if_insertion_operator<Map, Class_>(cl, name);
-
- cl.def("__bool__",
- [](const Map &m) -> bool { return !m.empty(); },
- "Check whether the map is nonempty"
- );
-
- cl.def("__iter__",
- [](Map &m) { return make_key_iterator(m.begin(), m.end()); },
- keep_alive<0, 1>() /* Essential: keep list alive while iterator exists */
- );
-
- cl.def("items",
- [](Map &m) { return make_iterator(m.begin(), m.end()); },
- keep_alive<0, 1>() /* Essential: keep list alive while iterator exists */
- );
-
- cl.def("__getitem__",
- [](Map &m, const KeyType &k) -> MappedType & {
- auto it = m.find(k);
- if (it == m.end())
- throw key_error();
- return it->second;
- },
- return_value_policy::reference_internal // ref + keepalive
- );
-
- cl.def("__contains__",
- [](Map &m, const KeyType &k) -> bool {
- auto it = m.find(k);
- if (it == m.end())
- return false;
- return true;
- }
- );
-
- // Assignment provided only if the type is copyable
- detail::map_assignment<Map, Class_>(cl);
-
- cl.def("__delitem__",
- [](Map &m, const KeyType &k) {
- auto it = m.find(k);
- if (it == m.end())
- throw key_error();
- m.erase(it);
- }
- );
-
- cl.def("__len__", &Map::size);
-
- return cl;
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/pybind11/__init__.py b/3rdParty/pybind11/pybind11-2.6.0/pybind11/__init__.py
deleted file mode 100644
index ad65420893d6fdfb9625d42bc326565866a6c9c8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/pybind11/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from ._version import version_info, __version__
-from .commands import get_include, get_cmake_dir
-
-
-__all__ = (
- "version_info",
- "__version__",
- "get_include",
- "get_cmake_dir",
-)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/pybind11/__main__.py b/3rdParty/pybind11/pybind11-2.6.0/pybind11/__main__.py
deleted file mode 100644
index 020988c6713d99ec0188be147084ccd21379c7b6..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/pybind11/__main__.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function
-
-import argparse
-import sys
-import sysconfig
-
-from .commands import get_include, get_cmake_dir
-
-
-def print_includes():
- # type: () -> None
- dirs = [
- sysconfig.get_path("include"),
- sysconfig.get_path("platinclude"),
- get_include(),
- ]
-
- # Make unique but preserve order
- unique_dirs = []
- for d in dirs:
- if d and d not in unique_dirs:
- unique_dirs.append(d)
-
- print(" ".join("-I" + d for d in unique_dirs))
-
-
-def main():
- # type: () -> None
-
- parser = argparse.ArgumentParser()
- parser.add_argument(
- "--includes",
- action="store_true",
- help="Include flags for both pybind11 and Python headers.",
- )
- parser.add_argument(
- "--cmakedir",
- action="store_true",
- help="Print the CMake module directory, ideal for setting -Dpybind11_ROOT in CMake.",
- )
- args = parser.parse_args()
- if not sys.argv[1:]:
- parser.print_help()
- if args.includes:
- print_includes()
- if args.cmakedir:
- print(get_cmake_dir())
-
-
-if __name__ == "__main__":
- main()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/pybind11/_version.py b/3rdParty/pybind11/pybind11-2.6.0/pybind11/_version.py
deleted file mode 100644
index 9d4c547167f888f2874e345a9dfe8e66b9d16be0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/pybind11/_version.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-def _to_int(s):
- try:
- return int(s)
- except ValueError:
- return s
-
-
-__version__ = "2.6.0"
-version_info = tuple(_to_int(s) for s in __version__.split("."))
diff --git a/3rdParty/pybind11/pybind11-2.6.0/pybind11/_version.pyi b/3rdParty/pybind11/pybind11-2.6.0/pybind11/_version.pyi
deleted file mode 100644
index 970184c7707167c8a612182d663d5034f476b370..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/pybind11/_version.pyi
+++ /dev/null
@@ -1,6 +0,0 @@
-from typing import Union, Tuple
-
-def _to_int(s: str) -> Union[int, str]: ...
-
-__version__: str
-version_info: Tuple[Union[int, str], ...]
diff --git a/3rdParty/pybind11/pybind11-2.6.0/pybind11/commands.py b/3rdParty/pybind11/pybind11-2.6.0/pybind11/commands.py
deleted file mode 100644
index 34dbaf8a89621fb1bfdc4eec584c67fd5b526e1d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/pybind11/commands.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-
-
-DIR = os.path.abspath(os.path.dirname(__file__))
-
-
-def get_include(user=False):
- # type: (bool) -> str
- installed_path = os.path.join(DIR, "include")
- source_path = os.path.join(os.path.dirname(DIR), "include")
- return installed_path if os.path.exists(installed_path) else source_path
-
-
-def get_cmake_dir():
- # type: () -> str
- cmake_installed_path = os.path.join(DIR, "share", "cmake", "pybind11")
- if os.path.exists(cmake_installed_path):
- return cmake_installed_path
- else:
- msg = "pybind11 not installed, installation required to access the CMake files"
- raise ImportError(msg)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/pybind11/py.typed b/3rdParty/pybind11/pybind11-2.6.0/pybind11/py.typed
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/3rdParty/pybind11/pybind11-2.6.0/pybind11/setup_helpers.py b/3rdParty/pybind11/pybind11-2.6.0/pybind11/setup_helpers.py
deleted file mode 100644
index 8360970e73d228a8dcd66af3007a6b87637a5b13..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/pybind11/setup_helpers.py
+++ /dev/null
@@ -1,393 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-This module provides helpers for C++11+ projects using pybind11.
-
-LICENSE:
-
-Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>, All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""
-
-# IMPORTANT: If you change this file in the pybind11 repo, also review
-# setup_helpers.pyi for matching changes.
-#
-# If you copy this file in, you don't
-# need the .pyi file; it's just an interface file for static type checkers.
-
-import contextlib
-import os
-import shutil
-import sys
-import tempfile
-import threading
-import warnings
-
-try:
- from setuptools.command.build_ext import build_ext as _build_ext
- from setuptools import Extension as _Extension
-except ImportError:
- from distutils.command.build_ext import build_ext as _build_ext
- from distutils.extension import Extension as _Extension
-
-import distutils.errors
-import distutils.ccompiler
-
-
-WIN = sys.platform.startswith("win32")
-PY2 = sys.version_info[0] < 3
-MACOS = sys.platform.startswith("darwin")
-STD_TMPL = "/std:c++{}" if WIN else "-std=c++{}"
-
-
-# It is recommended to use PEP 518 builds if using this module. However, this
-# file explicitly supports being copied into a user's project directory
-# standalone, and pulling pybind11 with the deprecated setup_requires feature.
-# If you copy the file, remember to add it to your MANIFEST.in, and add the current
-# directory into your path if it sits beside your setup.py.
-
-
-class Pybind11Extension(_Extension):
- """
- Build a C++11+ Extension module with pybind11. This automatically adds the
- recommended flags when you init the extension and assumes C++ sources - you
- can further modify the options yourself.
-
- The customizations are:
-
- * ``/EHsc`` and ``/bigobj`` on Windows
- * ``stdlib=libc++`` on macOS
- * ``visibility=hidden`` and ``-g0`` on Unix
-
- Finally, you can set ``cxx_std`` via constructor or afterwords to enable
- flags for C++ std, and a few extra helper flags related to the C++ standard
- level. It is _highly_ recommended you either set this, or use the provided
- ``build_ext``, which will search for the highest supported extension for
- you if the ``cxx_std`` property is not set. Do not set the ``cxx_std``
- property more than once, as flags are added when you set it. Set the
- property to None to disable the addition of C++ standard flags.
-
- If you want to add pybind11 headers manually, for example for an exact
- git checkout, then set ``include_pybind11=False``.
-
- Warning: do not use property-based access to the instance on Python 2 -
- this is an ugly old-style class due to Distutils.
- """
-
- def _add_cflags(self, *flags):
- for flag in flags:
- if flag not in self.extra_compile_args:
- self.extra_compile_args.append(flag)
-
- def _add_lflags(self, *flags):
- for flag in flags:
- if flag not in self.extra_link_args:
- self.extra_link_args.append(flag)
-
- def __init__(self, *args, **kwargs):
-
- self._cxx_level = 0
- cxx_std = kwargs.pop("cxx_std", 0)
-
- if "language" not in kwargs:
- kwargs["language"] = "c++"
-
- include_pybind11 = kwargs.pop("include_pybind11", True)
-
- # Can't use super here because distutils has old-style classes in
- # Python 2!
- _Extension.__init__(self, *args, **kwargs)
-
- # Include the installed package pybind11 headers
- if include_pybind11:
- # If using setup_requires, this fails the first time - that's okay
- try:
- import pybind11
-
- pyinc = pybind11.get_include()
-
- if pyinc not in self.include_dirs:
- self.include_dirs.append(pyinc)
- except ImportError:
- pass
-
- # Have to use the accessor manually to support Python 2 distutils
- Pybind11Extension.cxx_std.__set__(self, cxx_std)
-
- if WIN:
- self._add_cflags("/EHsc", "/bigobj")
- else:
- self._add_cflags("-fvisibility=hidden", "-g0")
- if MACOS:
- self._add_cflags("-stdlib=libc++")
- self._add_lflags("-stdlib=libc++")
-
- @property
- def cxx_std(self):
- """
- The CXX standard level. If set, will add the required flags. If left
- at 0, it will trigger an automatic search when pybind11's build_ext
- is used. If None, will have no effect. Besides just the flags, this
- may add a register warning/error fix for Python 2 or macos-min 10.9
- or 10.14.
- """
- return self._cxx_level
-
- @cxx_std.setter
- def cxx_std(self, level):
-
- if self._cxx_level:
- warnings.warn("You cannot safely change the cxx_level after setting it!")
-
- # MSVC 2015 Update 3 and later only have 14 (and later 17) modes, so
- # force a valid flag here.
- if WIN and level == 11:
- level = 14
-
- self._cxx_level = level
-
- if not level:
- return
-
- self.extra_compile_args.append(STD_TMPL.format(level))
-
- if MACOS and "MACOSX_DEPLOYMENT_TARGET" not in os.environ:
- # C++17 requires a higher min version of macOS. An earlier version
- # can be set manually via environment variable if you are careful
- # in your feature usage, but 10.14 is the safest setting for
- # general use.
- macosx_min = "-mmacosx-version-min=" + ("10.9" if level < 17 else "10.14")
- self.extra_compile_args.append(macosx_min)
- self.extra_link_args.append(macosx_min)
-
- if PY2:
- if WIN:
- # Will be ignored on MSVC 2015, where C++17 is not supported so
- # this flag is not valid.
- self.extra_compile_args.append("/wd5033")
- elif level >= 17:
- self.extra_compile_args.append("-Wno-register")
- elif level >= 14:
- self.extra_compile_args.append("-Wno-deprecated-register")
-
-
-# Just in case someone clever tries to multithread
-tmp_chdir_lock = threading.Lock()
-cpp_cache_lock = threading.Lock()
-
-
-@contextlib.contextmanager
-def tmp_chdir():
- "Prepare and enter a temporary directory, cleanup when done"
-
- # Threadsafe
- with tmp_chdir_lock:
- olddir = os.getcwd()
- try:
- tmpdir = tempfile.mkdtemp()
- os.chdir(tmpdir)
- yield tmpdir
- finally:
- os.chdir(olddir)
- shutil.rmtree(tmpdir)
-
-
-# cf http://bugs.python.org/issue26689
-def has_flag(compiler, flag):
- """
- Return the flag if a flag name is supported on the
- specified compiler, otherwise None (can be used as a boolean).
- If multiple flags are passed, return the first that matches.
- """
-
- with tmp_chdir():
- fname = "flagcheck.cpp"
- with open(fname, "w") as f:
- f.write("int main (int argc, char **argv) { return 0; }")
-
- try:
- compiler.compile([fname], extra_postargs=[flag])
- except distutils.errors.CompileError:
- return False
- return True
-
-
-# Every call will cache the result
-cpp_flag_cache = None
-
-
-def auto_cpp_level(compiler):
- """
- Return the max supported C++ std level (17, 14, or 11). Returns latest on Windows.
- """
-
- if WIN:
- return "latest"
-
- global cpp_flag_cache
-
- # If this has been previously calculated with the same args, return that
- with cpp_cache_lock:
- if cpp_flag_cache:
- return cpp_flag_cache
-
- levels = [17, 14, 11]
-
- for level in levels:
- if has_flag(compiler, STD_TMPL.format(level)):
- with cpp_cache_lock:
- cpp_flag_cache = level
- return level
-
- msg = "Unsupported compiler -- at least C++11 support is needed!"
- raise RuntimeError(msg)
-
-
-class build_ext(_build_ext): # noqa: N801
- """
- Customized build_ext that allows an auto-search for the highest supported
- C++ level for Pybind11Extension.
- """
-
- def build_extensions(self):
- """
- Build extensions, injecting C++ std for Pybind11Extension if needed.
- """
-
- for ext in self.extensions:
- if hasattr(ext, "_cxx_level") and ext._cxx_level == 0:
- # Python 2 syntax - old-style distutils class
- ext.__class__.cxx_std.__set__(ext, auto_cpp_level(self.compiler))
-
- # Python 2 doesn't allow super here, since distutils uses old-style
- # classes!
- _build_ext.build_extensions(self)
-
-
-# Optional parallel compile utility
-# inspired by: http://stackoverflow.com/questions/11013851/speeding-up-build-process-with-distutils
-# and: https://github.com/tbenthompson/cppimport/blob/stable/cppimport/build_module.py
-# and NumPy's parallel distutils module:
-# https://github.com/numpy/numpy/blob/master/numpy/distutils/ccompiler.py
-class ParallelCompile(object):
- """
- Make a parallel compile function. Inspired by
- numpy.distutils.ccompiler.CCompiler_compile and cppimport.
-
- This takes several arguments that allow you to customize the compile
- function created:
-
- envvar: Set an environment variable to control the compilation threads, like NPY_NUM_BUILD_JOBS
- default: 0 will automatically multithread, or 1 will only multithread if the envvar is set.
- max: The limit for automatic multithreading if non-zero
-
- To use:
- ParallelCompile("NPY_NUM_BUILD_JOBS").install()
- or:
- with ParallelCompile("NPY_NUM_BUILD_JOBS"):
- setup(...)
- """
-
- __slots__ = ("envvar", "default", "max", "old")
-
- def __init__(self, envvar=None, default=0, max=0):
- self.envvar = envvar
- self.default = default
- self.max = max
- self.old = []
-
- def function(self):
- """
- Builds a function object usable as distutils.ccompiler.CCompiler.compile.
- """
-
- def compile_function(
- compiler,
- sources,
- output_dir=None,
- macros=None,
- include_dirs=None,
- debug=0,
- extra_preargs=None,
- extra_postargs=None,
- depends=None,
- ):
-
- # These lines are directly from distutils.ccompiler.CCompiler
- macros, objects, extra_postargs, pp_opts, build = compiler._setup_compile(
- output_dir, macros, include_dirs, sources, depends, extra_postargs
- )
- cc_args = compiler._get_cc_args(pp_opts, debug, extra_preargs)
-
- # The number of threads; start with default.
- threads = self.default
-
- # Determine the number of compilation threads, unless set by an environment variable.
- if self.envvar is not None:
- threads = int(os.environ.get(self.envvar, self.default))
-
- def _single_compile(obj):
- try:
- src, ext = build[obj]
- except KeyError:
- return
- compiler._compile(obj, src, ext, cc_args, extra_postargs, pp_opts)
-
- try:
- import multiprocessing
- from multiprocessing.pool import ThreadPool
- except ImportError:
- threads = 1
-
- if threads == 0:
- try:
- threads = multiprocessing.cpu_count()
- threads = self.max if self.max and self.max < threads else threads
- except NotImplementedError:
- threads = 1
-
- if threads > 1:
- for _ in ThreadPool(threads).imap_unordered(_single_compile, objects):
- pass
- else:
- for ob in objects:
- _single_compile(ob)
-
- return objects
-
- return compile_function
-
- def install(self):
- distutils.ccompiler.CCompiler.compile = self.function()
- return self
-
- def __enter__(self):
- self.old.append(distutils.ccompiler.CCompiler.compile)
- return self.install()
-
- def __exit__(self, *args):
- distutils.ccompiler.CCompiler.compile = self.old.pop()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/pybind11/setup_helpers.pyi b/3rdParty/pybind11/pybind11-2.6.0/pybind11/setup_helpers.pyi
deleted file mode 100644
index 19feb8b3530580b777b2291d99f6b3482731cb46..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/pybind11/setup_helpers.pyi
+++ /dev/null
@@ -1,50 +0,0 @@
-# IMPORTANT: Should stay in sync with setup_helpers.py (mostly checked by CI /
-# pre-commit).
-
-from typing import Any, Iterator, Optional, Type, TypeVar, Union
-from types import TracebackType
-
-from distutils.command.build_ext import build_ext as _build_ext # type: ignore
-from distutils.extension import Extension as _Extension
-import distutils.ccompiler
-import contextlib
-
-WIN: bool
-PY2: bool
-MACOS: bool
-STD_TMPL: str
-
-class Pybind11Extension(_Extension):
- def _add_cflags(self, *flags: str) -> None: ...
- def _add_lflags(self, *flags: str) -> None: ...
- def __init__(
- self, *args: Any, cxx_std: int = 0, language: str = "c++", **kwargs: Any
- ) -> None: ...
- @property
- def cxx_std(self) -> int: ...
- @cxx_std.setter
- def cxx_std(self, level: int) -> None: ...
-
-@contextlib.contextmanager
-def tmp_chdir() -> Iterator[str]: ...
-def has_flag(compiler: distutils.ccompiler.CCompiler, flag: str) -> bool: ...
-def auto_cpp_level(compiler: distutils.ccompiler.CCompiler) -> Union[int, str]: ...
-
-class build_ext(_build_ext): # type: ignore
- def build_extensions(self) -> None: ...
-
-T = TypeVar("T", bound="ParallelCompile")
-
-class ParallelCompile:
- def __init__(
- self, envvar: Optional[str] = None, default: int = 0, max: int = 0
- ): ...
- def function(self) -> Any: ...
- def install(self: T) -> T: ...
- def __enter__(self: T) -> T: ...
- def __exit__(
- self,
- exc_type: Optional[Type[BaseException]],
- exc_value: Optional[BaseException],
- traceback: Optional[TracebackType],
- ) -> None: ...
diff --git a/3rdParty/pybind11/pybind11-2.6.0/pyproject.toml b/3rdParty/pybind11/pybind11-2.6.0/pyproject.toml
deleted file mode 100644
index 5c9d15354123e736255c67c3777ab6b5a24d052b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/pyproject.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools>=42", "wheel", "cmake>=3.18", "ninja"]
-build-backend = "setuptools.build_meta"
diff --git a/3rdParty/pybind11/pybind11-2.6.0/setup.cfg b/3rdParty/pybind11/pybind11-2.6.0/setup.cfg
deleted file mode 100644
index 57a6517026943e8833c39c000ebfc1677f4c7858..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/setup.cfg
+++ /dev/null
@@ -1,70 +0,0 @@
-[metadata]
-long_description = file: README.rst
-long_description_content_type = text/x-rst
-description = Seamless operability between C++11 and Python
-author = Wenzel Jakob
-author_email = wenzel.jakob@epfl.ch
-url = https://github.com/pybind/pybind11
-license = BSD
-
-classifiers =
- Development Status :: 5 - Production/Stable
- Intended Audience :: Developers
- Topic :: Software Development :: Libraries :: Python Modules
- Topic :: Utilities
- Programming Language :: C++
- Programming Language :: Python :: 2.7
- Programming Language :: Python :: 3
- Programming Language :: Python :: 3.5
- Programming Language :: Python :: 3.6
- Programming Language :: Python :: 3.7
- Programming Language :: Python :: 3.8
- License :: OSI Approved :: BSD License
- Programming Language :: Python :: Implementation :: PyPy
- Programming Language :: Python :: Implementation :: CPython
- Programming Language :: C++
- Topic :: Software Development :: Libraries :: Python Modules
-
-keywords =
- C++11
- Python bindings
-
-[options]
-python_requires = >=2.7, !=3.0, !=3.1, !=3.2, !=3.3, !=3.4
-zip_safe = False
-
-[bdist_wheel]
-universal=1
-
-[check-manifest]
-ignore =
- tests/**
- docs/**
- tools/**
- include/**
- .appveyor.yml
- .cmake-format.yaml
- .gitmodules
- .pre-commit-config.yaml
- .readthedocs.yml
- .clang-tidy
- pybind11/include/**
- pybind11/share/**
- CMakeLists.txt
-
-
-[flake8]
-max-line-length = 99
-show_source = True
-exclude = .git, __pycache__, build, dist, docs, tools, venv
-ignore =
- # required for pretty matrix formatting: multiple spaces after `,` and `[`
- E201, E241, W504,
- # camelcase 'cPickle' imported as lowercase 'pickle'
- N813
- # Black conflict
- W503, E203
-
-[mypy]
-files = pybind11
-strict = True
diff --git a/3rdParty/pybind11/pybind11-2.6.0/setup.py b/3rdParty/pybind11/pybind11-2.6.0/setup.py
deleted file mode 100644
index 3a0327982adc1a37cf3f5a073aa025a45f97ec78..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/setup.py
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Setup script for PyPI; use CMakeFile.txt to build extension modules
-
-import contextlib
-import os
-import re
-import shutil
-import string
-import subprocess
-import sys
-import tempfile
-
-import setuptools.command.sdist
-
-DIR = os.path.abspath(os.path.dirname(__file__))
-VERSION_REGEX = re.compile(
- r"^\s*#\s*define\s+PYBIND11_VERSION_([A-Z]+)\s+(.*)$", re.MULTILINE
-)
-
-# PYBIND11_GLOBAL_SDIST will build a different sdist, with the python-headers
-# files, and the sys.prefix files (CMake and headers).
-
-global_sdist = os.environ.get("PYBIND11_GLOBAL_SDIST", False)
-
-setup_py = "tools/setup_global.py.in" if global_sdist else "tools/setup_main.py.in"
-extra_cmd = 'cmdclass["sdist"] = SDist\n'
-
-to_src = (
- ("pyproject.toml", "tools/pyproject.toml"),
- ("setup.py", setup_py),
-)
-
-# Read the listed version
-with open("pybind11/_version.py") as f:
- code = compile(f.read(), "pybind11/_version.py", "exec")
-loc = {}
-exec(code, loc)
-version = loc["__version__"]
-
-# Verify that the version matches the one in C++
-with open("include/pybind11/detail/common.h") as f:
- matches = dict(VERSION_REGEX.findall(f.read()))
-cpp_version = "{MAJOR}.{MINOR}.{PATCH}".format(**matches)
-if version != cpp_version:
- msg = "Python version {} does not match C++ version {}!".format(
- version, cpp_version
- )
- raise RuntimeError(msg)
-
-
-def get_and_replace(filename, binary=False, **opts):
- with open(filename, "rb" if binary else "r") as f:
- contents = f.read()
- # Replacement has to be done on text in Python 3 (both work in Python 2)
- if binary:
- return string.Template(contents.decode()).substitute(opts).encode()
- else:
- return string.Template(contents).substitute(opts)
-
-
-# Use our input files instead when making the SDist (and anything that depends
-# on it, like a wheel)
-class SDist(setuptools.command.sdist.sdist):
- def make_release_tree(self, base_dir, files):
- setuptools.command.sdist.sdist.make_release_tree(self, base_dir, files)
-
- for to, src in to_src:
- txt = get_and_replace(src, binary=True, version=version, extra_cmd="")
-
- dest = os.path.join(base_dir, to)
-
- # This is normally linked, so unlink before writing!
- os.unlink(dest)
- with open(dest, "wb") as f:
- f.write(txt)
-
-
-# Backport from Python 3
-@contextlib.contextmanager
-def TemporaryDirectory(): # noqa: N802
- "Prepare a temporary directory, cleanup when done"
- try:
- tmpdir = tempfile.mkdtemp()
- yield tmpdir
- finally:
- shutil.rmtree(tmpdir)
-
-
-# Remove the CMake install directory when done
-@contextlib.contextmanager
-def remove_output(*sources):
- try:
- yield
- finally:
- for src in sources:
- shutil.rmtree(src)
-
-
-with remove_output("pybind11/include", "pybind11/share"):
- # Generate the files if they are not present.
- with TemporaryDirectory() as tmpdir:
- cmd = ["cmake", "-S", ".", "-B", tmpdir] + [
- "-DCMAKE_INSTALL_PREFIX=pybind11",
- "-DBUILD_TESTING=OFF",
- "-DPYBIND11_NOPYTHON=ON",
- ]
- cmake_opts = dict(cwd=DIR, stdout=sys.stdout, stderr=sys.stderr)
- subprocess.check_call(cmd, **cmake_opts)
- subprocess.check_call(["cmake", "--install", tmpdir], **cmake_opts)
-
- txt = get_and_replace(setup_py, version=version, extra_cmd=extra_cmd)
- code = compile(txt, setup_py, "exec")
- exec(code, {"SDist": SDist})
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/CMakeLists.txt
deleted file mode 100644
index 5ae0e44aca4a48cd73a9c2b201d548d3917f9eb2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/CMakeLists.txt
+++ /dev/null
@@ -1,406 +0,0 @@
-# CMakeLists.txt -- Build system for the pybind11 test suite
-#
-# Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
-#
-# All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-cmake_minimum_required(VERSION 3.4)
-
-# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
-# some versions of VS that have a patched CMake 3.11. This forces us to emulate
-# the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.18)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.18)
-endif()
-
-# Only needed for CMake < 3.5 support
-include(CMakeParseArguments)
-
-# Filter out items; print an optional message if any items filtered
-#
-# Usage:
-# pybind11_filter_tests(LISTNAME file1.cpp file2.cpp ... MESSAGE "")
-#
-macro(PYBIND11_FILTER_TESTS LISTNAME)
- cmake_parse_arguments(ARG "" "MESSAGE" "" ${ARGN})
- set(PYBIND11_FILTER_TESTS_FOUND OFF)
- foreach(filename IN LISTS ARG_UNPARSED_ARGUMENTS)
- list(FIND ${LISTNAME} ${filename} _FILE_FOUND)
- if(_FILE_FOUND GREATER -1)
- list(REMOVE_AT ${LISTNAME} ${_FILE_FOUND})
- set(PYBIND11_FILTER_TESTS_FOUND ON)
- endif()
- endforeach()
- if(PYBIND11_FILTER_TESTS_FOUND AND ARG_MESSAGE)
- message(STATUS "${ARG_MESSAGE}")
- endif()
-endmacro()
-
-# New Python support
-if(DEFINED Python_EXECUTABLE)
- set(PYTHON_EXECUTABLE "${Python_EXECUTABLE}")
- set(PYTHON_VERSION "${Python_VERSION}")
-endif()
-
-# There's no harm in including a project in a project
-project(pybind11_tests CXX)
-
-# Access FindCatch and more
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../tools")
-
-option(PYBIND11_WERROR "Report all warnings as errors" OFF)
-option(DOWNLOAD_EIGEN "Download EIGEN (requires CMake 3.11+)" OFF)
-option(PYBIND11_CUDA_TESTS "Enable building CUDA tests (requires CMake 3.12+)" OFF)
-set(PYBIND11_TEST_OVERRIDE
- ""
- CACHE STRING "Tests from ;-separated list of *.cpp files will be built instead of all tests")
-set(PYBIND11_TEST_FILTER
- ""
- CACHE STRING "Tests from ;-separated list of *.cpp files will be removed from all tests")
-
-if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
- # We're being loaded directly, i.e. not via add_subdirectory, so make this
- # work as its own project and load the pybind11Config to get the tools we need
- find_package(pybind11 REQUIRED CONFIG)
-endif()
-
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- message(STATUS "Setting tests build type to MinSizeRel as none was specified")
- set(CMAKE_BUILD_TYPE
- MinSizeRel
- CACHE STRING "Choose the type of build." FORCE)
- set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel"
- "RelWithDebInfo")
-endif()
-
-if(PYBIND11_CUDA_TESTS)
- enable_language(CUDA)
- if(DEFINED CMAKE_CXX_STANDARD)
- set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD})
- endif()
- set(CMAKE_CUDA_STANDARD_REQUIRED ON)
-endif()
-
-# Full set of test files (you can override these; see below)
-set(PYBIND11_TEST_FILES
- test_async.cpp
- test_buffers.cpp
- test_builtin_casters.cpp
- test_call_policies.cpp
- test_callbacks.cpp
- test_chrono.cpp
- test_class.cpp
- test_constants_and_functions.cpp
- test_copy_move.cpp
- test_custom_type_casters.cpp
- test_docstring_options.cpp
- test_eigen.cpp
- test_enum.cpp
- test_eval.cpp
- test_exceptions.cpp
- test_factory_constructors.cpp
- test_gil_scoped.cpp
- test_iostream.cpp
- test_kwargs_and_defaults.cpp
- test_local_bindings.cpp
- test_methods_and_attributes.cpp
- test_modules.cpp
- test_multiple_inheritance.cpp
- test_numpy_array.cpp
- test_numpy_dtypes.cpp
- test_numpy_vectorize.cpp
- test_opaque_types.cpp
- test_operator_overloading.cpp
- test_pickling.cpp
- test_pytypes.cpp
- test_sequences_and_iterators.cpp
- test_smart_ptr.cpp
- test_stl.cpp
- test_stl_binders.cpp
- test_tagbased_polymorphic.cpp
- test_union.cpp
- test_virtual_functions.cpp)
-
-# Invoking cmake with something like:
-# cmake -DPYBIND11_TEST_OVERRIDE="test_callbacks.cpp;test_pickling.cpp" ..
-# lets you override the tests that get compiled and run. You can restore to all tests with:
-# cmake -DPYBIND11_TEST_OVERRIDE= ..
-if(PYBIND11_TEST_OVERRIDE)
- set(PYBIND11_TEST_FILES ${PYBIND11_TEST_OVERRIDE})
-endif()
-
-# You can also filter tests:
-if(PYBIND11_TEST_FILTER)
- pybind11_filter_tests(PYBIND11_TEST_FILES ${PYBIND11_TEST_FILTER})
-endif()
-
-if(PYTHON_VERSION VERSION_LESS 3.5)
- pybind11_filter_tests(PYBIND11_TEST_FILES test_async.cpp MESSAGE
- "Skipping test_async on Python 2")
-endif()
-
-# Skip tests for CUDA check:
-# /pybind11/tests/test_constants_and_functions.cpp(125):
-# error: incompatible exception specifications
-if(PYBIND11_CUDA_TESTS)
- pybind11_filter_tests(
- PYBIND11_TEST_FILES test_constants_and_functions.cpp MESSAGE
- "Skipping test_constants_and_functions due to incompatible exception specifications")
-endif()
-
-string(REPLACE ".cpp" ".py" PYBIND11_PYTEST_FILES "${PYBIND11_TEST_FILES}")
-
-# Contains the set of test files that require pybind11_cross_module_tests to be
-# built; if none of these are built (i.e. because TEST_OVERRIDE is used and
-# doesn't include them) the second module doesn't get built.
-set(PYBIND11_CROSS_MODULE_TESTS test_exceptions.py test_local_bindings.py test_stl.py
- test_stl_binders.py)
-
-set(PYBIND11_CROSS_MODULE_GIL_TESTS test_gil_scoped.py)
-
-# Check if Eigen is available; if not, remove from PYBIND11_TEST_FILES (but
-# keep it in PYBIND11_PYTEST_FILES, so that we get the "eigen is not installed"
-# skip message).
-list(FIND PYBIND11_TEST_FILES test_eigen.cpp PYBIND11_TEST_FILES_EIGEN_I)
-if(PYBIND11_TEST_FILES_EIGEN_I GREATER -1)
- # Try loading via newer Eigen's Eigen3Config first (bypassing tools/FindEigen3.cmake).
- # Eigen 3.3.1+ exports a cmake 3.0+ target for handling dependency requirements, but also
- # produces a fatal error if loaded from a pre-3.0 cmake.
- if(DOWNLOAD_EIGEN)
- if(CMAKE_VERSION VERSION_LESS 3.11)
- message(FATAL_ERROR "CMake 3.11+ required when using DOWNLOAD_EIGEN")
- endif()
-
- set(EIGEN3_VERSION_STRING "3.3.8")
-
- include(FetchContent)
- FetchContent_Declare(
- eigen
- GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
- GIT_TAG ${EIGEN3_VERSION_STRING})
-
- FetchContent_GetProperties(eigen)
- if(NOT eigen_POPULATED)
- message(STATUS "Downloading Eigen")
- FetchContent_Populate(eigen)
- endif()
-
- set(EIGEN3_INCLUDE_DIR ${eigen_SOURCE_DIR})
- set(EIGEN3_FOUND TRUE)
-
- else()
- find_package(Eigen3 3.2.7 QUIET CONFIG)
-
- if(NOT EIGEN3_FOUND)
- # Couldn't load via target, so fall back to allowing module mode finding, which will pick up
- # tools/FindEigen3.cmake
- find_package(Eigen3 3.2.7 QUIET)
- endif()
- endif()
-
- if(EIGEN3_FOUND)
- if(NOT TARGET Eigen3::Eigen)
- add_library(Eigen3::Eigen IMPORTED INTERFACE)
- set_property(TARGET Eigen3::Eigen PROPERTY INTERFACE_INCLUDE_DIRECTORIES
- "${EIGEN3_INCLUDE_DIR}")
- endif()
-
- # Eigen 3.3.1+ cmake sets EIGEN3_VERSION_STRING (and hard codes the version when installed
- # rather than looking it up in the cmake script); older versions, and the
- # tools/FindEigen3.cmake, set EIGEN3_VERSION instead.
- if(NOT EIGEN3_VERSION AND EIGEN3_VERSION_STRING)
- set(EIGEN3_VERSION ${EIGEN3_VERSION_STRING})
- endif()
- message(STATUS "Building tests with Eigen v${EIGEN3_VERSION}")
- else()
- list(REMOVE_AT PYBIND11_TEST_FILES ${PYBIND11_TEST_FILES_EIGEN_I})
- message(STATUS "Building tests WITHOUT Eigen, use -DDOWNLOAD_EIGEN on CMake 3.11+ to download")
- endif()
-endif()
-
-# Optional dependency for some tests (boost::variant is only supported with version >= 1.56)
-find_package(Boost 1.56)
-
-if(Boost_FOUND)
- if(NOT TARGET Boost::headers)
- add_library(Boost::headers IMPORTED INTERFACE)
- if(TARGET Boost::boost)
- # Classic FindBoost
- set_property(TARGET Boost::boost PROPERTY INTERFACE_LINK_LIBRARIES Boost::boost)
- else()
- # Very old FindBoost, or newer Boost than CMake in older CMakes
- set_property(TARGET Boost::headers PROPERTY INTERFACE_INCLUDE_DIRECTORIES
- ${Boost_INCLUDE_DIRS})
- endif()
- endif()
-endif()
-
-# Compile with compiler warnings turned on
-function(pybind11_enable_warnings target_name)
- if(MSVC)
- target_compile_options(${target_name} PRIVATE /W4)
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Intel|Clang)" AND NOT PYBIND11_CUDA_TESTS)
- target_compile_options(${target_name} PRIVATE -Wall -Wextra -Wconversion -Wcast-qual
- -Wdeprecated -Wundef)
- endif()
-
- if(PYBIND11_WERROR)
- if(MSVC)
- target_compile_options(${target_name} PRIVATE /WX)
- elseif(PYBIND11_CUDA_TESTS)
- target_compile_options(${target_name} PRIVATE "SHELL:-Werror all-warnings")
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Intel|Clang)")
- target_compile_options(${target_name} PRIVATE -Werror)
- endif()
- endif()
-
- # Needs to be readded since the ordering requires these to be after the ones above
- if(CMAKE_CXX_STANDARD
- AND CMAKE_CXX_COMPILER_ID MATCHES "Clang"
- AND PYTHON_VERSION VERSION_LESS 3.0)
- if(CMAKE_CXX_STANDARD LESS 17)
- target_compile_options(${target_name} PUBLIC -Wno-deprecated-register)
- else()
- target_compile_options(${target_name} PUBLIC -Wno-register)
- endif()
- endif()
-endfunction()
-
-set(test_targets pybind11_tests)
-
-# Build pybind11_cross_module_tests if any test_whatever.py are being built that require it
-foreach(t ${PYBIND11_CROSS_MODULE_TESTS})
- list(FIND PYBIND11_PYTEST_FILES ${t} i)
- if(i GREATER -1)
- list(APPEND test_targets pybind11_cross_module_tests)
- break()
- endif()
-endforeach()
-
-foreach(t ${PYBIND11_CROSS_MODULE_GIL_TESTS})
- list(FIND PYBIND11_PYTEST_FILES ${t} i)
- if(i GREATER -1)
- list(APPEND test_targets cross_module_gil_utils)
- break()
- endif()
-endforeach()
-
-# Support CUDA testing by forcing the target file to compile with NVCC
-if(PYBIND11_CUDA_TESTS)
- set_property(SOURCE ${PYBIND11_TEST_FILES} PROPERTY LANGUAGE CUDA)
-endif()
-
-foreach(target ${test_targets})
- set(test_files ${PYBIND11_TEST_FILES})
- if(NOT "${target}" STREQUAL "pybind11_tests")
- set(test_files "")
- endif()
-
- # Support CUDA testing by forcing the target file to compile with NVCC
- if(PYBIND11_CUDA_TESTS)
- set_property(SOURCE ${target}.cpp PROPERTY LANGUAGE CUDA)
- endif()
-
- # Create the binding library
- pybind11_add_module(${target} THIN_LTO ${target}.cpp ${test_files} ${PYBIND11_HEADERS})
- pybind11_enable_warnings(${target})
-
- if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
- get_property(
- suffix
- TARGET ${target}
- PROPERTY SUFFIX)
- set(source_output "${CMAKE_CURRENT_SOURCE_DIR}/${target}${suffix}")
- if(suffix AND EXISTS "${source_output}")
- message(WARNING "Output file also in source directory; "
- "please remove to avoid confusion: ${source_output}")
- endif()
- endif()
-
- if(MSVC)
- target_compile_options(${target} PRIVATE /utf-8)
- endif()
-
- if(EIGEN3_FOUND)
- target_link_libraries(${target} PRIVATE Eigen3::Eigen)
- target_compile_definitions(${target} PRIVATE -DPYBIND11_TEST_EIGEN)
- endif()
-
- if(Boost_FOUND)
- target_link_libraries(${target} PRIVATE Boost::headers)
- target_compile_definitions(${target} PRIVATE -DPYBIND11_TEST_BOOST)
- endif()
-
- # Always write the output file directly into the 'tests' directory (even on MSVC)
- if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
- set_target_properties(${target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY
- "${CMAKE_CURRENT_BINARY_DIR}")
- foreach(config ${CMAKE_CONFIGURATION_TYPES})
- string(TOUPPER ${config} config)
- set_target_properties(${target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_${config}
- "${CMAKE_CURRENT_BINARY_DIR}")
- endforeach()
- endif()
-endforeach()
-
-# Make sure pytest is found or produce a warning
-pybind11_find_import(pytest VERSION 3.1)
-
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
- # This is not used later in the build, so it's okay to regenerate each time.
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pytest.ini" "${CMAKE_CURRENT_BINARY_DIR}/pytest.ini"
- COPYONLY)
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/pytest.ini"
- "\ntestpaths = \"${CMAKE_CURRENT_SOURCE_DIR}\"")
-
-endif()
-
-# cmake 3.12 added list(transform <list> prepend
-# but we can't use it yet
-string(REPLACE "test_" "${CMAKE_CURRENT_SOURCE_DIR}/test_" PYBIND11_ABS_PYTEST_FILES
- "${PYBIND11_PYTEST_FILES}")
-
-# A single command to compile and run the tests
-add_custom_target(
- pytest
- COMMAND ${PYTHON_EXECUTABLE} -m pytest ${PYBIND11_ABS_PYTEST_FILES}
- DEPENDS ${test_targets}
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- USES_TERMINAL)
-
-if(PYBIND11_TEST_OVERRIDE)
- add_custom_command(
- TARGET pytest
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E echo
- "Note: not all tests run: -DPYBIND11_TEST_OVERRIDE is in effect")
-endif()
-
-# Add a check target to run all the tests, starting with pytest (we add dependencies to this below)
-add_custom_target(check DEPENDS pytest)
-
-# The remaining tests only apply when being built as part of the pybind11 project, but not if the
-# tests are being built independently.
-if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
- return()
-endif()
-
-# Add a post-build comment to show the primary test suite .so size and, if a previous size, compare it:
-add_custom_command(
- TARGET pybind11_tests
- POST_BUILD
- COMMAND
- ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../tools/libsize.py
- $<TARGET_FILE:pybind11_tests>
- ${CMAKE_CURRENT_BINARY_DIR}/sosize-$<TARGET_FILE_NAME:pybind11_tests>.txt)
-
-if(NOT PYBIND11_CUDA_TESTS)
- # Test embedding the interpreter. Provides the `cpptest` target.
- add_subdirectory(test_embed)
-
- # Test CMake build using functions and targets from subdirectory or installed location
- add_subdirectory(test_cmake_build)
-endif()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/conftest.py b/3rdParty/pybind11/pybind11-2.6.0/tests/conftest.py
deleted file mode 100644
index 362eb806916c5a1c81468afd4b43f6c770a1b434..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/conftest.py
+++ /dev/null
@@ -1,208 +0,0 @@
-# -*- coding: utf-8 -*-
-"""pytest configuration
-
-Extends output capture as needed by pybind11: ignore constructors, optional unordered lines.
-Adds docstring and exceptions message sanitizers: ignore Python 2 vs 3 differences.
-"""
-
-import contextlib
-import difflib
-import gc
-import re
-import textwrap
-
-import pytest
-
-import env
-
-# Early diagnostic for failed imports
-import pybind11_tests # noqa: F401
-
-_unicode_marker = re.compile(r"u(\'[^\']*\')")
-_long_marker = re.compile(r"([0-9])L")
-_hexadecimal = re.compile(r"0x[0-9a-fA-F]+")
-
-# Avoid collecting Python3 only files
-collect_ignore = []
-if env.PY2:
- collect_ignore.append("test_async.py")
-
-
-def _strip_and_dedent(s):
- """For triple-quote strings"""
- return textwrap.dedent(s.lstrip("\n").rstrip())
-
-
-def _split_and_sort(s):
- """For output which does not require specific line order"""
- return sorted(_strip_and_dedent(s).splitlines())
-
-
-def _make_explanation(a, b):
- """Explanation for a failed assert -- the a and b arguments are List[str]"""
- return ["--- actual / +++ expected"] + [
- line.strip("\n") for line in difflib.ndiff(a, b)
- ]
-
-
-class Output(object):
- """Basic output post-processing and comparison"""
-
- def __init__(self, string):
- self.string = string
- self.explanation = []
-
- def __str__(self):
- return self.string
-
- def __eq__(self, other):
- # Ignore constructor/destructor output which is prefixed with "###"
- a = [
- line
- for line in self.string.strip().splitlines()
- if not line.startswith("###")
- ]
- b = _strip_and_dedent(other).splitlines()
- if a == b:
- return True
- else:
- self.explanation = _make_explanation(a, b)
- return False
-
-
-class Unordered(Output):
- """Custom comparison for output without strict line ordering"""
-
- def __eq__(self, other):
- a = _split_and_sort(self.string)
- b = _split_and_sort(other)
- if a == b:
- return True
- else:
- self.explanation = _make_explanation(a, b)
- return False
-
-
-class Capture(object):
- def __init__(self, capfd):
- self.capfd = capfd
- self.out = ""
- self.err = ""
-
- def __enter__(self):
- self.capfd.readouterr()
- return self
-
- def __exit__(self, *args):
- self.out, self.err = self.capfd.readouterr()
-
- def __eq__(self, other):
- a = Output(self.out)
- b = other
- if a == b:
- return True
- else:
- self.explanation = a.explanation
- return False
-
- def __str__(self):
- return self.out
-
- def __contains__(self, item):
- return item in self.out
-
- @property
- def unordered(self):
- return Unordered(self.out)
-
- @property
- def stderr(self):
- return Output(self.err)
-
-
-@pytest.fixture
-def capture(capsys):
- """Extended `capsys` with context manager and custom equality operators"""
- return Capture(capsys)
-
-
-class SanitizedString(object):
- def __init__(self, sanitizer):
- self.sanitizer = sanitizer
- self.string = ""
- self.explanation = []
-
- def __call__(self, thing):
- self.string = self.sanitizer(thing)
- return self
-
- def __eq__(self, other):
- a = self.string
- b = _strip_and_dedent(other)
- if a == b:
- return True
- else:
- self.explanation = _make_explanation(a.splitlines(), b.splitlines())
- return False
-
-
-def _sanitize_general(s):
- s = s.strip()
- s = s.replace("pybind11_tests.", "m.")
- s = s.replace("unicode", "str")
- s = _long_marker.sub(r"\1", s)
- s = _unicode_marker.sub(r"\1", s)
- return s
-
-
-def _sanitize_docstring(thing):
- s = thing.__doc__
- s = _sanitize_general(s)
- return s
-
-
-@pytest.fixture
-def doc():
- """Sanitize docstrings and add custom failure explanation"""
- return SanitizedString(_sanitize_docstring)
-
-
-def _sanitize_message(thing):
- s = str(thing)
- s = _sanitize_general(s)
- s = _hexadecimal.sub("0", s)
- return s
-
-
-@pytest.fixture
-def msg():
- """Sanitize messages and add custom failure explanation"""
- return SanitizedString(_sanitize_message)
-
-
-# noinspection PyUnusedLocal
-def pytest_assertrepr_compare(op, left, right):
- """Hook to insert custom failure explanation"""
- if hasattr(left, "explanation"):
- return left.explanation
-
-
-@contextlib.contextmanager
-def suppress(exception):
- """Suppress the desired exception"""
- try:
- yield
- except exception:
- pass
-
-
-def gc_collect():
- """Run the garbage collector twice (needed when running
- reference counting tests with PyPy)"""
- gc.collect()
- gc.collect()
-
-
-def pytest_configure():
- pytest.suppress = suppress
- pytest.gc_collect = gc_collect
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/constructor_stats.h b/3rdParty/pybind11/pybind11-2.6.0/tests/constructor_stats.h
deleted file mode 100644
index 805968a09b3d3ed4d3e40efe2007078f5915c9d0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/constructor_stats.h
+++ /dev/null
@@ -1,275 +0,0 @@
-#pragma once
-/*
- tests/constructor_stats.h -- framework for printing and tracking object
- instance lifetimes in example/test code.
-
- Copyright (c) 2016 Jason Rhinelander <jason@imaginary.ca>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-
-This header provides a few useful tools for writing examples or tests that want to check and/or
-display object instance lifetimes. It requires that you include this header and add the following
-function calls to constructors:
-
- class MyClass {
- MyClass() { ...; print_default_created(this); }
- ~MyClass() { ...; print_destroyed(this); }
- MyClass(const MyClass &c) { ...; print_copy_created(this); }
- MyClass(MyClass &&c) { ...; print_move_created(this); }
- MyClass(int a, int b) { ...; print_created(this, a, b); }
- MyClass &operator=(const MyClass &c) { ...; print_copy_assigned(this); }
- MyClass &operator=(MyClass &&c) { ...; print_move_assigned(this); }
-
- ...
- }
-
-You can find various examples of these in several of the existing testing .cpp files. (Of course
-you don't need to add any of the above constructors/operators that you don't actually have, except
-for the destructor).
-
-Each of these will print an appropriate message such as:
-
- ### MyClass @ 0x2801910 created via default constructor
- ### MyClass @ 0x27fa780 created 100 200
- ### MyClass @ 0x2801910 destroyed
- ### MyClass @ 0x27fa780 destroyed
-
-You can also include extra arguments (such as the 100, 200 in the output above, coming from the
-value constructor) for all of the above methods which will be included in the output.
-
-For testing, each of these also keeps track the created instances and allows you to check how many
-of the various constructors have been invoked from the Python side via code such as:
-
- from pybind11_tests import ConstructorStats
- cstats = ConstructorStats.get(MyClass)
- print(cstats.alive())
- print(cstats.default_constructions)
-
-Note that `.alive()` should usually be the first thing you call as it invokes Python's garbage
-collector to actually destroy objects that aren't yet referenced.
-
-For everything except copy and move constructors and destructors, any extra values given to the
-print_...() function is stored in a class-specific values list which you can retrieve and inspect
-from the ConstructorStats instance `.values()` method.
-
-In some cases, when you need to track instances of a C++ class not registered with pybind11, you
-need to add a function returning the ConstructorStats for the C++ class; this can be done with:
-
- m.def("get_special_cstats", &ConstructorStats::get<SpecialClass>, py::return_value_policy::reference)
-
-Finally, you can suppress the output messages, but keep the constructor tracking (for
-inspection/testing in python) by using the functions with `print_` replaced with `track_` (e.g.
-`track_copy_created(this)`).
-
-*/
-
-#include "pybind11_tests.h"
-#include <unordered_map>
-#include <list>
-#include <typeindex>
-#include <sstream>
-
-class ConstructorStats {
-protected:
- std::unordered_map<void*, int> _instances; // Need a map rather than set because members can shared address with parents
- std::list<std::string> _values; // Used to track values (e.g. of value constructors)
-public:
- int default_constructions = 0;
- int copy_constructions = 0;
- int move_constructions = 0;
- int copy_assignments = 0;
- int move_assignments = 0;
-
- void copy_created(void *inst) {
- created(inst);
- copy_constructions++;
- }
-
- void move_created(void *inst) {
- created(inst);
- move_constructions++;
- }
-
- void default_created(void *inst) {
- created(inst);
- default_constructions++;
- }
-
- void created(void *inst) {
- ++_instances[inst];
- }
-
- void destroyed(void *inst) {
- if (--_instances[inst] < 0)
- throw std::runtime_error("cstats.destroyed() called with unknown "
- "instance; potential double-destruction "
- "or a missing cstats.created()");
- }
-
- static void gc() {
- // Force garbage collection to ensure any pending destructors are invoked:
-#if defined(PYPY_VERSION)
- PyObject *globals = PyEval_GetGlobals();
- PyObject *result = PyRun_String(
- "import gc\n"
- "for i in range(2):"
- " gc.collect()\n",
- Py_file_input, globals, globals);
- if (result == nullptr)
- throw py::error_already_set();
- Py_DECREF(result);
-#else
- py::module_::import("gc").attr("collect")();
-#endif
- }
-
- int alive() {
- gc();
- int total = 0;
- for (const auto &p : _instances)
- if (p.second > 0)
- total += p.second;
- return total;
- }
-
- void value() {} // Recursion terminator
- // Takes one or more values, converts them to strings, then stores them.
- template <typename T, typename... Tmore> void value(const T &v, Tmore &&...args) {
- std::ostringstream oss;
- oss << v;
- _values.push_back(oss.str());
- value(std::forward<Tmore>(args)...);
- }
-
- // Move out stored values
- py::list values() {
- py::list l;
- for (const auto &v : _values) l.append(py::cast(v));
- _values.clear();
- return l;
- }
-
- // Gets constructor stats from a C++ type index
- static ConstructorStats& get(std::type_index type) {
- static std::unordered_map<std::type_index, ConstructorStats> all_cstats;
- return all_cstats[type];
- }
-
- // Gets constructor stats from a C++ type
- template <typename T> static ConstructorStats& get() {
-#if defined(PYPY_VERSION)
- gc();
-#endif
- return get(typeid(T));
- }
-
- // Gets constructor stats from a Python class
- static ConstructorStats& get(py::object class_) {
- auto &internals = py::detail::get_internals();
- const std::type_index *t1 = nullptr, *t2 = nullptr;
- try {
- auto *type_info = internals.registered_types_py.at((PyTypeObject *) class_.ptr()).at(0);
- for (auto &p : internals.registered_types_cpp) {
- if (p.second == type_info) {
- if (t1) {
- t2 = &p.first;
- break;
- }
- t1 = &p.first;
- }
- }
- }
- catch (const std::out_of_range&) {}
- if (!t1) throw std::runtime_error("Unknown class passed to ConstructorStats::get()");
- auto &cs1 = get(*t1);
- // If we have both a t1 and t2 match, one is probably the trampoline class; return whichever
- // has more constructions (typically one or the other will be 0)
- if (t2) {
- auto &cs2 = get(*t2);
- int cs1_total = cs1.default_constructions + cs1.copy_constructions + cs1.move_constructions + (int) cs1._values.size();
- int cs2_total = cs2.default_constructions + cs2.copy_constructions + cs2.move_constructions + (int) cs2._values.size();
- if (cs2_total > cs1_total) return cs2;
- }
- return cs1;
- }
-};
-
-// To track construction/destruction, you need to call these methods from the various
-// constructors/operators. The ones that take extra values record the given values in the
-// constructor stats values for later inspection.
-template <class T> void track_copy_created(T *inst) { ConstructorStats::get<T>().copy_created(inst); }
-template <class T> void track_move_created(T *inst) { ConstructorStats::get<T>().move_created(inst); }
-template <class T, typename... Values> void track_copy_assigned(T *, Values &&...values) {
- auto &cst = ConstructorStats::get<T>();
- cst.copy_assignments++;
- cst.value(std::forward<Values>(values)...);
-}
-template <class T, typename... Values> void track_move_assigned(T *, Values &&...values) {
- auto &cst = ConstructorStats::get<T>();
- cst.move_assignments++;
- cst.value(std::forward<Values>(values)...);
-}
-template <class T, typename... Values> void track_default_created(T *inst, Values &&...values) {
- auto &cst = ConstructorStats::get<T>();
- cst.default_created(inst);
- cst.value(std::forward<Values>(values)...);
-}
-template <class T, typename... Values> void track_created(T *inst, Values &&...values) {
- auto &cst = ConstructorStats::get<T>();
- cst.created(inst);
- cst.value(std::forward<Values>(values)...);
-}
-template <class T, typename... Values> void track_destroyed(T *inst) {
- ConstructorStats::get<T>().destroyed(inst);
-}
-template <class T, typename... Values> void track_values(T *, Values &&...values) {
- ConstructorStats::get<T>().value(std::forward<Values>(values)...);
-}
-
-/// Don't cast pointers to Python, print them as strings
-inline const char *format_ptrs(const char *p) { return p; }
-template <typename T>
-py::str format_ptrs(T *p) { return "{:#x}"_s.format(reinterpret_cast<std::uintptr_t>(p)); }
-template <typename T>
-auto format_ptrs(T &&x) -> decltype(std::forward<T>(x)) { return std::forward<T>(x); }
-
-template <class T, typename... Output>
-void print_constr_details(T *inst, const std::string &action, Output &&...output) {
- py::print("###", py::type_id<T>(), "@", format_ptrs(inst), action,
- format_ptrs(std::forward<Output>(output))...);
-}
-
-// Verbose versions of the above:
-template <class T, typename... Values> void print_copy_created(T *inst, Values &&...values) { // NB: this prints, but doesn't store, given values
- print_constr_details(inst, "created via copy constructor", values...);
- track_copy_created(inst);
-}
-template <class T, typename... Values> void print_move_created(T *inst, Values &&...values) { // NB: this prints, but doesn't store, given values
- print_constr_details(inst, "created via move constructor", values...);
- track_move_created(inst);
-}
-template <class T, typename... Values> void print_copy_assigned(T *inst, Values &&...values) {
- print_constr_details(inst, "assigned via copy assignment", values...);
- track_copy_assigned(inst, values...);
-}
-template <class T, typename... Values> void print_move_assigned(T *inst, Values &&...values) {
- print_constr_details(inst, "assigned via move assignment", values...);
- track_move_assigned(inst, values...);
-}
-template <class T, typename... Values> void print_default_created(T *inst, Values &&...values) {
- print_constr_details(inst, "created via default constructor", values...);
- track_default_created(inst, values...);
-}
-template <class T, typename... Values> void print_created(T *inst, Values &&...values) {
- print_constr_details(inst, "created", values...);
- track_created(inst, values...);
-}
-template <class T, typename... Values> void print_destroyed(T *inst, Values &&...values) { // Prints but doesn't store given values
- print_constr_details(inst, "destroyed", values...);
- track_destroyed(inst);
-}
-template <class T, typename... Values> void print_values(T *inst, Values &&...values) {
- print_constr_details(inst, ":", values...);
- track_values(inst, values...);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/cross_module_gil_utils.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/cross_module_gil_utils.cpp
deleted file mode 100644
index 07db9f6e48a10dfd2d4370c3daff6e793d6675d2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/cross_module_gil_utils.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- tests/cross_module_gil_utils.cpp -- tools for acquiring GIL from a different module
-
- Copyright (c) 2019 Google LLC
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-#include <pybind11/pybind11.h>
-#include <cstdint>
-
-// This file mimics a DSO that makes pybind11 calls but does not define a
-// PYBIND11_MODULE. The purpose is to test that such a DSO can create a
-// py::gil_scoped_acquire when the running thread is in a GIL-released state.
-//
-// Note that we define a Python module here for convenience, but in general
-// this need not be the case. The typical scenario would be a DSO that implements
-// shared logic used internally by multiple pybind11 modules.
-
-namespace {
-
-namespace py = pybind11;
-void gil_acquire() { py::gil_scoped_acquire gil; }
-
-constexpr char kModuleName[] = "cross_module_gil_utils";
-
-#if PY_MAJOR_VERSION >= 3
-struct PyModuleDef moduledef = {
- PyModuleDef_HEAD_INIT,
- kModuleName,
- NULL,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL
-};
-#else
-PyMethodDef module_methods[] = {
- {NULL, NULL, 0, NULL}
-};
-#endif
-
-} // namespace
-
-extern "C" PYBIND11_EXPORT
-#if PY_MAJOR_VERSION >= 3
-PyObject* PyInit_cross_module_gil_utils()
-#else
-void initcross_module_gil_utils()
-#endif
-{
-
- PyObject* m =
-#if PY_MAJOR_VERSION >= 3
- PyModule_Create(&moduledef);
-#else
- Py_InitModule(kModuleName, module_methods);
-#endif
-
- if (m != NULL) {
- static_assert(
- sizeof(&gil_acquire) == sizeof(void*),
- "Function pointer must have the same size as void*");
- PyModule_AddObject(m, "gil_acquire_funcaddr",
- PyLong_FromVoidPtr(reinterpret_cast<void*>(&gil_acquire)));
- }
-
-#if PY_MAJOR_VERSION >= 3
- return m;
-#endif
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/env.py b/3rdParty/pybind11/pybind11-2.6.0/tests/env.py
deleted file mode 100644
index 5cded441271c61af72fc0be0de79332dc6279d72..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/env.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-import platform
-import sys
-
-LINUX = sys.platform.startswith("linux")
-MACOS = sys.platform.startswith("darwin")
-WIN = sys.platform.startswith("win32") or sys.platform.startswith("cygwin")
-
-CPYTHON = platform.python_implementation() == "CPython"
-PYPY = platform.python_implementation() == "PyPy"
-
-PY2 = sys.version_info.major == 2
-
-PY = sys.version_info
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/extra_python_package/pytest.ini b/3rdParty/pybind11/pybind11-2.6.0/tests/extra_python_package/pytest.ini
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/extra_python_package/test_files.py b/3rdParty/pybind11/pybind11-2.6.0/tests/extra_python_package/test_files.py
deleted file mode 100644
index cbd4bff1bcfa33cff4411c42d8a4f65ea22ac645..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/extra_python_package/test_files.py
+++ /dev/null
@@ -1,262 +0,0 @@
-# -*- coding: utf-8 -*-
-import contextlib
-import os
-import string
-import subprocess
-import sys
-import tarfile
-import zipfile
-
-# These tests must be run explicitly
-# They require CMake 3.15+ (--install)
-
-DIR = os.path.abspath(os.path.dirname(__file__))
-MAIN_DIR = os.path.dirname(os.path.dirname(DIR))
-
-
-main_headers = {
- "include/pybind11/attr.h",
- "include/pybind11/buffer_info.h",
- "include/pybind11/cast.h",
- "include/pybind11/chrono.h",
- "include/pybind11/common.h",
- "include/pybind11/complex.h",
- "include/pybind11/eigen.h",
- "include/pybind11/embed.h",
- "include/pybind11/eval.h",
- "include/pybind11/functional.h",
- "include/pybind11/iostream.h",
- "include/pybind11/numpy.h",
- "include/pybind11/operators.h",
- "include/pybind11/options.h",
- "include/pybind11/pybind11.h",
- "include/pybind11/pytypes.h",
- "include/pybind11/stl.h",
- "include/pybind11/stl_bind.h",
-}
-
-detail_headers = {
- "include/pybind11/detail/class.h",
- "include/pybind11/detail/common.h",
- "include/pybind11/detail/descr.h",
- "include/pybind11/detail/init.h",
- "include/pybind11/detail/internals.h",
- "include/pybind11/detail/typeid.h",
-}
-
-cmake_files = {
- "share/cmake/pybind11/FindPythonLibsNew.cmake",
- "share/cmake/pybind11/pybind11Common.cmake",
- "share/cmake/pybind11/pybind11Config.cmake",
- "share/cmake/pybind11/pybind11ConfigVersion.cmake",
- "share/cmake/pybind11/pybind11NewTools.cmake",
- "share/cmake/pybind11/pybind11Targets.cmake",
- "share/cmake/pybind11/pybind11Tools.cmake",
-}
-
-py_files = {
- "__init__.py",
- "__main__.py",
- "_version.py",
- "_version.pyi",
- "commands.py",
- "py.typed",
- "setup_helpers.py",
- "setup_helpers.pyi",
-}
-
-headers = main_headers | detail_headers
-src_files = headers | cmake_files
-all_files = src_files | py_files
-
-
-sdist_files = {
- "pybind11",
- "pybind11/include",
- "pybind11/include/pybind11",
- "pybind11/include/pybind11/detail",
- "pybind11/share",
- "pybind11/share/cmake",
- "pybind11/share/cmake/pybind11",
- "pyproject.toml",
- "setup.cfg",
- "setup.py",
- "LICENSE",
- "MANIFEST.in",
- "README.rst",
- "PKG-INFO",
-}
-
-local_sdist_files = {
- ".egg-info",
- ".egg-info/PKG-INFO",
- ".egg-info/SOURCES.txt",
- ".egg-info/dependency_links.txt",
- ".egg-info/not-zip-safe",
- ".egg-info/top_level.txt",
-}
-
-
-def test_build_sdist(monkeypatch, tmpdir):
-
- monkeypatch.chdir(MAIN_DIR)
-
- out = subprocess.check_output(
- [
- sys.executable,
- "setup.py",
- "sdist",
- "--formats=tar",
- "--dist-dir",
- str(tmpdir),
- ]
- )
- if hasattr(out, "decode"):
- out = out.decode()
-
- (sdist,) = tmpdir.visit("*.tar")
-
- with tarfile.open(str(sdist)) as tar:
- start = tar.getnames()[0] + "/"
- version = start[9:-1]
- simpler = set(n.split("/", 1)[-1] for n in tar.getnames()[1:])
-
- with contextlib.closing(
- tar.extractfile(tar.getmember(start + "setup.py"))
- ) as f:
- setup_py = f.read()
-
- with contextlib.closing(
- tar.extractfile(tar.getmember(start + "pyproject.toml"))
- ) as f:
- pyproject_toml = f.read()
-
- files = set("pybind11/{}".format(n) for n in all_files)
- files |= sdist_files
- files |= set("pybind11{}".format(n) for n in local_sdist_files)
- files.add("pybind11.egg-info/entry_points.txt")
- files.add("pybind11.egg-info/requires.txt")
- assert simpler == files
-
- with open(os.path.join(MAIN_DIR, "tools", "setup_main.py.in"), "rb") as f:
- contents = (
- string.Template(f.read().decode())
- .substitute(version=version, extra_cmd="")
- .encode()
- )
- assert setup_py == contents
-
- with open(os.path.join(MAIN_DIR, "tools", "pyproject.toml"), "rb") as f:
- contents = f.read()
- assert pyproject_toml == contents
-
-
-def test_build_global_dist(monkeypatch, tmpdir):
-
- monkeypatch.chdir(MAIN_DIR)
- monkeypatch.setenv("PYBIND11_GLOBAL_SDIST", "1")
-
- out = subprocess.check_output(
- [
- sys.executable,
- "setup.py",
- "sdist",
- "--formats=tar",
- "--dist-dir",
- str(tmpdir),
- ]
- )
- if hasattr(out, "decode"):
- out = out.decode()
-
- (sdist,) = tmpdir.visit("*.tar")
-
- with tarfile.open(str(sdist)) as tar:
- start = tar.getnames()[0] + "/"
- version = start[16:-1]
- simpler = set(n.split("/", 1)[-1] for n in tar.getnames()[1:])
-
- with contextlib.closing(
- tar.extractfile(tar.getmember(start + "setup.py"))
- ) as f:
- setup_py = f.read()
-
- with contextlib.closing(
- tar.extractfile(tar.getmember(start + "pyproject.toml"))
- ) as f:
- pyproject_toml = f.read()
-
- files = set("pybind11/{}".format(n) for n in all_files)
- files |= sdist_files
- files |= set("pybind11_global{}".format(n) for n in local_sdist_files)
- assert simpler == files
-
- with open(os.path.join(MAIN_DIR, "tools", "setup_global.py.in"), "rb") as f:
- contents = (
- string.Template(f.read().decode())
- .substitute(version=version, extra_cmd="")
- .encode()
- )
- assert setup_py == contents
-
- with open(os.path.join(MAIN_DIR, "tools", "pyproject.toml"), "rb") as f:
- contents = f.read()
- assert pyproject_toml == contents
-
-
-def tests_build_wheel(monkeypatch, tmpdir):
- monkeypatch.chdir(MAIN_DIR)
-
- subprocess.check_output(
- [sys.executable, "-m", "pip", "wheel", ".", "-w", str(tmpdir)]
- )
-
- (wheel,) = tmpdir.visit("*.whl")
-
- files = set("pybind11/{}".format(n) for n in all_files)
- files |= {
- "dist-info/LICENSE",
- "dist-info/METADATA",
- "dist-info/RECORD",
- "dist-info/WHEEL",
- "dist-info/entry_points.txt",
- "dist-info/top_level.txt",
- }
-
- with zipfile.ZipFile(str(wheel)) as z:
- names = z.namelist()
-
- trimmed = set(n for n in names if "dist-info" not in n)
- trimmed |= set(
- "dist-info/{}".format(n.split("/", 1)[-1]) for n in names if "dist-info" in n
- )
- assert files == trimmed
-
-
-def tests_build_global_wheel(monkeypatch, tmpdir):
- monkeypatch.chdir(MAIN_DIR)
- monkeypatch.setenv("PYBIND11_GLOBAL_SDIST", "1")
-
- subprocess.check_output(
- [sys.executable, "-m", "pip", "wheel", ".", "-w", str(tmpdir)]
- )
-
- (wheel,) = tmpdir.visit("*.whl")
-
- files = set("data/data/{}".format(n) for n in src_files)
- files |= set("data/headers/{}".format(n[8:]) for n in headers)
- files |= {
- "dist-info/LICENSE",
- "dist-info/METADATA",
- "dist-info/WHEEL",
- "dist-info/top_level.txt",
- "dist-info/RECORD",
- }
-
- with zipfile.ZipFile(str(wheel)) as z:
- names = z.namelist()
-
- beginning = names[0].split("/", 1)[0].rsplit(".", 1)[0]
- trimmed = set(n[len(beginning) + 1 :] for n in names)
-
- assert files == trimmed
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/extra_setuptools/pytest.ini b/3rdParty/pybind11/pybind11-2.6.0/tests/extra_setuptools/pytest.ini
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/extra_setuptools/test_setuphelper.py b/3rdParty/pybind11/pybind11-2.6.0/tests/extra_setuptools/test_setuphelper.py
deleted file mode 100644
index 0d8bd0e4d6064fac174451e04a708434c4210e94..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/extra_setuptools/test_setuphelper.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-import sys
-import subprocess
-from textwrap import dedent
-
-import pytest
-
-DIR = os.path.abspath(os.path.dirname(__file__))
-MAIN_DIR = os.path.dirname(os.path.dirname(DIR))
-
-
-@pytest.mark.parametrize("parallel", [False, True])
-@pytest.mark.parametrize("std", [11, 0])
-def test_simple_setup_py(monkeypatch, tmpdir, parallel, std):
- monkeypatch.chdir(tmpdir)
- monkeypatch.syspath_prepend(MAIN_DIR)
-
- (tmpdir / "setup.py").write_text(
- dedent(
- u"""\
- import sys
- sys.path.append({MAIN_DIR!r})
-
- from setuptools import setup, Extension
- from pybind11.setup_helpers import build_ext, Pybind11Extension
-
- std = {std}
-
- ext_modules = [
- Pybind11Extension(
- "simple_setup",
- sorted(["main.cpp"]),
- cxx_std=std,
- ),
- ]
-
- cmdclass = dict()
- if std == 0:
- cmdclass["build_ext"] = build_ext
-
-
- parallel = {parallel}
- if parallel:
- from pybind11.setup_helpers import ParallelCompile
- ParallelCompile().install()
-
- setup(
- name="simple_setup_package",
- cmdclass=cmdclass,
- ext_modules=ext_modules,
- )
- """
- ).format(MAIN_DIR=MAIN_DIR, std=std, parallel=parallel),
- encoding="ascii",
- )
-
- (tmpdir / "main.cpp").write_text(
- dedent(
- u"""\
- #include <pybind11/pybind11.h>
-
- int f(int x) {
- return x * 3;
- }
- PYBIND11_MODULE(simple_setup, m) {
- m.def("f", &f);
- }
- """
- ),
- encoding="ascii",
- )
-
- subprocess.check_call(
- [sys.executable, "setup.py", "build_ext", "--inplace"],
- stdout=sys.stdout,
- stderr=sys.stderr,
- )
-
- # Debug helper printout, normally hidden
- for item in tmpdir.listdir():
- print(item.basename)
-
- assert (
- len([f for f in tmpdir.listdir() if f.basename.startswith("simple_setup")]) == 1
- )
- assert len(list(tmpdir.listdir())) == 4 # two files + output + build_dir
-
- (tmpdir / "test.py").write_text(
- dedent(
- u"""\
- import simple_setup
- assert simple_setup.f(3) == 9
- """
- ),
- encoding="ascii",
- )
-
- subprocess.check_call(
- [sys.executable, "test.py"], stdout=sys.stdout, stderr=sys.stderr
- )
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/local_bindings.h b/3rdParty/pybind11/pybind11-2.6.0/tests/local_bindings.h
deleted file mode 100644
index 22537b13ada87abbef7944de868630ad56a02b43..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/local_bindings.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-#include "pybind11_tests.h"
-
-/// Simple class used to test py::local:
-template <int> class LocalBase {
-public:
- LocalBase(int i) : i(i) { }
- int i = -1;
-};
-
-/// Registered with py::module_local in both main and secondary modules:
-using LocalType = LocalBase<0>;
-/// Registered without py::module_local in both modules:
-using NonLocalType = LocalBase<1>;
-/// A second non-local type (for stl_bind tests):
-using NonLocal2 = LocalBase<2>;
-/// Tests within-module, different-compilation-unit local definition conflict:
-using LocalExternal = LocalBase<3>;
-/// Mixed: registered local first, then global
-using MixedLocalGlobal = LocalBase<4>;
-/// Mixed: global first, then local
-using MixedGlobalLocal = LocalBase<5>;
-
-/// Registered with py::module_local only in the secondary module:
-using ExternalType1 = LocalBase<6>;
-using ExternalType2 = LocalBase<7>;
-
-using LocalVec = std::vector<LocalType>;
-using LocalVec2 = std::vector<NonLocal2>;
-using LocalMap = std::unordered_map<std::string, LocalType>;
-using NonLocalVec = std::vector<NonLocalType>;
-using NonLocalVec2 = std::vector<NonLocal2>;
-using NonLocalMap = std::unordered_map<std::string, NonLocalType>;
-using NonLocalMap2 = std::unordered_map<std::string, uint8_t>;
-
-PYBIND11_MAKE_OPAQUE(LocalVec);
-PYBIND11_MAKE_OPAQUE(LocalVec2);
-PYBIND11_MAKE_OPAQUE(LocalMap);
-PYBIND11_MAKE_OPAQUE(NonLocalVec);
-//PYBIND11_MAKE_OPAQUE(NonLocalVec2); // same type as LocalVec2
-PYBIND11_MAKE_OPAQUE(NonLocalMap);
-PYBIND11_MAKE_OPAQUE(NonLocalMap2);
-
-
-// Simple bindings (used with the above):
-template <typename T, int Adjust = 0, typename... Args>
-py::class_<T> bind_local(Args && ...args) {
- return py::class_<T>(std::forward<Args>(args)...)
- .def(py::init<int>())
- .def("get", [](T &i) { return i.i + Adjust; });
-};
-
-// Simulate a foreign library base class (to match the example in the docs):
-namespace pets {
-class Pet {
-public:
- Pet(std::string name) : name_(name) {}
- std::string name_;
- const std::string &name() { return name_; }
-};
-} // namespace pets
-
-struct MixGL { int i; MixGL(int i) : i{i} {} };
-struct MixGL2 { int i; MixGL2(int i) : i{i} {} };
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/object.h b/3rdParty/pybind11/pybind11-2.6.0/tests/object.h
deleted file mode 100644
index 9235f19c20bff3afb59c6880a84c809205eff6ea..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/object.h
+++ /dev/null
@@ -1,175 +0,0 @@
-#if !defined(__OBJECT_H)
-#define __OBJECT_H
-
-#include <atomic>
-#include "constructor_stats.h"
-
-/// Reference counted object base class
-class Object {
-public:
- /// Default constructor
- Object() { print_default_created(this); }
-
- /// Copy constructor
- Object(const Object &) : m_refCount(0) { print_copy_created(this); }
-
- /// Return the current reference count
- int getRefCount() const { return m_refCount; };
-
- /// Increase the object's reference count by one
- void incRef() const { ++m_refCount; }
-
- /** \brief Decrease the reference count of
- * the object and possibly deallocate it.
- *
- * The object will automatically be deallocated once
- * the reference count reaches zero.
- */
- void decRef(bool dealloc = true) const {
- --m_refCount;
- if (m_refCount == 0 && dealloc)
- delete this;
- else if (m_refCount < 0)
- throw std::runtime_error("Internal error: reference count < 0!");
- }
-
- virtual std::string toString() const = 0;
-protected:
- /** \brief Virtual protected deconstructor.
- * (Will only be called by \ref ref)
- */
- virtual ~Object() { print_destroyed(this); }
-private:
- mutable std::atomic<int> m_refCount { 0 };
-};
-
-// Tag class used to track constructions of ref objects. When we track constructors, below, we
-// track and print out the actual class (e.g. ref<MyObject>), and *also* add a fake tracker for
-// ref_tag. This lets us check that the total number of ref<Anything> constructors/destructors is
-// correct without having to check each individual ref<Whatever> type individually.
-class ref_tag {};
-
-/**
- * \brief Reference counting helper
- *
- * The \a ref refeference template is a simple wrapper to store a
- * pointer to an object. It takes care of increasing and decreasing
- * the reference count of the object. When the last reference goes
- * out of scope, the associated object will be deallocated.
- *
- * \ingroup libcore
- */
-template <typename T> class ref {
-public:
- /// Create a nullptr reference
- ref() : m_ptr(nullptr) { print_default_created(this); track_default_created((ref_tag*) this); }
-
- /// Construct a reference from a pointer
- ref(T *ptr) : m_ptr(ptr) {
- if (m_ptr) ((Object *) m_ptr)->incRef();
-
- print_created(this, "from pointer", m_ptr); track_created((ref_tag*) this, "from pointer");
-
- }
-
- /// Copy constructor
- ref(const ref &r) : m_ptr(r.m_ptr) {
- if (m_ptr)
- ((Object *) m_ptr)->incRef();
-
- print_copy_created(this, "with pointer", m_ptr); track_copy_created((ref_tag*) this);
- }
-
- /// Move constructor
- ref(ref &&r) : m_ptr(r.m_ptr) {
- r.m_ptr = nullptr;
-
- print_move_created(this, "with pointer", m_ptr); track_move_created((ref_tag*) this);
- }
-
- /// Destroy this reference
- ~ref() {
- if (m_ptr)
- ((Object *) m_ptr)->decRef();
-
- print_destroyed(this); track_destroyed((ref_tag*) this);
- }
-
- /// Move another reference into the current one
- ref& operator=(ref&& r) {
- print_move_assigned(this, "pointer", r.m_ptr); track_move_assigned((ref_tag*) this);
-
- if (*this == r)
- return *this;
- if (m_ptr)
- ((Object *) m_ptr)->decRef();
- m_ptr = r.m_ptr;
- r.m_ptr = nullptr;
- return *this;
- }
-
- /// Overwrite this reference with another reference
- ref& operator=(const ref& r) {
- print_copy_assigned(this, "pointer", r.m_ptr); track_copy_assigned((ref_tag*) this);
-
- if (m_ptr == r.m_ptr)
- return *this;
- if (m_ptr)
- ((Object *) m_ptr)->decRef();
- m_ptr = r.m_ptr;
- if (m_ptr)
- ((Object *) m_ptr)->incRef();
- return *this;
- }
-
- /// Overwrite this reference with a pointer to another object
- ref& operator=(T *ptr) {
- print_values(this, "assigned pointer"); track_values((ref_tag*) this, "assigned pointer");
-
- if (m_ptr == ptr)
- return *this;
- if (m_ptr)
- ((Object *) m_ptr)->decRef();
- m_ptr = ptr;
- if (m_ptr)
- ((Object *) m_ptr)->incRef();
- return *this;
- }
-
- /// Compare this reference with another reference
- bool operator==(const ref &r) const { return m_ptr == r.m_ptr; }
-
- /// Compare this reference with another reference
- bool operator!=(const ref &r) const { return m_ptr != r.m_ptr; }
-
- /// Compare this reference with a pointer
- bool operator==(const T* ptr) const { return m_ptr == ptr; }
-
- /// Compare this reference with a pointer
- bool operator!=(const T* ptr) const { return m_ptr != ptr; }
-
- /// Access the object referenced by this reference
- T* operator->() { return m_ptr; }
-
- /// Access the object referenced by this reference
- const T* operator->() const { return m_ptr; }
-
- /// Return a C++ reference to the referenced object
- T& operator*() { return *m_ptr; }
-
- /// Return a const C++ reference to the referenced object
- const T& operator*() const { return *m_ptr; }
-
- /// Return a pointer to the referenced object
- operator T* () { return m_ptr; }
-
- /// Return a const pointer to the referenced object
- T* get_ptr() { return m_ptr; }
-
- /// Return a pointer to the referenced object
- const T* get_ptr() const { return m_ptr; }
-private:
- T *m_ptr;
-};
-
-#endif /* __OBJECT_H */
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/pybind11_cross_module_tests.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/pybind11_cross_module_tests.cpp
deleted file mode 100644
index f705e310611619dff319f9b5d53b71e6fd54aec5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/pybind11_cross_module_tests.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- tests/pybind11_cross_module_tests.cpp -- contains tests that require multiple modules
-
- Copyright (c) 2017 Jason Rhinelander <jason@imaginary.ca>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "local_bindings.h"
-#include <pybind11/stl_bind.h>
-#include <numeric>
-
-PYBIND11_MODULE(pybind11_cross_module_tests, m) {
- m.doc() = "pybind11 cross-module test module";
-
- // test_local_bindings.py tests:
- //
- // Definitions here are tested by importing both this module and the
- // relevant pybind11_tests submodule from a test_whatever.py
-
- // test_load_external
- bind_local<ExternalType1>(m, "ExternalType1", py::module_local());
- bind_local<ExternalType2>(m, "ExternalType2", py::module_local());
-
- // test_exceptions.py
- m.def("raise_runtime_error", []() { PyErr_SetString(PyExc_RuntimeError, "My runtime error"); throw py::error_already_set(); });
- m.def("raise_value_error", []() { PyErr_SetString(PyExc_ValueError, "My value error"); throw py::error_already_set(); });
- m.def("throw_pybind_value_error", []() { throw py::value_error("pybind11 value error"); });
- m.def("throw_pybind_type_error", []() { throw py::type_error("pybind11 type error"); });
- m.def("throw_stop_iteration", []() { throw py::stop_iteration(); });
-
- // test_local_bindings.py
- // Local to both:
- bind_local<LocalType, 1>(m, "LocalType", py::module_local())
- .def("get2", [](LocalType &t) { return t.i + 2; })
- ;
-
- // Can only be called with our python type:
- m.def("local_value", [](LocalType &l) { return l.i; });
-
- // test_nonlocal_failure
- // This registration will fail (global registration when LocalFail is already registered
- // globally in the main test module):
- m.def("register_nonlocal", [m]() {
- bind_local<NonLocalType, 0>(m, "NonLocalType");
- });
-
- // test_stl_bind_local
- // stl_bind.h binders defaults to py::module_local if the types are local or converting:
- py::bind_vector<LocalVec>(m, "LocalVec");
- py::bind_map<LocalMap>(m, "LocalMap");
-
- // test_stl_bind_global
- // and global if the type (or one of the types, for the map) is global (so these will fail,
- // assuming pybind11_tests is already loaded):
- m.def("register_nonlocal_vec", [m]() {
- py::bind_vector<NonLocalVec>(m, "NonLocalVec");
- });
- m.def("register_nonlocal_map", [m]() {
- py::bind_map<NonLocalMap>(m, "NonLocalMap");
- });
- // The default can, however, be overridden to global using `py::module_local()` or
- // `py::module_local(false)`.
- // Explicitly made local:
- py::bind_vector<NonLocalVec2>(m, "NonLocalVec2", py::module_local());
- // Explicitly made global (and so will fail to bind):
- m.def("register_nonlocal_map2", [m]() {
- py::bind_map<NonLocalMap2>(m, "NonLocalMap2", py::module_local(false));
- });
-
- // test_mixed_local_global
- // We try this both with the global type registered first and vice versa (the order shouldn't
- // matter).
- m.def("register_mixed_global_local", [m]() {
- bind_local<MixedGlobalLocal, 200>(m, "MixedGlobalLocal", py::module_local());
- });
- m.def("register_mixed_local_global", [m]() {
- bind_local<MixedLocalGlobal, 2000>(m, "MixedLocalGlobal", py::module_local(false));
- });
- m.def("get_mixed_gl", [](int i) { return MixedGlobalLocal(i); });
- m.def("get_mixed_lg", [](int i) { return MixedLocalGlobal(i); });
-
- // test_internal_locals_differ
- m.def("local_cpp_types_addr", []() { return (uintptr_t) &py::detail::registered_local_types_cpp(); });
-
- // test_stl_caster_vs_stl_bind
- py::bind_vector<std::vector<int>>(m, "VectorInt");
-
- m.def("load_vector_via_binding", [](std::vector<int> &v) {
- return std::accumulate(v.begin(), v.end(), 0);
- });
-
- // test_cross_module_calls
- m.def("return_self", [](LocalVec *v) { return v; });
- m.def("return_copy", [](const LocalVec &v) { return LocalVec(v); });
-
- class Dog : public pets::Pet { public: Dog(std::string name) : Pet(name) {}; };
- py::class_<pets::Pet>(m, "Pet", py::module_local())
- .def("name", &pets::Pet::name);
- // Binding for local extending class:
- py::class_<Dog, pets::Pet>(m, "Dog")
- .def(py::init<std::string>());
- m.def("pet_name", [](pets::Pet &p) { return p.name(); });
-
- py::class_<MixGL>(m, "MixGL", py::module_local()).def(py::init<int>());
- m.def("get_gl_value", [](MixGL &o) { return o.i + 100; });
-
- py::class_<MixGL2>(m, "MixGL2", py::module_local()).def(py::init<int>());
-
- // test_vector_bool
- // We can't test both stl.h and stl_bind.h conversions of `std::vector<bool>` within
- // the same module (it would be an ODR violation). Therefore `bind_vector` of `bool`
- // is defined here and tested in `test_stl_binders.py`.
- py::bind_vector<std::vector<bool>>(m, "VectorBool");
-
- // test_missing_header_message
- // The main module already includes stl.h, but we need to test the error message
- // which appears when this header is missing.
- m.def("missing_header_arg", [](std::vector<float>) { });
- m.def("missing_header_return", []() { return std::vector<float>(); });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/pybind11_tests.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/pybind11_tests.cpp
deleted file mode 100644
index 439cd401291bb82e7558ba28bcf365e5efd9f4fb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/pybind11_tests.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- tests/pybind11_tests.cpp -- pybind example plugin
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-
-#include <functional>
-#include <list>
-
-/*
-For testing purposes, we define a static global variable here in a function that each individual
-test .cpp calls with its initialization lambda. It's convenient here because we can just not
-compile some test files to disable/ignore some of the test code.
-
-It is NOT recommended as a way to use pybind11 in practice, however: the initialization order will
-be essentially random, which is okay for our test scripts (there are no dependencies between the
-individual pybind11 test .cpp files), but most likely not what you want when using pybind11
-productively.
-
-Instead, see the "How can I reduce the build time?" question in the "Frequently asked questions"
-section of the documentation for good practice on splitting binding code over multiple files.
-*/
-std::list<std::function<void(py::module_ &)>> &initializers() {
- static std::list<std::function<void(py::module_ &)>> inits;
- return inits;
-}
-
-test_initializer::test_initializer(Initializer init) {
- initializers().emplace_back(init);
-}
-
-test_initializer::test_initializer(const char *submodule_name, Initializer init) {
- initializers().emplace_back([=](py::module_ &parent) {
- auto m = parent.def_submodule(submodule_name);
- init(m);
- });
-}
-
-void bind_ConstructorStats(py::module_ &m) {
- py::class_<ConstructorStats>(m, "ConstructorStats")
- .def("alive", &ConstructorStats::alive)
- .def("values", &ConstructorStats::values)
- .def_readwrite("default_constructions", &ConstructorStats::default_constructions)
- .def_readwrite("copy_assignments", &ConstructorStats::copy_assignments)
- .def_readwrite("move_assignments", &ConstructorStats::move_assignments)
- .def_readwrite("copy_constructions", &ConstructorStats::copy_constructions)
- .def_readwrite("move_constructions", &ConstructorStats::move_constructions)
- .def_static("get", (ConstructorStats &(*)(py::object)) &ConstructorStats::get, py::return_value_policy::reference_internal)
-
- // Not exactly ConstructorStats, but related: expose the internal pybind number of registered instances
- // to allow instance cleanup checks (invokes a GC first)
- .def_static("detail_reg_inst", []() {
- ConstructorStats::gc();
- return py::detail::get_internals().registered_instances.size();
- })
- ;
-}
-
-PYBIND11_MODULE(pybind11_tests, m) {
- m.doc() = "pybind11 test module";
-
- bind_ConstructorStats(m);
-
-#if !defined(NDEBUG)
- m.attr("debug_enabled") = true;
-#else
- m.attr("debug_enabled") = false;
-#endif
-
- py::class_<UserType>(m, "UserType", "A `py::class_` type for testing")
- .def(py::init<>())
- .def(py::init<int>())
- .def("get_value", &UserType::value, "Get value using a method")
- .def("set_value", &UserType::set, "Set value using a method")
- .def_property("value", &UserType::value, &UserType::set, "Get/set value using a property")
- .def("__repr__", [](const UserType& u) { return "UserType({})"_s.format(u.value()); });
-
- py::class_<IncType, UserType>(m, "IncType")
- .def(py::init<>())
- .def(py::init<int>())
- .def("__repr__", [](const IncType& u) { return "IncType({})"_s.format(u.value()); });
-
- for (const auto &initializer : initializers())
- initializer(m);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/pybind11_tests.h b/3rdParty/pybind11/pybind11-2.6.0/tests/pybind11_tests.h
deleted file mode 100644
index 4ff56c07dea21df5d279b9c89b5fa40bca72a6d9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/pybind11_tests.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-#include <pybind11/pybind11.h>
-
-#if defined(_MSC_VER) && _MSC_VER < 1910
-// We get some really long type names here which causes MSVC 2015 to emit warnings
-# pragma warning(disable: 4503) // warning C4503: decorated name length exceeded, name was truncated
-#endif
-
-namespace py = pybind11;
-using namespace pybind11::literals;
-
-class test_initializer {
- using Initializer = void (*)(py::module_ &);
-
-public:
- test_initializer(Initializer init);
- test_initializer(const char *submodule_name, Initializer init);
-};
-
-#define TEST_SUBMODULE(name, variable) \
- void test_submodule_##name(py::module_ &); \
- test_initializer name(#name, test_submodule_##name); \
- void test_submodule_##name(py::module_ &variable)
-
-
-/// Dummy type which is not exported anywhere -- something to trigger a conversion error
-struct UnregisteredType { };
-
-/// A user-defined type which is exported and can be used by any test
-class UserType {
-public:
- UserType() = default;
- UserType(int i) : i(i) { }
-
- int value() const { return i; }
- void set(int set) { i = set; }
-
-private:
- int i = -1;
-};
-
-/// Like UserType, but increments `value` on copy for quick reference vs. copy tests
-class IncType : public UserType {
-public:
- using UserType::UserType;
- IncType() = default;
- IncType(const IncType &other) : IncType(other.value() + 1) { }
- IncType(IncType &&) = delete;
- IncType &operator=(const IncType &) = delete;
- IncType &operator=(IncType &&) = delete;
-};
-
-/// A simple union for basic testing
-union IntFloat {
- int i;
- float f;
-};
-
-/// Custom cast-only type that casts to a string "rvalue" or "lvalue" depending on the cast context.
-/// Used to test recursive casters (e.g. std::tuple, stl containers).
-struct RValueCaster {};
-PYBIND11_NAMESPACE_BEGIN(pybind11)
-PYBIND11_NAMESPACE_BEGIN(detail)
-template<> class type_caster<RValueCaster> {
-public:
- PYBIND11_TYPE_CASTER(RValueCaster, _("RValueCaster"));
- static handle cast(RValueCaster &&, return_value_policy, handle) { return py::str("rvalue").release(); }
- static handle cast(const RValueCaster &, return_value_policy, handle) { return py::str("lvalue").release(); }
-};
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(pybind11)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/pytest.ini b/3rdParty/pybind11/pybind11-2.6.0/tests/pytest.ini
deleted file mode 100644
index c47cbe9c1e16fc7e80b5712e5307e2e183c81863..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/pytest.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[pytest]
-minversion = 3.1
-norecursedirs = test_* extra_*
-xfail_strict = True
-addopts =
- # show summary of skipped tests
- -rs
- # capture only Python print and C++ py::print, but not C output (low-level Python errors)
- --capture=sys
- # enable all warnings
- -Wa
-filterwarnings =
- # make warnings into errors but ignore certain third-party extension issues
- error
- # importing scipy submodules on some version of Python
- ignore::ImportWarning
- # bogus numpy ABI warning (see numpy/#432)
- ignore:.*numpy.dtype size changed.*:RuntimeWarning
- ignore:.*numpy.ufunc size changed.*:RuntimeWarning
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/requirements.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/requirements.txt
deleted file mode 100644
index f2d21a6489e4b5f2377718adfcd833ff0ca15ba1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/requirements.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010/
-numpy==1.16.6; python_version<"3.6" and sys_platform!="win32"
-numpy==1.18.0; platform_python_implementation=="PyPy" and sys_platform=="darwin" and python_version>="3.6"
-numpy==1.19.1; (platform_python_implementation!="PyPy" or sys_platform=="linux") and python_version>="3.6" and python_version<"3.9"
-pytest==4.6.9; python_version<"3.5"
-pytest==5.4.3; python_version>="3.5"
-scipy==1.2.3; (platform_python_implementation!="PyPy" or sys_platform=="linux") and python_version<"3.6"
-scipy==1.5.2; (platform_python_implementation!="PyPy" or sys_platform=="linux") and python_version>="3.6" and python_version<"3.9"
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_async.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_async.cpp
deleted file mode 100644
index e6e01d72c92ff80bb95cc2df153f18bfddf03825..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_async.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- tests/test_async.cpp -- __await__ support
-
- Copyright (c) 2019 Google Inc.
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-TEST_SUBMODULE(async_module, m) {
- struct DoesNotSupportAsync {};
- py::class_<DoesNotSupportAsync>(m, "DoesNotSupportAsync")
- .def(py::init<>());
- struct SupportsAsync {};
- py::class_<SupportsAsync>(m, "SupportsAsync")
- .def(py::init<>())
- .def("__await__", [](const SupportsAsync& self) -> py::object {
- static_cast<void>(self);
- py::object loop = py::module_::import("asyncio.events").attr("get_event_loop")();
- py::object f = loop.attr("create_future")();
- f.attr("set_result")(5);
- return f.attr("__await__")();
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_async.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_async.py
deleted file mode 100644
index df4489c499e88f190764dd17cef44b54b4516202..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_async.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-asyncio = pytest.importorskip("asyncio")
-m = pytest.importorskip("pybind11_tests.async_module")
-
-
-@pytest.fixture
-def event_loop():
- loop = asyncio.new_event_loop()
- yield loop
- loop.close()
-
-
-async def get_await_result(x):
- return await x
-
-
-def test_await(event_loop):
- assert 5 == event_loop.run_until_complete(get_await_result(m.SupportsAsync()))
-
-
-def test_await_missing(event_loop):
- with pytest.raises(TypeError):
- event_loop.run_until_complete(get_await_result(m.DoesNotSupportAsync()))
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_buffers.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_buffers.cpp
deleted file mode 100644
index 46eabf396351dd62d4789b06ee3d8d459d368fa8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_buffers.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- tests/test_buffers.cpp -- supporting Pythons' buffer protocol
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <pybind11/stl.h>
-
-TEST_SUBMODULE(buffers, m) {
- // test_from_python / test_to_python:
- class Matrix {
- public:
- Matrix(py::ssize_t rows, py::ssize_t cols) : m_rows(rows), m_cols(cols) {
- print_created(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
- m_data = new float[(size_t) (rows*cols)];
- memset(m_data, 0, sizeof(float) * (size_t) (rows * cols));
- }
-
- Matrix(const Matrix &s) : m_rows(s.m_rows), m_cols(s.m_cols) {
- print_copy_created(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
- m_data = new float[(size_t) (m_rows * m_cols)];
- memcpy(m_data, s.m_data, sizeof(float) * (size_t) (m_rows * m_cols));
- }
-
- Matrix(Matrix &&s) : m_rows(s.m_rows), m_cols(s.m_cols), m_data(s.m_data) {
- print_move_created(this);
- s.m_rows = 0;
- s.m_cols = 0;
- s.m_data = nullptr;
- }
-
- ~Matrix() {
- print_destroyed(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
- delete[] m_data;
- }
-
- Matrix &operator=(const Matrix &s) {
- print_copy_assigned(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
- delete[] m_data;
- m_rows = s.m_rows;
- m_cols = s.m_cols;
- m_data = new float[(size_t) (m_rows * m_cols)];
- memcpy(m_data, s.m_data, sizeof(float) * (size_t) (m_rows * m_cols));
- return *this;
- }
-
- Matrix &operator=(Matrix &&s) {
- print_move_assigned(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
- if (&s != this) {
- delete[] m_data;
- m_rows = s.m_rows; m_cols = s.m_cols; m_data = s.m_data;
- s.m_rows = 0; s.m_cols = 0; s.m_data = nullptr;
- }
- return *this;
- }
-
- float operator()(py::ssize_t i, py::ssize_t j) const {
- return m_data[(size_t) (i*m_cols + j)];
- }
-
- float &operator()(py::ssize_t i, py::ssize_t j) {
- return m_data[(size_t) (i*m_cols + j)];
- }
-
- float *data() { return m_data; }
-
- py::ssize_t rows() const { return m_rows; }
- py::ssize_t cols() const { return m_cols; }
- private:
- py::ssize_t m_rows;
- py::ssize_t m_cols;
- float *m_data;
- };
- py::class_<Matrix>(m, "Matrix", py::buffer_protocol())
- .def(py::init<py::ssize_t, py::ssize_t>())
- /// Construct from a buffer
- .def(py::init([](py::buffer const b) {
- py::buffer_info info = b.request();
- if (info.format != py::format_descriptor<float>::format() || info.ndim != 2)
- throw std::runtime_error("Incompatible buffer format!");
-
- auto v = new Matrix(info.shape[0], info.shape[1]);
- memcpy(v->data(), info.ptr, sizeof(float) * (size_t) (v->rows() * v->cols()));
- return v;
- }))
-
- .def("rows", &Matrix::rows)
- .def("cols", &Matrix::cols)
-
- /// Bare bones interface
- .def("__getitem__", [](const Matrix &m, std::pair<py::ssize_t, py::ssize_t> i) {
- if (i.first >= m.rows() || i.second >= m.cols())
- throw py::index_error();
- return m(i.first, i.second);
- })
- .def("__setitem__", [](Matrix &m, std::pair<py::ssize_t, py::ssize_t> i, float v) {
- if (i.first >= m.rows() || i.second >= m.cols())
- throw py::index_error();
- m(i.first, i.second) = v;
- })
- /// Provide buffer access
- .def_buffer([](Matrix &m) -> py::buffer_info {
- return py::buffer_info(
- m.data(), /* Pointer to buffer */
- { m.rows(), m.cols() }, /* Buffer dimensions */
- { sizeof(float) * size_t(m.cols()), /* Strides (in bytes) for each index */
- sizeof(float) }
- );
- })
- ;
-
-
- // test_inherited_protocol
- class SquareMatrix : public Matrix {
- public:
- SquareMatrix(py::ssize_t n) : Matrix(n, n) { }
- };
- // Derived classes inherit the buffer protocol and the buffer access function
- py::class_<SquareMatrix, Matrix>(m, "SquareMatrix")
- .def(py::init<py::ssize_t>());
-
-
- // test_pointer_to_member_fn
- // Tests that passing a pointer to member to the base class works in
- // the derived class.
- struct Buffer {
- int32_t value = 0;
-
- py::buffer_info get_buffer_info() {
- return py::buffer_info(&value, sizeof(value),
- py::format_descriptor<int32_t>::format(), 1);
- }
- };
- py::class_<Buffer>(m, "Buffer", py::buffer_protocol())
- .def(py::init<>())
- .def_readwrite("value", &Buffer::value)
- .def_buffer(&Buffer::get_buffer_info);
-
-
- class ConstBuffer {
- std::unique_ptr<int32_t> value;
-
- public:
- int32_t get_value() const { return *value; }
- void set_value(int32_t v) { *value = v; }
-
- py::buffer_info get_buffer_info() const {
- return py::buffer_info(value.get(), sizeof(*value),
- py::format_descriptor<int32_t>::format(), 1);
- }
-
- ConstBuffer() : value(new int32_t{0}) { };
- };
- py::class_<ConstBuffer>(m, "ConstBuffer", py::buffer_protocol())
- .def(py::init<>())
- .def_property("value", &ConstBuffer::get_value, &ConstBuffer::set_value)
- .def_buffer(&ConstBuffer::get_buffer_info);
-
- struct DerivedBuffer : public Buffer { };
- py::class_<DerivedBuffer>(m, "DerivedBuffer", py::buffer_protocol())
- .def(py::init<>())
- .def_readwrite("value", (int32_t DerivedBuffer::*) &DerivedBuffer::value)
- .def_buffer(&DerivedBuffer::get_buffer_info);
-
- struct BufferReadOnly {
- const uint8_t value = 0;
- BufferReadOnly(uint8_t value): value(value) {}
-
- py::buffer_info get_buffer_info() {
- return py::buffer_info(&value, 1);
- }
- };
- py::class_<BufferReadOnly>(m, "BufferReadOnly", py::buffer_protocol())
- .def(py::init<uint8_t>())
- .def_buffer(&BufferReadOnly::get_buffer_info);
-
- struct BufferReadOnlySelect {
- uint8_t value = 0;
- bool readonly = false;
-
- py::buffer_info get_buffer_info() {
- return py::buffer_info(&value, 1, readonly);
- }
- };
- py::class_<BufferReadOnlySelect>(m, "BufferReadOnlySelect", py::buffer_protocol())
- .def(py::init<>())
- .def_readwrite("value", &BufferReadOnlySelect::value)
- .def_readwrite("readonly", &BufferReadOnlySelect::readonly)
- .def_buffer(&BufferReadOnlySelect::get_buffer_info);
-
- // Expose buffer_info for testing.
- py::class_<py::buffer_info>(m, "buffer_info")
- .def(py::init<>())
- .def_readonly("itemsize", &py::buffer_info::itemsize)
- .def_readonly("size", &py::buffer_info::size)
- .def_readonly("format", &py::buffer_info::format)
- .def_readonly("ndim", &py::buffer_info::ndim)
- .def_readonly("shape", &py::buffer_info::shape)
- .def_readonly("strides", &py::buffer_info::strides)
- .def_readonly("readonly", &py::buffer_info::readonly)
- .def("__repr__", [](py::handle self) {
- return py::str("itemsize={0.itemsize!r}, size={0.size!r}, format={0.format!r}, ndim={0.ndim!r}, shape={0.shape!r}, strides={0.strides!r}, readonly={0.readonly!r}").format(self);
- })
- ;
-
- m.def("get_buffer_info", [](py::buffer buffer) {
- return buffer.request();
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_buffers.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_buffers.py
deleted file mode 100644
index f0f370844b90c423bf52e3a2f30934fe8c349103..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_buffers.py
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- coding: utf-8 -*-
-import io
-import struct
-import ctypes
-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import buffers as m
-from pybind11_tests import ConstructorStats
-
-np = pytest.importorskip("numpy")
-
-
-def test_from_python():
- with pytest.raises(RuntimeError) as excinfo:
- m.Matrix(np.array([1, 2, 3])) # trying to assign a 1D array
- assert str(excinfo.value) == "Incompatible buffer format!"
-
- m3 = np.array([[1, 2, 3], [4, 5, 6]]).astype(np.float32)
- m4 = m.Matrix(m3)
-
- for i in range(m4.rows()):
- for j in range(m4.cols()):
- assert m3[i, j] == m4[i, j]
-
- cstats = ConstructorStats.get(m.Matrix)
- assert cstats.alive() == 1
- del m3, m4
- assert cstats.alive() == 0
- assert cstats.values() == ["2x3 matrix"]
- assert cstats.copy_constructions == 0
- # assert cstats.move_constructions >= 0 # Don't invoke any
- assert cstats.copy_assignments == 0
- assert cstats.move_assignments == 0
-
-
-# https://foss.heptapod.net/pypy/pypy/-/issues/2444
-def test_to_python():
- mat = m.Matrix(5, 4)
- assert memoryview(mat).shape == (5, 4)
-
- assert mat[2, 3] == 0
- mat[2, 3] = 4.0
- mat[3, 2] = 7.0
- assert mat[2, 3] == 4
- assert mat[3, 2] == 7
- assert struct.unpack_from("f", mat, (3 * 4 + 2) * 4) == (7,)
- assert struct.unpack_from("f", mat, (2 * 4 + 3) * 4) == (4,)
-
- mat2 = np.array(mat, copy=False)
- assert mat2.shape == (5, 4)
- assert abs(mat2).sum() == 11
- assert mat2[2, 3] == 4 and mat2[3, 2] == 7
- mat2[2, 3] = 5
- assert mat2[2, 3] == 5
-
- cstats = ConstructorStats.get(m.Matrix)
- assert cstats.alive() == 1
- del mat
- pytest.gc_collect()
- assert cstats.alive() == 1
- del mat2 # holds a mat reference
- pytest.gc_collect()
- assert cstats.alive() == 0
- assert cstats.values() == ["5x4 matrix"]
- assert cstats.copy_constructions == 0
- # assert cstats.move_constructions >= 0 # Don't invoke any
- assert cstats.copy_assignments == 0
- assert cstats.move_assignments == 0
-
-
-def test_inherited_protocol():
- """SquareMatrix is derived from Matrix and inherits the buffer protocol"""
-
- matrix = m.SquareMatrix(5)
- assert memoryview(matrix).shape == (5, 5)
- assert np.asarray(matrix).shape == (5, 5)
-
-
-def test_pointer_to_member_fn():
- for cls in [m.Buffer, m.ConstBuffer, m.DerivedBuffer]:
- buf = cls()
- buf.value = 0x12345678
- value = struct.unpack("i", bytearray(buf))[0]
- assert value == 0x12345678
-
-
-def test_readonly_buffer():
- buf = m.BufferReadOnly(0x64)
- view = memoryview(buf)
- assert view[0] == b"d" if env.PY2 else 0x64
- assert view.readonly
-
-
-def test_selective_readonly_buffer():
- buf = m.BufferReadOnlySelect()
-
- memoryview(buf)[0] = b"d" if env.PY2 else 0x64
- assert buf.value == 0x64
-
- io.BytesIO(b"A").readinto(buf)
- assert buf.value == ord(b"A")
-
- buf.readonly = True
- with pytest.raises(TypeError):
- memoryview(buf)[0] = b"\0" if env.PY2 else 0
- with pytest.raises(TypeError):
- io.BytesIO(b"1").readinto(buf)
-
-
-def test_ctypes_array_1d():
- char1d = (ctypes.c_char * 10)()
- int1d = (ctypes.c_int * 15)()
- long1d = (ctypes.c_long * 7)()
-
- for carray in (char1d, int1d, long1d):
- info = m.get_buffer_info(carray)
- assert info.itemsize == ctypes.sizeof(carray._type_)
- assert info.size == len(carray)
- assert info.ndim == 1
- assert info.shape == [info.size]
- assert info.strides == [info.itemsize]
- assert not info.readonly
-
-
-def test_ctypes_array_2d():
- char2d = ((ctypes.c_char * 10) * 4)()
- int2d = ((ctypes.c_int * 15) * 3)()
- long2d = ((ctypes.c_long * 7) * 2)()
-
- for carray in (char2d, int2d, long2d):
- info = m.get_buffer_info(carray)
- assert info.itemsize == ctypes.sizeof(carray[0]._type_)
- assert info.size == len(carray) * len(carray[0])
- assert info.ndim == 2
- assert info.shape == [len(carray), len(carray[0])]
- assert info.strides == [info.itemsize * len(carray[0]), info.itemsize]
- assert not info.readonly
-
-
-@pytest.mark.skipif(
- "env.PYPY and env.PY2", reason="PyPy2 bytes buffer not reported as readonly"
-)
-def test_ctypes_from_buffer():
- test_pystr = b"0123456789"
- for pyarray in (test_pystr, bytearray(test_pystr)):
- pyinfo = m.get_buffer_info(pyarray)
-
- if pyinfo.readonly:
- cbytes = (ctypes.c_char * len(pyarray)).from_buffer_copy(pyarray)
- cinfo = m.get_buffer_info(cbytes)
- else:
- cbytes = (ctypes.c_char * len(pyarray)).from_buffer(pyarray)
- cinfo = m.get_buffer_info(cbytes)
-
- assert cinfo.size == pyinfo.size
- assert cinfo.ndim == pyinfo.ndim
- assert cinfo.shape == pyinfo.shape
- assert cinfo.strides == pyinfo.strides
- assert not cinfo.readonly
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_builtin_casters.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_builtin_casters.cpp
deleted file mode 100644
index acc9f8fb368899cde8b25702d4410c0d591fb5ee..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_builtin_casters.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- tests/test_builtin_casters.cpp -- Casters available without any additional headers
-
- Copyright (c) 2017 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include <pybind11/complex.h>
-
-#if defined(_MSC_VER)
-# pragma warning(push)
-# pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
-#endif
-
-TEST_SUBMODULE(builtin_casters, m) {
- // test_simple_string
- m.def("string_roundtrip", [](const char *s) { return s; });
-
- // test_unicode_conversion
- // Some test characters in utf16 and utf32 encodings. The last one (the ð€) contains a null byte
- char32_t a32 = 0x61 /*a*/, z32 = 0x7a /*z*/, ib32 = 0x203d /*‽*/, cake32 = 0x1f382 /*🎂*/, mathbfA32 = 0x1d400 /*ð€*/;
- char16_t b16 = 0x62 /*b*/, z16 = 0x7a, ib16 = 0x203d, cake16_1 = 0xd83c, cake16_2 = 0xdf82, mathbfA16_1 = 0xd835, mathbfA16_2 = 0xdc00;
- std::wstring wstr;
- wstr.push_back(0x61); // a
- wstr.push_back(0x2e18); // ⸘
- if (sizeof(wchar_t) == 2) { wstr.push_back(mathbfA16_1); wstr.push_back(mathbfA16_2); } // ð€, utf16
- else { wstr.push_back((wchar_t) mathbfA32); } // ð€, utf32
- wstr.push_back(0x7a); // z
-
- m.def("good_utf8_string", []() { return std::string((const char*)u8"Say utf8\u203d \U0001f382 \U0001d400"); }); // Say utf8‽ 🎂 ð€
- m.def("good_utf16_string", [=]() { return std::u16string({ b16, ib16, cake16_1, cake16_2, mathbfA16_1, mathbfA16_2, z16 }); }); // b‽🎂ð€z
- m.def("good_utf32_string", [=]() { return std::u32string({ a32, mathbfA32, cake32, ib32, z32 }); }); // að€ðŸŽ‚‽z
- m.def("good_wchar_string", [=]() { return wstr; }); // a‽ð€z
- m.def("bad_utf8_string", []() { return std::string("abc\xd0" "def"); });
- m.def("bad_utf16_string", [=]() { return std::u16string({ b16, char16_t(0xd800), z16 }); });
- // Under Python 2.7, invalid unicode UTF-32 characters don't appear to trigger UnicodeDecodeError
- if (PY_MAJOR_VERSION >= 3)
- m.def("bad_utf32_string", [=]() { return std::u32string({ a32, char32_t(0xd800), z32 }); });
- if (PY_MAJOR_VERSION >= 3 || sizeof(wchar_t) == 2)
- m.def("bad_wchar_string", [=]() { return std::wstring({ wchar_t(0x61), wchar_t(0xd800) }); });
- m.def("u8_Z", []() -> char { return 'Z'; });
- m.def("u8_eacute", []() -> char { return '\xe9'; });
- m.def("u16_ibang", [=]() -> char16_t { return ib16; });
- m.def("u32_mathbfA", [=]() -> char32_t { return mathbfA32; });
- m.def("wchar_heart", []() -> wchar_t { return 0x2665; });
-
- // test_single_char_arguments
- m.attr("wchar_size") = py::cast(sizeof(wchar_t));
- m.def("ord_char", [](char c) -> int { return static_cast<unsigned char>(c); });
- m.def("ord_char_lv", [](char &c) -> int { return static_cast<unsigned char>(c); });
- m.def("ord_char16", [](char16_t c) -> uint16_t { return c; });
- m.def("ord_char16_lv", [](char16_t &c) -> uint16_t { return c; });
- m.def("ord_char32", [](char32_t c) -> uint32_t { return c; });
- m.def("ord_wchar", [](wchar_t c) -> int { return c; });
-
- // test_bytes_to_string
- m.def("strlen", [](char *s) { return strlen(s); });
- m.def("string_length", [](std::string s) { return s.length(); });
-
-#ifdef PYBIND11_HAS_U8STRING
- m.attr("has_u8string") = true;
- m.def("good_utf8_u8string", []() { return std::u8string(u8"Say utf8\u203d \U0001f382 \U0001d400"); }); // Say utf8‽ 🎂 ð€
- m.def("bad_utf8_u8string", []() { return std::u8string((const char8_t*)"abc\xd0" "def"); });
-
- m.def("u8_char8_Z", []() -> char8_t { return u8'Z'; });
-
- // test_single_char_arguments
- m.def("ord_char8", [](char8_t c) -> int { return static_cast<unsigned char>(c); });
- m.def("ord_char8_lv", [](char8_t &c) -> int { return static_cast<unsigned char>(c); });
-#endif
-
- // test_string_view
-#ifdef PYBIND11_HAS_STRING_VIEW
- m.attr("has_string_view") = true;
- m.def("string_view_print", [](std::string_view s) { py::print(s, s.size()); });
- m.def("string_view16_print", [](std::u16string_view s) { py::print(s, s.size()); });
- m.def("string_view32_print", [](std::u32string_view s) { py::print(s, s.size()); });
- m.def("string_view_chars", [](std::string_view s) { py::list l; for (auto c : s) l.append((std::uint8_t) c); return l; });
- m.def("string_view16_chars", [](std::u16string_view s) { py::list l; for (auto c : s) l.append((int) c); return l; });
- m.def("string_view32_chars", [](std::u32string_view s) { py::list l; for (auto c : s) l.append((int) c); return l; });
- m.def("string_view_return", []() { return std::string_view((const char*)u8"utf8 secret \U0001f382"); });
- m.def("string_view16_return", []() { return std::u16string_view(u"utf16 secret \U0001f382"); });
- m.def("string_view32_return", []() { return std::u32string_view(U"utf32 secret \U0001f382"); });
-
-# ifdef PYBIND11_HAS_U8STRING
- m.def("string_view8_print", [](std::u8string_view s) { py::print(s, s.size()); });
- m.def("string_view8_chars", [](std::u8string_view s) { py::list l; for (auto c : s) l.append((std::uint8_t) c); return l; });
- m.def("string_view8_return", []() { return std::u8string_view(u8"utf8 secret \U0001f382"); });
-# endif
-#endif
-
- // test_integer_casting
- m.def("i32_str", [](std::int32_t v) { return std::to_string(v); });
- m.def("u32_str", [](std::uint32_t v) { return std::to_string(v); });
- m.def("i64_str", [](std::int64_t v) { return std::to_string(v); });
- m.def("u64_str", [](std::uint64_t v) { return std::to_string(v); });
-
- // test_tuple
- m.def("pair_passthrough", [](std::pair<bool, std::string> input) {
- return std::make_pair(input.second, input.first);
- }, "Return a pair in reversed order");
- m.def("tuple_passthrough", [](std::tuple<bool, std::string, int> input) {
- return std::make_tuple(std::get<2>(input), std::get<1>(input), std::get<0>(input));
- }, "Return a triple in reversed order");
- m.def("empty_tuple", []() { return std::tuple<>(); });
- static std::pair<RValueCaster, RValueCaster> lvpair;
- static std::tuple<RValueCaster, RValueCaster, RValueCaster> lvtuple;
- static std::pair<RValueCaster, std::tuple<RValueCaster, std::pair<RValueCaster, RValueCaster>>> lvnested;
- m.def("rvalue_pair", []() { return std::make_pair(RValueCaster{}, RValueCaster{}); });
- m.def("lvalue_pair", []() -> const decltype(lvpair) & { return lvpair; });
- m.def("rvalue_tuple", []() { return std::make_tuple(RValueCaster{}, RValueCaster{}, RValueCaster{}); });
- m.def("lvalue_tuple", []() -> const decltype(lvtuple) & { return lvtuple; });
- m.def("rvalue_nested", []() {
- return std::make_pair(RValueCaster{}, std::make_tuple(RValueCaster{}, std::make_pair(RValueCaster{}, RValueCaster{}))); });
- m.def("lvalue_nested", []() -> const decltype(lvnested) & { return lvnested; });
-
- static std::pair<int, std::string> int_string_pair{2, "items"};
- m.def("int_string_pair", []() { return &int_string_pair; });
-
- // test_builtins_cast_return_none
- m.def("return_none_string", []() -> std::string * { return nullptr; });
- m.def("return_none_char", []() -> const char * { return nullptr; });
- m.def("return_none_bool", []() -> bool * { return nullptr; });
- m.def("return_none_int", []() -> int * { return nullptr; });
- m.def("return_none_float", []() -> float * { return nullptr; });
- m.def("return_none_pair", []() -> std::pair<int,int> * { return nullptr; });
-
- // test_none_deferred
- m.def("defer_none_cstring", [](char *) { return false; });
- m.def("defer_none_cstring", [](py::none) { return true; });
- m.def("defer_none_custom", [](UserType *) { return false; });
- m.def("defer_none_custom", [](py::none) { return true; });
- m.def("nodefer_none_void", [](void *) { return true; });
- m.def("nodefer_none_void", [](py::none) { return false; });
-
- // test_void_caster
- m.def("load_nullptr_t", [](std::nullptr_t) {}); // not useful, but it should still compile
- m.def("cast_nullptr_t", []() { return std::nullptr_t{}; });
-
- // test_bool_caster
- m.def("bool_passthrough", [](bool arg) { return arg; });
- m.def("bool_passthrough_noconvert", [](bool arg) { return arg; }, py::arg().noconvert());
-
- // test_reference_wrapper
- m.def("refwrap_builtin", [](std::reference_wrapper<int> p) { return 10 * p.get(); });
- m.def("refwrap_usertype", [](std::reference_wrapper<UserType> p) { return p.get().value(); });
- // Not currently supported (std::pair caster has return-by-value cast operator);
- // triggers static_assert failure.
- //m.def("refwrap_pair", [](std::reference_wrapper<std::pair<int, int>>) { });
-
- m.def("refwrap_list", [](bool copy) {
- static IncType x1(1), x2(2);
- py::list l;
- for (auto &f : {std::ref(x1), std::ref(x2)}) {
- l.append(py::cast(f, copy ? py::return_value_policy::copy
- : py::return_value_policy::reference));
- }
- return l;
- }, "copy"_a);
-
- m.def("refwrap_iiw", [](const IncType &w) { return w.value(); });
- m.def("refwrap_call_iiw", [](IncType &w, py::function f) {
- py::list l;
- l.append(f(std::ref(w)));
- l.append(f(std::cref(w)));
- IncType x(w.value());
- l.append(f(std::ref(x)));
- IncType y(w.value());
- auto r3 = std::ref(y);
- l.append(f(r3));
- return l;
- });
-
- // test_complex
- m.def("complex_cast", [](float x) { return "{}"_s.format(x); });
- m.def("complex_cast", [](std::complex<float> x) { return "({}, {})"_s.format(x.real(), x.imag()); });
-
- // test int vs. long (Python 2)
- m.def("int_cast", []() {return (int) 42;});
- m.def("long_cast", []() {return (long) 42;});
- m.def("longlong_cast", []() {return ULLONG_MAX;});
-
- /// test void* cast operator
- m.def("test_void_caster", []() -> bool {
- void *v = (void *) 0xabcd;
- py::object o = py::cast(v);
- return py::cast<void *>(o) == v;
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_builtin_casters.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_builtin_casters.py
deleted file mode 100644
index bd7996b620dcb0a9bac4a1c28fe580f4d12af926..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_builtin_casters.py
+++ /dev/null
@@ -1,423 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import builtin_casters as m
-from pybind11_tests import UserType, IncType
-
-
-def test_simple_string():
- assert m.string_roundtrip("const char *") == "const char *"
-
-
-def test_unicode_conversion():
- """Tests unicode conversion and error reporting."""
- assert m.good_utf8_string() == u"Say utf8‽ 🎂 ð€"
- assert m.good_utf16_string() == u"b‽🎂ð€z"
- assert m.good_utf32_string() == u"að€ðŸŽ‚‽z"
- assert m.good_wchar_string() == u"a⸘ð€z"
- if hasattr(m, "has_u8string"):
- assert m.good_utf8_u8string() == u"Say utf8‽ 🎂 ð€"
-
- with pytest.raises(UnicodeDecodeError):
- m.bad_utf8_string()
-
- with pytest.raises(UnicodeDecodeError):
- m.bad_utf16_string()
-
- # These are provided only if they actually fail (they don't when 32-bit and under Python 2.7)
- if hasattr(m, "bad_utf32_string"):
- with pytest.raises(UnicodeDecodeError):
- m.bad_utf32_string()
- if hasattr(m, "bad_wchar_string"):
- with pytest.raises(UnicodeDecodeError):
- m.bad_wchar_string()
- if hasattr(m, "has_u8string"):
- with pytest.raises(UnicodeDecodeError):
- m.bad_utf8_u8string()
-
- assert m.u8_Z() == "Z"
- assert m.u8_eacute() == u"é"
- assert m.u16_ibang() == u"‽"
- assert m.u32_mathbfA() == u"ð€"
- assert m.wchar_heart() == u"♥"
- if hasattr(m, "has_u8string"):
- assert m.u8_char8_Z() == "Z"
-
-
-def test_single_char_arguments():
- """Tests failures for passing invalid inputs to char-accepting functions"""
-
- def toobig_message(r):
- return "Character code point not in range({0:#x})".format(r)
-
- toolong_message = "Expected a character, but multi-character string found"
-
- assert m.ord_char(u"a") == 0x61 # simple ASCII
- assert m.ord_char_lv(u"b") == 0x62
- assert (
- m.ord_char(u"é") == 0xE9
- ) # requires 2 bytes in utf-8, but can be stuffed in a char
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char(u"Ä€") == 0x100 # requires 2 bytes, doesn't fit in a char
- assert str(excinfo.value) == toobig_message(0x100)
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char(u"ab")
- assert str(excinfo.value) == toolong_message
-
- assert m.ord_char16(u"a") == 0x61
- assert m.ord_char16(u"é") == 0xE9
- assert m.ord_char16_lv(u"ê") == 0xEA
- assert m.ord_char16(u"Ä€") == 0x100
- assert m.ord_char16(u"‽") == 0x203D
- assert m.ord_char16(u"♥") == 0x2665
- assert m.ord_char16_lv(u"♡") == 0x2661
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char16(u"🎂") == 0x1F382 # requires surrogate pair
- assert str(excinfo.value) == toobig_message(0x10000)
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char16(u"aa")
- assert str(excinfo.value) == toolong_message
-
- assert m.ord_char32(u"a") == 0x61
- assert m.ord_char32(u"é") == 0xE9
- assert m.ord_char32(u"Ä€") == 0x100
- assert m.ord_char32(u"‽") == 0x203D
- assert m.ord_char32(u"♥") == 0x2665
- assert m.ord_char32(u"🎂") == 0x1F382
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char32(u"aa")
- assert str(excinfo.value) == toolong_message
-
- assert m.ord_wchar(u"a") == 0x61
- assert m.ord_wchar(u"é") == 0xE9
- assert m.ord_wchar(u"Ä€") == 0x100
- assert m.ord_wchar(u"‽") == 0x203D
- assert m.ord_wchar(u"♥") == 0x2665
- if m.wchar_size == 2:
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_wchar(u"🎂") == 0x1F382 # requires surrogate pair
- assert str(excinfo.value) == toobig_message(0x10000)
- else:
- assert m.ord_wchar(u"🎂") == 0x1F382
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_wchar(u"aa")
- assert str(excinfo.value) == toolong_message
-
- if hasattr(m, "has_u8string"):
- assert m.ord_char8(u"a") == 0x61 # simple ASCII
- assert m.ord_char8_lv(u"b") == 0x62
- assert (
- m.ord_char8(u"é") == 0xE9
- ) # requires 2 bytes in utf-8, but can be stuffed in a char
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char8(u"Ä€") == 0x100 # requires 2 bytes, doesn't fit in a char
- assert str(excinfo.value) == toobig_message(0x100)
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char8(u"ab")
- assert str(excinfo.value) == toolong_message
-
-
-def test_bytes_to_string():
- """Tests the ability to pass bytes to C++ string-accepting functions. Note that this is
- one-way: the only way to return bytes to Python is via the pybind11::bytes class."""
- # Issue #816
-
- def to_bytes(s):
- b = s if env.PY2 else s.encode("utf8")
- assert isinstance(b, bytes)
- return b
-
- assert m.strlen(to_bytes("hi")) == 2
- assert m.string_length(to_bytes("world")) == 5
- assert m.string_length(to_bytes("a\x00b")) == 3
- assert m.strlen(to_bytes("a\x00b")) == 1 # C-string limitation
-
- # passing in a utf8 encoded string should work
- assert m.string_length(u"💩".encode("utf8")) == 4
-
-
-@pytest.mark.skipif(not hasattr(m, "has_string_view"), reason="no <string_view>")
-def test_string_view(capture):
- """Tests support for C++17 string_view arguments and return values"""
- assert m.string_view_chars("Hi") == [72, 105]
- assert m.string_view_chars("Hi 🎂") == [72, 105, 32, 0xF0, 0x9F, 0x8E, 0x82]
- assert m.string_view16_chars(u"Hi 🎂") == [72, 105, 32, 0xD83C, 0xDF82]
- assert m.string_view32_chars(u"Hi 🎂") == [72, 105, 32, 127874]
- if hasattr(m, "has_u8string"):
- assert m.string_view8_chars("Hi") == [72, 105]
- assert m.string_view8_chars(u"Hi 🎂") == [72, 105, 32, 0xF0, 0x9F, 0x8E, 0x82]
-
- assert m.string_view_return() == u"utf8 secret 🎂"
- assert m.string_view16_return() == u"utf16 secret 🎂"
- assert m.string_view32_return() == u"utf32 secret 🎂"
- if hasattr(m, "has_u8string"):
- assert m.string_view8_return() == u"utf8 secret 🎂"
-
- with capture:
- m.string_view_print("Hi")
- m.string_view_print("utf8 🎂")
- m.string_view16_print(u"utf16 🎂")
- m.string_view32_print(u"utf32 🎂")
- assert (
- capture
- == u"""
- Hi 2
- utf8 🎂 9
- utf16 🎂 8
- utf32 🎂 7
- """
- )
- if hasattr(m, "has_u8string"):
- with capture:
- m.string_view8_print("Hi")
- m.string_view8_print(u"utf8 🎂")
- assert (
- capture
- == u"""
- Hi 2
- utf8 🎂 9
- """
- )
-
- with capture:
- m.string_view_print("Hi, ascii")
- m.string_view_print("Hi, utf8 🎂")
- m.string_view16_print(u"Hi, utf16 🎂")
- m.string_view32_print(u"Hi, utf32 🎂")
- assert (
- capture
- == u"""
- Hi, ascii 9
- Hi, utf8 🎂 13
- Hi, utf16 🎂 12
- Hi, utf32 🎂 11
- """
- )
- if hasattr(m, "has_u8string"):
- with capture:
- m.string_view8_print("Hi, ascii")
- m.string_view8_print(u"Hi, utf8 🎂")
- assert (
- capture
- == u"""
- Hi, ascii 9
- Hi, utf8 🎂 13
- """
- )
-
-
-def test_integer_casting():
- """Issue #929 - out-of-range integer values shouldn't be accepted"""
- assert m.i32_str(-1) == "-1"
- assert m.i64_str(-1) == "-1"
- assert m.i32_str(2000000000) == "2000000000"
- assert m.u32_str(2000000000) == "2000000000"
- if env.PY2:
- assert m.i32_str(long(-1)) == "-1" # noqa: F821 undefined name 'long'
- assert m.i64_str(long(-1)) == "-1" # noqa: F821 undefined name 'long'
- assert (
- m.i64_str(long(-999999999999)) # noqa: F821 undefined name 'long'
- == "-999999999999"
- )
- assert (
- m.u64_str(long(999999999999)) # noqa: F821 undefined name 'long'
- == "999999999999"
- )
- else:
- assert m.i64_str(-999999999999) == "-999999999999"
- assert m.u64_str(999999999999) == "999999999999"
-
- with pytest.raises(TypeError) as excinfo:
- m.u32_str(-1)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.u64_str(-1)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.i32_str(-3000000000)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.i32_str(3000000000)
- assert "incompatible function arguments" in str(excinfo.value)
-
- if env.PY2:
- with pytest.raises(TypeError) as excinfo:
- m.u32_str(long(-1)) # noqa: F821 undefined name 'long'
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.u64_str(long(-1)) # noqa: F821 undefined name 'long'
- assert "incompatible function arguments" in str(excinfo.value)
-
-
-def test_tuple(doc):
- """std::pair <-> tuple & std::tuple <-> tuple"""
- assert m.pair_passthrough((True, "test")) == ("test", True)
- assert m.tuple_passthrough((True, "test", 5)) == (5, "test", True)
- # Any sequence can be cast to a std::pair or std::tuple
- assert m.pair_passthrough([True, "test"]) == ("test", True)
- assert m.tuple_passthrough([True, "test", 5]) == (5, "test", True)
- assert m.empty_tuple() == ()
-
- assert (
- doc(m.pair_passthrough)
- == """
- pair_passthrough(arg0: Tuple[bool, str]) -> Tuple[str, bool]
-
- Return a pair in reversed order
- """
- )
- assert (
- doc(m.tuple_passthrough)
- == """
- tuple_passthrough(arg0: Tuple[bool, str, int]) -> Tuple[int, str, bool]
-
- Return a triple in reversed order
- """
- )
-
- assert m.rvalue_pair() == ("rvalue", "rvalue")
- assert m.lvalue_pair() == ("lvalue", "lvalue")
- assert m.rvalue_tuple() == ("rvalue", "rvalue", "rvalue")
- assert m.lvalue_tuple() == ("lvalue", "lvalue", "lvalue")
- assert m.rvalue_nested() == ("rvalue", ("rvalue", ("rvalue", "rvalue")))
- assert m.lvalue_nested() == ("lvalue", ("lvalue", ("lvalue", "lvalue")))
-
- assert m.int_string_pair() == (2, "items")
-
-
-def test_builtins_cast_return_none():
- """Casters produced with PYBIND11_TYPE_CASTER() should convert nullptr to None"""
- assert m.return_none_string() is None
- assert m.return_none_char() is None
- assert m.return_none_bool() is None
- assert m.return_none_int() is None
- assert m.return_none_float() is None
- assert m.return_none_pair() is None
-
-
-def test_none_deferred():
- """None passed as various argument types should defer to other overloads"""
- assert not m.defer_none_cstring("abc")
- assert m.defer_none_cstring(None)
- assert not m.defer_none_custom(UserType())
- assert m.defer_none_custom(None)
- assert m.nodefer_none_void(None)
-
-
-def test_void_caster():
- assert m.load_nullptr_t(None) is None
- assert m.cast_nullptr_t() is None
-
-
-def test_reference_wrapper():
- """std::reference_wrapper for builtin and user types"""
- assert m.refwrap_builtin(42) == 420
- assert m.refwrap_usertype(UserType(42)) == 42
-
- with pytest.raises(TypeError) as excinfo:
- m.refwrap_builtin(None)
- assert "incompatible function arguments" in str(excinfo.value)
-
- with pytest.raises(TypeError) as excinfo:
- m.refwrap_usertype(None)
- assert "incompatible function arguments" in str(excinfo.value)
-
- a1 = m.refwrap_list(copy=True)
- a2 = m.refwrap_list(copy=True)
- assert [x.value for x in a1] == [2, 3]
- assert [x.value for x in a2] == [2, 3]
- assert not a1[0] is a2[0] and not a1[1] is a2[1]
-
- b1 = m.refwrap_list(copy=False)
- b2 = m.refwrap_list(copy=False)
- assert [x.value for x in b1] == [1, 2]
- assert [x.value for x in b2] == [1, 2]
- assert b1[0] is b2[0] and b1[1] is b2[1]
-
- assert m.refwrap_iiw(IncType(5)) == 5
- assert m.refwrap_call_iiw(IncType(10), m.refwrap_iiw) == [10, 10, 10, 10]
-
-
-def test_complex_cast():
- """std::complex casts"""
- assert m.complex_cast(1) == "1.0"
- assert m.complex_cast(2j) == "(0.0, 2.0)"
-
-
-def test_bool_caster():
- """Test bool caster implicit conversions."""
- convert, noconvert = m.bool_passthrough, m.bool_passthrough_noconvert
-
- def require_implicit(v):
- pytest.raises(TypeError, noconvert, v)
-
- def cant_convert(v):
- pytest.raises(TypeError, convert, v)
-
- # straight up bool
- assert convert(True) is True
- assert convert(False) is False
- assert noconvert(True) is True
- assert noconvert(False) is False
-
- # None requires implicit conversion
- require_implicit(None)
- assert convert(None) is False
-
- class A(object):
- def __init__(self, x):
- self.x = x
-
- def __nonzero__(self):
- return self.x
-
- def __bool__(self):
- return self.x
-
- class B(object):
- pass
-
- # Arbitrary objects are not accepted
- cant_convert(object())
- cant_convert(B())
-
- # Objects with __nonzero__ / __bool__ defined can be converted
- require_implicit(A(True))
- assert convert(A(True)) is True
- assert convert(A(False)) is False
-
-
-def test_numpy_bool():
- np = pytest.importorskip("numpy")
-
- convert, noconvert = m.bool_passthrough, m.bool_passthrough_noconvert
-
- def cant_convert(v):
- pytest.raises(TypeError, convert, v)
-
- # np.bool_ is not considered implicit
- assert convert(np.bool_(True)) is True
- assert convert(np.bool_(False)) is False
- assert noconvert(np.bool_(True)) is True
- assert noconvert(np.bool_(False)) is False
- cant_convert(np.zeros(2, dtype="int"))
-
-
-def test_int_long():
- """In Python 2, a C++ int should return a Python int rather than long
- if possible: longs are not always accepted where ints are used (such
- as the argument to sys.exit()). A C++ long long is always a Python
- long."""
-
- import sys
-
- must_be_long = type(getattr(sys, "maxint", 1) + 1)
- assert isinstance(m.int_cast(), int)
- assert isinstance(m.long_cast(), int)
- assert isinstance(m.longlong_cast(), must_be_long)
-
-
-def test_void_caster_2():
- assert m.test_void_caster()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_call_policies.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_call_policies.cpp
deleted file mode 100644
index 26c83f81b0ed370365d48279a4b8f3d4d23b5487..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_call_policies.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- tests/test_call_policies.cpp -- keep_alive and call_guard
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-struct CustomGuard {
- static bool enabled;
-
- CustomGuard() { enabled = true; }
- ~CustomGuard() { enabled = false; }
-
- static const char *report_status() { return enabled ? "guarded" : "unguarded"; }
-};
-bool CustomGuard::enabled = false;
-
-struct DependentGuard {
- static bool enabled;
-
- DependentGuard() { enabled = CustomGuard::enabled; }
- ~DependentGuard() { enabled = false; }
-
- static const char *report_status() { return enabled ? "guarded" : "unguarded"; }
-};
-bool DependentGuard::enabled = false;
-
-TEST_SUBMODULE(call_policies, m) {
- // Parent/Child are used in:
- // test_keep_alive_argument, test_keep_alive_return_value, test_alive_gc_derived,
- // test_alive_gc_multi_derived, test_return_none, test_keep_alive_constructor
- class Child {
- public:
- Child() { py::print("Allocating child."); }
- Child(const Child &) = default;
- Child(Child &&) = default;
- ~Child() { py::print("Releasing child."); }
- };
- py::class_<Child>(m, "Child")
- .def(py::init<>());
-
- class Parent {
- public:
- Parent() { py::print("Allocating parent."); }
- Parent(const Parent& parent) = default;
- ~Parent() { py::print("Releasing parent."); }
- void addChild(Child *) { }
- Child *returnChild() { return new Child(); }
- Child *returnNullChild() { return nullptr; }
- };
- py::class_<Parent>(m, "Parent")
- .def(py::init<>())
- .def(py::init([](Child *) { return new Parent(); }), py::keep_alive<1, 2>())
- .def("addChild", &Parent::addChild)
- .def("addChildKeepAlive", &Parent::addChild, py::keep_alive<1, 2>())
- .def("returnChild", &Parent::returnChild)
- .def("returnChildKeepAlive", &Parent::returnChild, py::keep_alive<1, 0>())
- .def("returnNullChildKeepAliveChild", &Parent::returnNullChild, py::keep_alive<1, 0>())
- .def("returnNullChildKeepAliveParent", &Parent::returnNullChild, py::keep_alive<0, 1>());
-
-#if !defined(PYPY_VERSION)
- // test_alive_gc
- class ParentGC : public Parent {
- public:
- using Parent::Parent;
- };
- py::class_<ParentGC, Parent>(m, "ParentGC", py::dynamic_attr())
- .def(py::init<>());
-#endif
-
- // test_call_guard
- m.def("unguarded_call", &CustomGuard::report_status);
- m.def("guarded_call", &CustomGuard::report_status, py::call_guard<CustomGuard>());
-
- m.def("multiple_guards_correct_order", []() {
- return CustomGuard::report_status() + std::string(" & ") + DependentGuard::report_status();
- }, py::call_guard<CustomGuard, DependentGuard>());
-
- m.def("multiple_guards_wrong_order", []() {
- return DependentGuard::report_status() + std::string(" & ") + CustomGuard::report_status();
- }, py::call_guard<DependentGuard, CustomGuard>());
-
-#if defined(WITH_THREAD) && !defined(PYPY_VERSION)
- // `py::call_guard<py::gil_scoped_release>()` should work in PyPy as well,
- // but it's unclear how to test it without `PyGILState_GetThisThreadState`.
- auto report_gil_status = []() {
- auto is_gil_held = false;
- if (auto tstate = py::detail::get_thread_state_unchecked())
- is_gil_held = (tstate == PyGILState_GetThisThreadState());
-
- return is_gil_held ? "GIL held" : "GIL released";
- };
-
- m.def("with_gil", report_gil_status);
- m.def("without_gil", report_gil_status, py::call_guard<py::gil_scoped_release>());
-#endif
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_call_policies.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_call_policies.py
deleted file mode 100644
index e0413d1451c17b10daba3f09f61c0818fc5143fe..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_call_policies.py
+++ /dev/null
@@ -1,219 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import call_policies as m
-from pybind11_tests import ConstructorStats
-
-
-@pytest.mark.xfail("env.PYPY", reason="sometimes comes out 1 off on PyPy", strict=False)
-def test_keep_alive_argument(capture):
- n_inst = ConstructorStats.detail_reg_inst()
- with capture:
- p = m.Parent()
- assert capture == "Allocating parent."
- with capture:
- p.addChild(m.Child())
- assert ConstructorStats.detail_reg_inst() == n_inst + 1
- assert (
- capture
- == """
- Allocating child.
- Releasing child.
- """
- )
- with capture:
- del p
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert capture == "Releasing parent."
-
- with capture:
- p = m.Parent()
- assert capture == "Allocating parent."
- with capture:
- p.addChildKeepAlive(m.Child())
- assert ConstructorStats.detail_reg_inst() == n_inst + 2
- assert capture == "Allocating child."
- with capture:
- del p
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert (
- capture
- == """
- Releasing parent.
- Releasing child.
- """
- )
-
-
-def test_keep_alive_return_value(capture):
- n_inst = ConstructorStats.detail_reg_inst()
- with capture:
- p = m.Parent()
- assert capture == "Allocating parent."
- with capture:
- p.returnChild()
- assert ConstructorStats.detail_reg_inst() == n_inst + 1
- assert (
- capture
- == """
- Allocating child.
- Releasing child.
- """
- )
- with capture:
- del p
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert capture == "Releasing parent."
-
- with capture:
- p = m.Parent()
- assert capture == "Allocating parent."
- with capture:
- p.returnChildKeepAlive()
- assert ConstructorStats.detail_reg_inst() == n_inst + 2
- assert capture == "Allocating child."
- with capture:
- del p
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert (
- capture
- == """
- Releasing parent.
- Releasing child.
- """
- )
-
-
-# https://foss.heptapod.net/pypy/pypy/-/issues/2447
-@pytest.mark.xfail("env.PYPY", reason="_PyObject_GetDictPtr is unimplemented")
-def test_alive_gc(capture):
- n_inst = ConstructorStats.detail_reg_inst()
- p = m.ParentGC()
- p.addChildKeepAlive(m.Child())
- assert ConstructorStats.detail_reg_inst() == n_inst + 2
- lst = [p]
- lst.append(lst) # creates a circular reference
- with capture:
- del p, lst
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert (
- capture
- == """
- Releasing parent.
- Releasing child.
- """
- )
-
-
-def test_alive_gc_derived(capture):
- class Derived(m.Parent):
- pass
-
- n_inst = ConstructorStats.detail_reg_inst()
- p = Derived()
- p.addChildKeepAlive(m.Child())
- assert ConstructorStats.detail_reg_inst() == n_inst + 2
- lst = [p]
- lst.append(lst) # creates a circular reference
- with capture:
- del p, lst
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert (
- capture
- == """
- Releasing parent.
- Releasing child.
- """
- )
-
-
-def test_alive_gc_multi_derived(capture):
- class Derived(m.Parent, m.Child):
- def __init__(self):
- m.Parent.__init__(self)
- m.Child.__init__(self)
-
- n_inst = ConstructorStats.detail_reg_inst()
- p = Derived()
- p.addChildKeepAlive(m.Child())
- # +3 rather than +2 because Derived corresponds to two registered instances
- assert ConstructorStats.detail_reg_inst() == n_inst + 3
- lst = [p]
- lst.append(lst) # creates a circular reference
- with capture:
- del p, lst
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert (
- capture
- == """
- Releasing parent.
- Releasing child.
- Releasing child.
- """
- )
-
-
-def test_return_none(capture):
- n_inst = ConstructorStats.detail_reg_inst()
- with capture:
- p = m.Parent()
- assert capture == "Allocating parent."
- with capture:
- p.returnNullChildKeepAliveChild()
- assert ConstructorStats.detail_reg_inst() == n_inst + 1
- assert capture == ""
- with capture:
- del p
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert capture == "Releasing parent."
-
- with capture:
- p = m.Parent()
- assert capture == "Allocating parent."
- with capture:
- p.returnNullChildKeepAliveParent()
- assert ConstructorStats.detail_reg_inst() == n_inst + 1
- assert capture == ""
- with capture:
- del p
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert capture == "Releasing parent."
-
-
-def test_keep_alive_constructor(capture):
- n_inst = ConstructorStats.detail_reg_inst()
-
- with capture:
- p = m.Parent(m.Child())
- assert ConstructorStats.detail_reg_inst() == n_inst + 2
- assert (
- capture
- == """
- Allocating child.
- Allocating parent.
- """
- )
- with capture:
- del p
- assert ConstructorStats.detail_reg_inst() == n_inst
- assert (
- capture
- == """
- Releasing parent.
- Releasing child.
- """
- )
-
-
-def test_call_guard():
- assert m.unguarded_call() == "unguarded"
- assert m.guarded_call() == "guarded"
-
- assert m.multiple_guards_correct_order() == "guarded & guarded"
- assert m.multiple_guards_wrong_order() == "unguarded & guarded"
-
- if hasattr(m, "with_gil"):
- assert m.with_gil() == "GIL held"
- assert m.without_gil() == "GIL released"
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_callbacks.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_callbacks.cpp
deleted file mode 100644
index 71b88c44c7650a7e7b3f37cee19359e15bbb0270..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_callbacks.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- tests/test_callbacks.cpp -- callbacks
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <pybind11/functional.h>
-#include <thread>
-
-
-int dummy_function(int i) { return i + 1; }
-
-TEST_SUBMODULE(callbacks, m) {
- // test_callbacks, test_function_signatures
- m.def("test_callback1", [](py::object func) { return func(); });
- m.def("test_callback2", [](py::object func) { return func("Hello", 'x', true, 5); });
- m.def("test_callback3", [](const std::function<int(int)> &func) {
- return "func(43) = " + std::to_string(func(43)); });
- m.def("test_callback4", []() -> std::function<int(int)> { return [](int i) { return i+1; }; });
- m.def("test_callback5", []() {
- return py::cpp_function([](int i) { return i+1; }, py::arg("number"));
- });
-
- // test_keyword_args_and_generalized_unpacking
- m.def("test_tuple_unpacking", [](py::function f) {
- auto t1 = py::make_tuple(2, 3);
- auto t2 = py::make_tuple(5, 6);
- return f("positional", 1, *t1, 4, *t2);
- });
-
- m.def("test_dict_unpacking", [](py::function f) {
- auto d1 = py::dict("key"_a="value", "a"_a=1);
- auto d2 = py::dict();
- auto d3 = py::dict("b"_a=2);
- return f("positional", 1, **d1, **d2, **d3);
- });
-
- m.def("test_keyword_args", [](py::function f) {
- return f("x"_a=10, "y"_a=20);
- });
-
- m.def("test_unpacking_and_keywords1", [](py::function f) {
- auto args = py::make_tuple(2);
- auto kwargs = py::dict("d"_a=4);
- return f(1, *args, "c"_a=3, **kwargs);
- });
-
- m.def("test_unpacking_and_keywords2", [](py::function f) {
- auto kwargs1 = py::dict("a"_a=1);
- auto kwargs2 = py::dict("c"_a=3, "d"_a=4);
- return f("positional", *py::make_tuple(1), 2, *py::make_tuple(3, 4), 5,
- "key"_a="value", **kwargs1, "b"_a=2, **kwargs2, "e"_a=5);
- });
-
- m.def("test_unpacking_error1", [](py::function f) {
- auto kwargs = py::dict("x"_a=3);
- return f("x"_a=1, "y"_a=2, **kwargs); // duplicate ** after keyword
- });
-
- m.def("test_unpacking_error2", [](py::function f) {
- auto kwargs = py::dict("x"_a=3);
- return f(**kwargs, "x"_a=1); // duplicate keyword after **
- });
-
- m.def("test_arg_conversion_error1", [](py::function f) {
- f(234, UnregisteredType(), "kw"_a=567);
- });
-
- m.def("test_arg_conversion_error2", [](py::function f) {
- f(234, "expected_name"_a=UnregisteredType(), "kw"_a=567);
- });
-
- // test_lambda_closure_cleanup
- struct Payload {
- Payload() { print_default_created(this); }
- ~Payload() { print_destroyed(this); }
- Payload(const Payload &) { print_copy_created(this); }
- Payload(Payload &&) { print_move_created(this); }
- };
- // Export the payload constructor statistics for testing purposes:
- m.def("payload_cstats", &ConstructorStats::get<Payload>);
- /* Test cleanup of lambda closure */
- m.def("test_cleanup", []() -> std::function<void(void)> {
- Payload p;
-
- return [p]() {
- /* p should be cleaned up when the returned function is garbage collected */
- (void) p;
- };
- });
-
- // test_cpp_function_roundtrip
- /* Test if passing a function pointer from C++ -> Python -> C++ yields the original pointer */
- m.def("dummy_function", &dummy_function);
- m.def("dummy_function2", [](int i, int j) { return i + j; });
- m.def("roundtrip", [](std::function<int(int)> f, bool expect_none = false) {
- if (expect_none && f)
- throw std::runtime_error("Expected None to be converted to empty std::function");
- return f;
- }, py::arg("f"), py::arg("expect_none")=false);
- m.def("test_dummy_function", [](const std::function<int(int)> &f) -> std::string {
- using fn_type = int (*)(int);
- auto result = f.target<fn_type>();
- if (!result) {
- auto r = f(1);
- return "can't convert to function pointer: eval(1) = " + std::to_string(r);
- } else if (*result == dummy_function) {
- auto r = (*result)(1);
- return "matches dummy_function: eval(1) = " + std::to_string(r);
- } else {
- return "argument does NOT match dummy_function. This should never happen!";
- }
- });
-
- class AbstractBase { public: virtual unsigned int func() = 0; };
- m.def("func_accepting_func_accepting_base", [](std::function<double(AbstractBase&)>) { });
-
- struct MovableObject {
- bool valid = true;
-
- MovableObject() = default;
- MovableObject(const MovableObject &) = default;
- MovableObject &operator=(const MovableObject &) = default;
- MovableObject(MovableObject &&o) : valid(o.valid) { o.valid = false; }
- MovableObject &operator=(MovableObject &&o) {
- valid = o.valid;
- o.valid = false;
- return *this;
- }
- };
- py::class_<MovableObject>(m, "MovableObject");
-
- // test_movable_object
- m.def("callback_with_movable", [](std::function<void(MovableObject &)> f) {
- auto x = MovableObject();
- f(x); // lvalue reference shouldn't move out object
- return x.valid; // must still return `true`
- });
-
- // test_bound_method_callback
- struct CppBoundMethodTest {};
- py::class_<CppBoundMethodTest>(m, "CppBoundMethodTest")
- .def(py::init<>())
- .def("triple", [](CppBoundMethodTest &, int val) { return 3 * val; });
-
- // test async Python callbacks
- using callback_f = std::function<void(int)>;
- m.def("test_async_callback", [](callback_f f, py::list work) {
- // make detached thread that calls `f` with piece of work after a little delay
- auto start_f = [f](int j) {
- auto invoke_f = [f, j] {
- std::this_thread::sleep_for(std::chrono::milliseconds(50));
- f(j);
- };
- auto t = std::thread(std::move(invoke_f));
- t.detach();
- };
-
- // spawn worker threads
- for (auto i : work)
- start_f(py::cast<int>(i));
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_callbacks.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_callbacks.py
deleted file mode 100644
index 039b877ced716cd1b61010b19e111784917aafd3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_callbacks.py
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-from pybind11_tests import callbacks as m
-from threading import Thread
-
-
-def test_callbacks():
- from functools import partial
-
- def func1():
- return "func1"
-
- def func2(a, b, c, d):
- return "func2", a, b, c, d
-
- def func3(a):
- return "func3({})".format(a)
-
- assert m.test_callback1(func1) == "func1"
- assert m.test_callback2(func2) == ("func2", "Hello", "x", True, 5)
- assert m.test_callback1(partial(func2, 1, 2, 3, 4)) == ("func2", 1, 2, 3, 4)
- assert m.test_callback1(partial(func3, "partial")) == "func3(partial)"
- assert m.test_callback3(lambda i: i + 1) == "func(43) = 44"
-
- f = m.test_callback4()
- assert f(43) == 44
- f = m.test_callback5()
- assert f(number=43) == 44
-
-
-def test_bound_method_callback():
- # Bound Python method:
- class MyClass:
- def double(self, val):
- return 2 * val
-
- z = MyClass()
- assert m.test_callback3(z.double) == "func(43) = 86"
-
- z = m.CppBoundMethodTest()
- assert m.test_callback3(z.triple) == "func(43) = 129"
-
-
-def test_keyword_args_and_generalized_unpacking():
- def f(*args, **kwargs):
- return args, kwargs
-
- assert m.test_tuple_unpacking(f) == (("positional", 1, 2, 3, 4, 5, 6), {})
- assert m.test_dict_unpacking(f) == (
- ("positional", 1),
- {"key": "value", "a": 1, "b": 2},
- )
- assert m.test_keyword_args(f) == ((), {"x": 10, "y": 20})
- assert m.test_unpacking_and_keywords1(f) == ((1, 2), {"c": 3, "d": 4})
- assert m.test_unpacking_and_keywords2(f) == (
- ("positional", 1, 2, 3, 4, 5),
- {"key": "value", "a": 1, "b": 2, "c": 3, "d": 4, "e": 5},
- )
-
- with pytest.raises(TypeError) as excinfo:
- m.test_unpacking_error1(f)
- assert "Got multiple values for keyword argument" in str(excinfo.value)
-
- with pytest.raises(TypeError) as excinfo:
- m.test_unpacking_error2(f)
- assert "Got multiple values for keyword argument" in str(excinfo.value)
-
- with pytest.raises(RuntimeError) as excinfo:
- m.test_arg_conversion_error1(f)
- assert "Unable to convert call argument" in str(excinfo.value)
-
- with pytest.raises(RuntimeError) as excinfo:
- m.test_arg_conversion_error2(f)
- assert "Unable to convert call argument" in str(excinfo.value)
-
-
-def test_lambda_closure_cleanup():
- m.test_cleanup()
- cstats = m.payload_cstats()
- assert cstats.alive() == 0
- assert cstats.copy_constructions == 1
- assert cstats.move_constructions >= 1
-
-
-def test_cpp_function_roundtrip():
- """Test if passing a function pointer from C++ -> Python -> C++ yields the original pointer"""
-
- assert (
- m.test_dummy_function(m.dummy_function) == "matches dummy_function: eval(1) = 2"
- )
- assert (
- m.test_dummy_function(m.roundtrip(m.dummy_function))
- == "matches dummy_function: eval(1) = 2"
- )
- assert m.roundtrip(None, expect_none=True) is None
- assert (
- m.test_dummy_function(lambda x: x + 2)
- == "can't convert to function pointer: eval(1) = 3"
- )
-
- with pytest.raises(TypeError) as excinfo:
- m.test_dummy_function(m.dummy_function2)
- assert "incompatible function arguments" in str(excinfo.value)
-
- with pytest.raises(TypeError) as excinfo:
- m.test_dummy_function(lambda x, y: x + y)
- assert any(
- s in str(excinfo.value)
- for s in ("missing 1 required positional argument", "takes exactly 2 arguments")
- )
-
-
-def test_function_signatures(doc):
- assert doc(m.test_callback3) == "test_callback3(arg0: Callable[[int], int]) -> str"
- assert doc(m.test_callback4) == "test_callback4() -> Callable[[int], int]"
-
-
-def test_movable_object():
- assert m.callback_with_movable(lambda _: None) is True
-
-
-def test_async_callbacks():
- # serves as state for async callback
- class Item:
- def __init__(self, value):
- self.value = value
-
- res = []
-
- # generate stateful lambda that will store result in `res`
- def gen_f():
- s = Item(3)
- return lambda j: res.append(s.value + j)
-
- # do some work async
- work = [1, 2, 3, 4]
- m.test_async_callback(gen_f(), work)
- # wait until work is done
- from time import sleep
-
- sleep(0.5)
- assert sum(res) == sum([x + 3 for x in work])
-
-
-def test_async_async_callbacks():
- t = Thread(target=test_async_callbacks)
- t.start()
- t.join()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_chrono.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_chrono.cpp
deleted file mode 100644
index 65370508038d00c11abbc8b7868ca271daf4aeb0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_chrono.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- tests/test_chrono.cpp -- test conversions to/from std::chrono types
-
- Copyright (c) 2016 Trent Houliston <trent@houliston.me> and
- Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include <pybind11/chrono.h>
-#include <chrono>
-
-struct different_resolutions {
- using time_point_h = std::chrono::time_point<
- std::chrono::system_clock, std::chrono::hours>;
- using time_point_m = std::chrono::time_point<
- std::chrono::system_clock, std::chrono::minutes>;
- using time_point_s = std::chrono::time_point<
- std::chrono::system_clock, std::chrono::seconds>;
- using time_point_ms = std::chrono::time_point<
- std::chrono::system_clock, std::chrono::milliseconds>;
- using time_point_us = std::chrono::time_point<
- std::chrono::system_clock, std::chrono::microseconds>;
- time_point_h timestamp_h;
- time_point_m timestamp_m;
- time_point_s timestamp_s;
- time_point_ms timestamp_ms;
- time_point_us timestamp_us;
-};
-
-TEST_SUBMODULE(chrono, m) {
- using system_time = std::chrono::system_clock::time_point;
- using steady_time = std::chrono::steady_clock::time_point;
-
- using timespan = std::chrono::duration<int64_t, std::nano>;
- using timestamp = std::chrono::time_point<std::chrono::system_clock, timespan>;
-
- // test_chrono_system_clock
- // Return the current time off the wall clock
- m.def("test_chrono1", []() { return std::chrono::system_clock::now(); });
-
- // test_chrono_system_clock_roundtrip
- // Round trip the passed in system clock time
- m.def("test_chrono2", [](system_time t) { return t; });
-
- // test_chrono_duration_roundtrip
- // Round trip the passed in duration
- m.def("test_chrono3", [](std::chrono::system_clock::duration d) { return d; });
-
- // test_chrono_duration_subtraction_equivalence
- // Difference between two passed in time_points
- m.def("test_chrono4", [](system_time a, system_time b) { return a - b; });
-
- // test_chrono_steady_clock
- // Return the current time off the steady_clock
- m.def("test_chrono5", []() { return std::chrono::steady_clock::now(); });
-
- // test_chrono_steady_clock_roundtrip
- // Round trip a steady clock timepoint
- m.def("test_chrono6", [](steady_time t) { return t; });
-
- // test_floating_point_duration
- // Roundtrip a duration in microseconds from a float argument
- m.def("test_chrono7", [](std::chrono::microseconds t) { return t; });
- // Float durations (issue #719)
- m.def("test_chrono_float_diff", [](std::chrono::duration<float> a, std::chrono::duration<float> b) {
- return a - b; });
-
- m.def("test_nano_timepoint", [](timestamp start, timespan delta) -> timestamp {
- return start + delta;
- });
-
- // Test different resolutions
- py::class_<different_resolutions>(m, "different_resolutions")
- .def(py::init<>())
- .def_readwrite("timestamp_h", &different_resolutions::timestamp_h)
- .def_readwrite("timestamp_m", &different_resolutions::timestamp_m)
- .def_readwrite("timestamp_s", &different_resolutions::timestamp_s)
- .def_readwrite("timestamp_ms", &different_resolutions::timestamp_ms)
- .def_readwrite("timestamp_us", &different_resolutions::timestamp_us)
- ;
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_chrono.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_chrono.py
deleted file mode 100644
index e9e24e08260a646b138dc02c83af37b2b82f8434..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_chrono.py
+++ /dev/null
@@ -1,218 +0,0 @@
-# -*- coding: utf-8 -*-
-from pybind11_tests import chrono as m
-import datetime
-import pytest
-
-import env # noqa: F401
-
-
-def test_chrono_system_clock():
-
- # Get the time from both c++ and datetime
- date0 = datetime.datetime.today()
- date1 = m.test_chrono1()
- date2 = datetime.datetime.today()
-
- # The returned value should be a datetime
- assert isinstance(date1, datetime.datetime)
-
- # The numbers should vary by a very small amount (time it took to execute)
- diff_python = abs(date2 - date0)
- diff = abs(date1 - date2)
-
- # There should never be a days difference
- assert diff.days == 0
-
- # Since datetime.datetime.today() calls time.time(), and on some platforms
- # that has 1 second accuracy, we compare this way
- assert diff.seconds <= diff_python.seconds
-
-
-def test_chrono_system_clock_roundtrip():
- date1 = datetime.datetime.today()
-
- # Roundtrip the time
- date2 = m.test_chrono2(date1)
-
- # The returned value should be a datetime
- assert isinstance(date2, datetime.datetime)
-
- # They should be identical (no information lost on roundtrip)
- diff = abs(date1 - date2)
- assert diff.days == 0
- assert diff.seconds == 0
- assert diff.microseconds == 0
-
-
-def test_chrono_system_clock_roundtrip_date():
- date1 = datetime.date.today()
-
- # Roundtrip the time
- datetime2 = m.test_chrono2(date1)
- date2 = datetime2.date()
- time2 = datetime2.time()
-
- # The returned value should be a datetime
- assert isinstance(datetime2, datetime.datetime)
- assert isinstance(date2, datetime.date)
- assert isinstance(time2, datetime.time)
-
- # They should be identical (no information lost on roundtrip)
- diff = abs(date1 - date2)
- assert diff.days == 0
- assert diff.seconds == 0
- assert diff.microseconds == 0
-
- # Year, Month & Day should be the same after the round trip
- assert date1.year == date2.year
- assert date1.month == date2.month
- assert date1.day == date2.day
-
- # There should be no time information
- assert time2.hour == 0
- assert time2.minute == 0
- assert time2.second == 0
- assert time2.microsecond == 0
-
-
-SKIP_TZ_ENV_ON_WIN = pytest.mark.skipif(
- "env.WIN", reason="TZ environment variable only supported on POSIX"
-)
-
-
-@pytest.mark.parametrize(
- "time1",
- [
- datetime.datetime.today().time(),
- datetime.time(0, 0, 0),
- datetime.time(0, 0, 0, 1),
- datetime.time(0, 28, 45, 109827),
- datetime.time(0, 59, 59, 999999),
- datetime.time(1, 0, 0),
- datetime.time(5, 59, 59, 0),
- datetime.time(5, 59, 59, 1),
- ],
-)
-@pytest.mark.parametrize(
- "tz",
- [
- None,
- pytest.param("Europe/Brussels", marks=SKIP_TZ_ENV_ON_WIN),
- pytest.param("Asia/Pyongyang", marks=SKIP_TZ_ENV_ON_WIN),
- pytest.param("America/New_York", marks=SKIP_TZ_ENV_ON_WIN),
- ],
-)
-def test_chrono_system_clock_roundtrip_time(time1, tz, monkeypatch):
- if tz is not None:
- monkeypatch.setenv("TZ", "/usr/share/zoneinfo/{}".format(tz))
-
- # Roundtrip the time
- datetime2 = m.test_chrono2(time1)
- date2 = datetime2.date()
- time2 = datetime2.time()
-
- # The returned value should be a datetime
- assert isinstance(datetime2, datetime.datetime)
- assert isinstance(date2, datetime.date)
- assert isinstance(time2, datetime.time)
-
- # Hour, Minute, Second & Microsecond should be the same after the round trip
- assert time1.hour == time2.hour
- assert time1.minute == time2.minute
- assert time1.second == time2.second
- assert time1.microsecond == time2.microsecond
-
- # There should be no date information (i.e. date = python base date)
- assert date2.year == 1970
- assert date2.month == 1
- assert date2.day == 1
-
-
-def test_chrono_duration_roundtrip():
-
- # Get the difference between two times (a timedelta)
- date1 = datetime.datetime.today()
- date2 = datetime.datetime.today()
- diff = date2 - date1
-
- # Make sure this is a timedelta
- assert isinstance(diff, datetime.timedelta)
-
- cpp_diff = m.test_chrono3(diff)
-
- assert cpp_diff.days == diff.days
- assert cpp_diff.seconds == diff.seconds
- assert cpp_diff.microseconds == diff.microseconds
-
-
-def test_chrono_duration_subtraction_equivalence():
-
- date1 = datetime.datetime.today()
- date2 = datetime.datetime.today()
-
- diff = date2 - date1
- cpp_diff = m.test_chrono4(date2, date1)
-
- assert cpp_diff.days == diff.days
- assert cpp_diff.seconds == diff.seconds
- assert cpp_diff.microseconds == diff.microseconds
-
-
-def test_chrono_duration_subtraction_equivalence_date():
-
- date1 = datetime.date.today()
- date2 = datetime.date.today()
-
- diff = date2 - date1
- cpp_diff = m.test_chrono4(date2, date1)
-
- assert cpp_diff.days == diff.days
- assert cpp_diff.seconds == diff.seconds
- assert cpp_diff.microseconds == diff.microseconds
-
-
-def test_chrono_steady_clock():
- time1 = m.test_chrono5()
- assert isinstance(time1, datetime.timedelta)
-
-
-def test_chrono_steady_clock_roundtrip():
- time1 = datetime.timedelta(days=10, seconds=10, microseconds=100)
- time2 = m.test_chrono6(time1)
-
- assert isinstance(time2, datetime.timedelta)
-
- # They should be identical (no information lost on roundtrip)
- assert time1.days == time2.days
- assert time1.seconds == time2.seconds
- assert time1.microseconds == time2.microseconds
-
-
-def test_floating_point_duration():
- # Test using a floating point number in seconds
- time = m.test_chrono7(35.525123)
-
- assert isinstance(time, datetime.timedelta)
-
- assert time.seconds == 35
- assert 525122 <= time.microseconds <= 525123
-
- diff = m.test_chrono_float_diff(43.789012, 1.123456)
- assert diff.seconds == 42
- assert 665556 <= diff.microseconds <= 665557
-
-
-def test_nano_timepoint():
- time = datetime.datetime.now()
- time1 = m.test_nano_timepoint(time, datetime.timedelta(seconds=60))
- assert time1 == time + datetime.timedelta(seconds=60)
-
-
-def test_chrono_different_resolutions():
- resolutions = m.different_resolutions()
- time = datetime.datetime.now()
- resolutions.timestamp_h = time
- resolutions.timestamp_m = time
- resolutions.timestamp_s = time
- resolutions.timestamp_ms = time
- resolutions.timestamp_us = time
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_class.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_class.cpp
deleted file mode 100644
index 890fab736f82cf3ad7755b6f7a7e67a6a8e300cb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_class.cpp
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- tests/test_class.cpp -- test py::class_ definitions and basic functionality
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include "local_bindings.h"
-#include <pybind11/stl.h>
-
-#if defined(_MSC_VER)
-# pragma warning(disable: 4324) // warning C4324: structure was padded due to alignment specifier
-#endif
-
-// test_brace_initialization
-struct NoBraceInitialization {
- NoBraceInitialization(std::vector<int> v) : vec{std::move(v)} {}
- template <typename T>
- NoBraceInitialization(std::initializer_list<T> l) : vec(l) {}
-
- std::vector<int> vec;
-};
-
-TEST_SUBMODULE(class_, m) {
- // test_instance
- struct NoConstructor {
- NoConstructor() = default;
- NoConstructor(const NoConstructor &) = default;
- NoConstructor(NoConstructor &&) = default;
- static NoConstructor *new_instance() {
- auto *ptr = new NoConstructor();
- print_created(ptr, "via new_instance");
- return ptr;
- }
- ~NoConstructor() { print_destroyed(this); }
- };
-
- py::class_<NoConstructor>(m, "NoConstructor")
- .def_static("new_instance", &NoConstructor::new_instance, "Return an instance");
-
- // test_inheritance
- class Pet {
- public:
- Pet(const std::string &name, const std::string &species)
- : m_name(name), m_species(species) {}
- std::string name() const { return m_name; }
- std::string species() const { return m_species; }
- private:
- std::string m_name;
- std::string m_species;
- };
-
- class Dog : public Pet {
- public:
- Dog(const std::string &name) : Pet(name, "dog") {}
- std::string bark() const { return "Woof!"; }
- };
-
- class Rabbit : public Pet {
- public:
- Rabbit(const std::string &name) : Pet(name, "parrot") {}
- };
-
- class Hamster : public Pet {
- public:
- Hamster(const std::string &name) : Pet(name, "rodent") {}
- };
-
- class Chimera : public Pet {
- Chimera() : Pet("Kimmy", "chimera") {}
- };
-
- py::class_<Pet> pet_class(m, "Pet");
- pet_class
- .def(py::init<std::string, std::string>())
- .def("name", &Pet::name)
- .def("species", &Pet::species);
-
- /* One way of declaring a subclass relationship: reference parent's class_ object */
- py::class_<Dog>(m, "Dog", pet_class)
- .def(py::init<std::string>());
-
- /* Another way of declaring a subclass relationship: reference parent's C++ type */
- py::class_<Rabbit, Pet>(m, "Rabbit")
- .def(py::init<std::string>());
-
- /* And another: list parent in class template arguments */
- py::class_<Hamster, Pet>(m, "Hamster")
- .def(py::init<std::string>());
-
- /* Constructors are not inherited by default */
- py::class_<Chimera, Pet>(m, "Chimera");
-
- m.def("pet_name_species", [](const Pet &pet) { return pet.name() + " is a " + pet.species(); });
- m.def("dog_bark", [](const Dog &dog) { return dog.bark(); });
-
- // test_automatic_upcasting
- struct BaseClass {
- BaseClass() = default;
- BaseClass(const BaseClass &) = default;
- BaseClass(BaseClass &&) = default;
- virtual ~BaseClass() = default;
- };
- struct DerivedClass1 : BaseClass { };
- struct DerivedClass2 : BaseClass { };
-
- py::class_<BaseClass>(m, "BaseClass").def(py::init<>());
- py::class_<DerivedClass1>(m, "DerivedClass1").def(py::init<>());
- py::class_<DerivedClass2>(m, "DerivedClass2").def(py::init<>());
-
- m.def("return_class_1", []() -> BaseClass* { return new DerivedClass1(); });
- m.def("return_class_2", []() -> BaseClass* { return new DerivedClass2(); });
- m.def("return_class_n", [](int n) -> BaseClass* {
- if (n == 1) return new DerivedClass1();
- if (n == 2) return new DerivedClass2();
- return new BaseClass();
- });
- m.def("return_none", []() -> BaseClass* { return nullptr; });
-
- // test_isinstance
- m.def("check_instances", [](py::list l) {
- return py::make_tuple(
- py::isinstance<py::tuple>(l[0]),
- py::isinstance<py::dict>(l[1]),
- py::isinstance<Pet>(l[2]),
- py::isinstance<Pet>(l[3]),
- py::isinstance<Dog>(l[4]),
- py::isinstance<Rabbit>(l[5]),
- py::isinstance<UnregisteredType>(l[6])
- );
- });
-
- struct Invalid {};
-
- // test_type
- m.def("check_type", [](int category) {
- // Currently not supported (via a fail at compile time)
- // See https://github.com/pybind/pybind11/issues/2486
- // if (category == 2)
- // return py::type::of<int>();
- if (category == 1)
- return py::type::of<DerivedClass1>();
- else
- return py::type::of<Invalid>();
- });
-
- m.def("get_type_of", [](py::object ob) {
- return py::type::of(ob);
- });
-
- m.def("get_type_classic", [](py::handle h) {
- return h.get_type();
- });
-
- m.def("as_type", [](py::object ob) {
- return py::type(ob);
- });
-
- // test_mismatched_holder
- struct MismatchBase1 { };
- struct MismatchDerived1 : MismatchBase1 { };
-
- struct MismatchBase2 { };
- struct MismatchDerived2 : MismatchBase2 { };
-
- m.def("mismatched_holder_1", []() {
- auto mod = py::module_::import("__main__");
- py::class_<MismatchBase1, std::shared_ptr<MismatchBase1>>(mod, "MismatchBase1");
- py::class_<MismatchDerived1, MismatchBase1>(mod, "MismatchDerived1");
- });
- m.def("mismatched_holder_2", []() {
- auto mod = py::module_::import("__main__");
- py::class_<MismatchBase2>(mod, "MismatchBase2");
- py::class_<MismatchDerived2, std::shared_ptr<MismatchDerived2>,
- MismatchBase2>(mod, "MismatchDerived2");
- });
-
- // test_override_static
- // #511: problem with inheritance + overwritten def_static
- struct MyBase {
- static std::unique_ptr<MyBase> make() {
- return std::unique_ptr<MyBase>(new MyBase());
- }
- };
-
- struct MyDerived : MyBase {
- static std::unique_ptr<MyDerived> make() {
- return std::unique_ptr<MyDerived>(new MyDerived());
- }
- };
-
- py::class_<MyBase>(m, "MyBase")
- .def_static("make", &MyBase::make);
-
- py::class_<MyDerived, MyBase>(m, "MyDerived")
- .def_static("make", &MyDerived::make)
- .def_static("make2", &MyDerived::make);
-
- // test_implicit_conversion_life_support
- struct ConvertibleFromUserType {
- int i;
-
- ConvertibleFromUserType(UserType u) : i(u.value()) { }
- };
-
- py::class_<ConvertibleFromUserType>(m, "AcceptsUserType")
- .def(py::init<UserType>());
- py::implicitly_convertible<UserType, ConvertibleFromUserType>();
-
- m.def("implicitly_convert_argument", [](const ConvertibleFromUserType &r) { return r.i; });
- m.def("implicitly_convert_variable", [](py::object o) {
- // `o` is `UserType` and `r` is a reference to a temporary created by implicit
- // conversion. This is valid when called inside a bound function because the temp
- // object is attached to the same life support system as the arguments.
- const auto &r = o.cast<const ConvertibleFromUserType &>();
- return r.i;
- });
- m.add_object("implicitly_convert_variable_fail", [&] {
- auto f = [](PyObject *, PyObject *args) -> PyObject * {
- auto o = py::reinterpret_borrow<py::tuple>(args)[0];
- try { // It should fail here because there is no life support.
- o.cast<const ConvertibleFromUserType &>();
- } catch (const py::cast_error &e) {
- return py::str(e.what()).release().ptr();
- }
- return py::str().release().ptr();
- };
-
- auto def = new PyMethodDef{"f", f, METH_VARARGS, nullptr};
- return py::reinterpret_steal<py::object>(PyCFunction_NewEx(def, nullptr, m.ptr()));
- }());
-
- // test_operator_new_delete
- struct HasOpNewDel {
- std::uint64_t i;
- static void *operator new(size_t s) { py::print("A new", s); return ::operator new(s); }
- static void *operator new(size_t s, void *ptr) { py::print("A placement-new", s); return ptr; }
- static void operator delete(void *p) { py::print("A delete"); return ::operator delete(p); }
- };
- struct HasOpNewDelSize {
- std::uint32_t i;
- static void *operator new(size_t s) { py::print("B new", s); return ::operator new(s); }
- static void *operator new(size_t s, void *ptr) { py::print("B placement-new", s); return ptr; }
- static void operator delete(void *p, size_t s) { py::print("B delete", s); return ::operator delete(p); }
- };
- struct AliasedHasOpNewDelSize {
- std::uint64_t i;
- static void *operator new(size_t s) { py::print("C new", s); return ::operator new(s); }
- static void *operator new(size_t s, void *ptr) { py::print("C placement-new", s); return ptr; }
- static void operator delete(void *p, size_t s) { py::print("C delete", s); return ::operator delete(p); }
- virtual ~AliasedHasOpNewDelSize() = default;
- AliasedHasOpNewDelSize() = default;
- AliasedHasOpNewDelSize(const AliasedHasOpNewDelSize&) = delete;
- };
- struct PyAliasedHasOpNewDelSize : AliasedHasOpNewDelSize {
- PyAliasedHasOpNewDelSize() = default;
- PyAliasedHasOpNewDelSize(int) { }
- std::uint64_t j;
- };
- struct HasOpNewDelBoth {
- std::uint32_t i[8];
- static void *operator new(size_t s) { py::print("D new", s); return ::operator new(s); }
- static void *operator new(size_t s, void *ptr) { py::print("D placement-new", s); return ptr; }
- static void operator delete(void *p) { py::print("D delete"); return ::operator delete(p); }
- static void operator delete(void *p, size_t s) { py::print("D wrong delete", s); return ::operator delete(p); }
- };
- py::class_<HasOpNewDel>(m, "HasOpNewDel").def(py::init<>());
- py::class_<HasOpNewDelSize>(m, "HasOpNewDelSize").def(py::init<>());
- py::class_<HasOpNewDelBoth>(m, "HasOpNewDelBoth").def(py::init<>());
- py::class_<AliasedHasOpNewDelSize, PyAliasedHasOpNewDelSize> aliased(m, "AliasedHasOpNewDelSize");
- aliased.def(py::init<>());
- aliased.attr("size_noalias") = py::int_(sizeof(AliasedHasOpNewDelSize));
- aliased.attr("size_alias") = py::int_(sizeof(PyAliasedHasOpNewDelSize));
-
- // This test is actually part of test_local_bindings (test_duplicate_local), but we need a
- // definition in a different compilation unit within the same module:
- bind_local<LocalExternal, 17>(m, "LocalExternal", py::module_local());
-
- // test_bind_protected_functions
- class ProtectedA {
- protected:
- int foo() const { return value; }
-
- private:
- int value = 42;
- };
-
- class PublicistA : public ProtectedA {
- public:
- using ProtectedA::foo;
- };
-
- py::class_<ProtectedA>(m, "ProtectedA")
- .def(py::init<>())
-#if !defined(_MSC_VER) || _MSC_VER >= 1910
- .def("foo", &PublicistA::foo);
-#else
- .def("foo", static_cast<int (ProtectedA::*)() const>(&PublicistA::foo));
-#endif
-
- class ProtectedB {
- public:
- virtual ~ProtectedB() = default;
- ProtectedB() = default;
- ProtectedB(const ProtectedB &) = delete;
-
- protected:
- virtual int foo() const { return value; }
-
- private:
- int value = 42;
- };
-
- class TrampolineB : public ProtectedB {
- public:
- int foo() const override { PYBIND11_OVERRIDE(int, ProtectedB, foo, ); }
- };
-
- class PublicistB : public ProtectedB {
- public:
- using ProtectedB::foo;
- };
-
- py::class_<ProtectedB, TrampolineB>(m, "ProtectedB")
- .def(py::init<>())
-#if !defined(_MSC_VER) || _MSC_VER >= 1910
- .def("foo", &PublicistB::foo);
-#else
- .def("foo", static_cast<int (ProtectedB::*)() const>(&PublicistB::foo));
-#endif
-
- // test_brace_initialization
- struct BraceInitialization {
- int field1;
- std::string field2;
- };
-
- py::class_<BraceInitialization>(m, "BraceInitialization")
- .def(py::init<int, const std::string &>())
- .def_readwrite("field1", &BraceInitialization::field1)
- .def_readwrite("field2", &BraceInitialization::field2);
- // We *don't* want to construct using braces when the given constructor argument maps to a
- // constructor, because brace initialization could go to the wrong place (in particular when
- // there is also an `initializer_list<T>`-accept constructor):
- py::class_<NoBraceInitialization>(m, "NoBraceInitialization")
- .def(py::init<std::vector<int>>())
- .def_readonly("vec", &NoBraceInitialization::vec);
-
- // test_reentrant_implicit_conversion_failure
- // #1035: issue with runaway reentrant implicit conversion
- struct BogusImplicitConversion {
- BogusImplicitConversion(const BogusImplicitConversion &) = default;
- };
-
- py::class_<BogusImplicitConversion>(m, "BogusImplicitConversion")
- .def(py::init<const BogusImplicitConversion &>());
-
- py::implicitly_convertible<int, BogusImplicitConversion>();
-
- // test_qualname
- // #1166: nested class docstring doesn't show nested name
- // Also related: tests that __qualname__ is set properly
- struct NestBase {};
- struct Nested {};
- py::class_<NestBase> base(m, "NestBase");
- base.def(py::init<>());
- py::class_<Nested>(base, "Nested")
- .def(py::init<>())
- .def("fn", [](Nested &, int, NestBase &, Nested &) {})
- .def("fa", [](Nested &, int, NestBase &, Nested &) {},
- "a"_a, "b"_a, "c"_a);
- base.def("g", [](NestBase &, Nested &) {});
- base.def("h", []() { return NestBase(); });
-
- // test_error_after_conversion
- // The second-pass path through dispatcher() previously didn't
- // remember which overload was used, and would crash trying to
- // generate a useful error message
-
- struct NotRegistered {};
- struct StringWrapper { std::string str; };
- m.def("test_error_after_conversions", [](int) {});
- m.def("test_error_after_conversions",
- [](StringWrapper) -> NotRegistered { return {}; });
- py::class_<StringWrapper>(m, "StringWrapper").def(py::init<std::string>());
- py::implicitly_convertible<std::string, StringWrapper>();
-
- #if defined(PYBIND11_CPP17)
- struct alignas(1024) Aligned {
- std::uintptr_t ptr() const { return (uintptr_t) this; }
- };
- py::class_<Aligned>(m, "Aligned")
- .def(py::init<>())
- .def("ptr", &Aligned::ptr);
- #endif
-
- // test_final
- struct IsFinal final {};
- py::class_<IsFinal>(m, "IsFinal", py::is_final());
-
- // test_non_final_final
- struct IsNonFinalFinal {};
- py::class_<IsNonFinalFinal>(m, "IsNonFinalFinal", py::is_final());
-
- // test_exception_rvalue_abort
- struct PyPrintDestructor {
- PyPrintDestructor() = default;
- ~PyPrintDestructor() {
- py::print("Print from destructor");
- }
- void throw_something() { throw std::runtime_error("error"); }
- };
- py::class_<PyPrintDestructor>(m, "PyPrintDestructor")
- .def(py::init<>())
- .def("throw_something", &PyPrintDestructor::throw_something);
-
- // test_multiple_instances_with_same_pointer
- struct SamePointer {};
- static SamePointer samePointer;
- py::class_<SamePointer, std::unique_ptr<SamePointer, py::nodelete>>(m, "SamePointer")
- .def(py::init([]() { return &samePointer; }))
- .def("__del__", [](SamePointer&) { py::print("__del__ called"); });
-
- struct Empty {};
- py::class_<Empty>(m, "Empty")
- .def(py::init<>());
-
- // test_base_and_derived_nested_scope
- struct BaseWithNested {
- struct Nested {};
- };
-
- struct DerivedWithNested : BaseWithNested {
- struct Nested {};
- };
-
- py::class_<BaseWithNested> baseWithNested_class(m, "BaseWithNested");
- py::class_<DerivedWithNested, BaseWithNested> derivedWithNested_class(m, "DerivedWithNested");
- py::class_<BaseWithNested::Nested>(baseWithNested_class, "Nested")
- .def_static("get_name", []() { return "BaseWithNested::Nested"; });
- py::class_<DerivedWithNested::Nested>(derivedWithNested_class, "Nested")
- .def_static("get_name", []() { return "DerivedWithNested::Nested"; });
-
- // test_register_duplicate_class
- struct Duplicate {};
- struct OtherDuplicate {};
- struct DuplicateNested {};
- struct OtherDuplicateNested {};
- m.def("register_duplicate_class_name", [](py::module_ m) {
- py::class_<Duplicate>(m, "Duplicate");
- py::class_<OtherDuplicate>(m, "Duplicate");
- });
- m.def("register_duplicate_class_type", [](py::module_ m) {
- py::class_<OtherDuplicate>(m, "OtherDuplicate");
- py::class_<OtherDuplicate>(m, "YetAnotherDuplicate");
- });
- m.def("register_duplicate_nested_class_name", [](py::object gt) {
- py::class_<DuplicateNested>(gt, "DuplicateNested");
- py::class_<OtherDuplicateNested>(gt, "DuplicateNested");
- });
- m.def("register_duplicate_nested_class_type", [](py::object gt) {
- py::class_<OtherDuplicateNested>(gt, "OtherDuplicateNested");
- py::class_<OtherDuplicateNested>(gt, "YetAnotherDuplicateNested");
- });
-}
-
-template <int N> class BreaksBase { public:
- virtual ~BreaksBase() = default;
- BreaksBase() = default;
- BreaksBase(const BreaksBase&) = delete;
-};
-template <int N> class BreaksTramp : public BreaksBase<N> {};
-// These should all compile just fine:
-using DoesntBreak1 = py::class_<BreaksBase<1>, std::unique_ptr<BreaksBase<1>>, BreaksTramp<1>>;
-using DoesntBreak2 = py::class_<BreaksBase<2>, BreaksTramp<2>, std::unique_ptr<BreaksBase<2>>>;
-using DoesntBreak3 = py::class_<BreaksBase<3>, std::unique_ptr<BreaksBase<3>>>;
-using DoesntBreak4 = py::class_<BreaksBase<4>, BreaksTramp<4>>;
-using DoesntBreak5 = py::class_<BreaksBase<5>>;
-using DoesntBreak6 = py::class_<BreaksBase<6>, std::shared_ptr<BreaksBase<6>>, BreaksTramp<6>>;
-using DoesntBreak7 = py::class_<BreaksBase<7>, BreaksTramp<7>, std::shared_ptr<BreaksBase<7>>>;
-using DoesntBreak8 = py::class_<BreaksBase<8>, std::shared_ptr<BreaksBase<8>>>;
-#define CHECK_BASE(N) static_assert(std::is_same<typename DoesntBreak##N::type, BreaksBase<N>>::value, \
- "DoesntBreak" #N " has wrong type!")
-CHECK_BASE(1); CHECK_BASE(2); CHECK_BASE(3); CHECK_BASE(4); CHECK_BASE(5); CHECK_BASE(6); CHECK_BASE(7); CHECK_BASE(8);
-#define CHECK_ALIAS(N) static_assert(DoesntBreak##N::has_alias && std::is_same<typename DoesntBreak##N::type_alias, BreaksTramp<N>>::value, \
- "DoesntBreak" #N " has wrong type_alias!")
-#define CHECK_NOALIAS(N) static_assert(!DoesntBreak##N::has_alias && std::is_void<typename DoesntBreak##N::type_alias>::value, \
- "DoesntBreak" #N " has type alias, but shouldn't!")
-CHECK_ALIAS(1); CHECK_ALIAS(2); CHECK_NOALIAS(3); CHECK_ALIAS(4); CHECK_NOALIAS(5); CHECK_ALIAS(6); CHECK_ALIAS(7); CHECK_NOALIAS(8);
-#define CHECK_HOLDER(N, TYPE) static_assert(std::is_same<typename DoesntBreak##N::holder_type, std::TYPE##_ptr<BreaksBase<N>>>::value, \
- "DoesntBreak" #N " has wrong holder_type!")
-CHECK_HOLDER(1, unique); CHECK_HOLDER(2, unique); CHECK_HOLDER(3, unique); CHECK_HOLDER(4, unique); CHECK_HOLDER(5, unique);
-CHECK_HOLDER(6, shared); CHECK_HOLDER(7, shared); CHECK_HOLDER(8, shared);
-
-// There's no nice way to test that these fail because they fail to compile; leave them here,
-// though, so that they can be manually tested by uncommenting them (and seeing that compilation
-// failures occurs).
-
-// We have to actually look into the type: the typedef alone isn't enough to instantiate the type:
-#define CHECK_BROKEN(N) static_assert(std::is_same<typename Breaks##N::type, BreaksBase<-N>>::value, \
- "Breaks1 has wrong type!");
-
-//// Two holder classes:
-//typedef py::class_<BreaksBase<-1>, std::unique_ptr<BreaksBase<-1>>, std::unique_ptr<BreaksBase<-1>>> Breaks1;
-//CHECK_BROKEN(1);
-//// Two aliases:
-//typedef py::class_<BreaksBase<-2>, BreaksTramp<-2>, BreaksTramp<-2>> Breaks2;
-//CHECK_BROKEN(2);
-//// Holder + 2 aliases
-//typedef py::class_<BreaksBase<-3>, std::unique_ptr<BreaksBase<-3>>, BreaksTramp<-3>, BreaksTramp<-3>> Breaks3;
-//CHECK_BROKEN(3);
-//// Alias + 2 holders
-//typedef py::class_<BreaksBase<-4>, std::unique_ptr<BreaksBase<-4>>, BreaksTramp<-4>, std::shared_ptr<BreaksBase<-4>>> Breaks4;
-//CHECK_BROKEN(4);
-//// Invalid option (not a subclass or holder)
-//typedef py::class_<BreaksBase<-5>, BreaksTramp<-4>> Breaks5;
-//CHECK_BROKEN(5);
-//// Invalid option: multiple inheritance not supported:
-//template <> struct BreaksBase<-8> : BreaksBase<-6>, BreaksBase<-7> {};
-//typedef py::class_<BreaksBase<-8>, BreaksBase<-6>, BreaksBase<-7>> Breaks8;
-//CHECK_BROKEN(8);
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_class.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_class.py
deleted file mode 100644
index bdcced96435773676439168f46a148ab6e6968ef..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_class.py
+++ /dev/null
@@ -1,466 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import class_ as m
-from pybind11_tests import UserType, ConstructorStats
-
-
-def test_repr():
- # In Python 3.3+, repr() accesses __qualname__
- assert "pybind11_type" in repr(type(UserType))
- assert "UserType" in repr(UserType)
-
-
-def test_instance(msg):
- with pytest.raises(TypeError) as excinfo:
- m.NoConstructor()
- assert msg(excinfo.value) == "m.class_.NoConstructor: No constructor defined!"
-
- instance = m.NoConstructor.new_instance()
-
- cstats = ConstructorStats.get(m.NoConstructor)
- assert cstats.alive() == 1
- del instance
- assert cstats.alive() == 0
-
-
-def test_type():
- assert m.check_type(1) == m.DerivedClass1
- with pytest.raises(RuntimeError) as execinfo:
- m.check_type(0)
-
- assert "pybind11::detail::get_type_info: unable to find type info" in str(
- execinfo.value
- )
- assert "Invalid" in str(execinfo.value)
-
- # Currently not supported
- # See https://github.com/pybind/pybind11/issues/2486
- # assert m.check_type(2) == int
-
-
-def test_type_of_py():
- assert m.get_type_of(1) == int
- assert m.get_type_of(m.DerivedClass1()) == m.DerivedClass1
- assert m.get_type_of(int) == type
-
-
-def test_type_of_classic():
- assert m.get_type_classic(1) == int
- assert m.get_type_classic(m.DerivedClass1()) == m.DerivedClass1
- assert m.get_type_classic(int) == type
-
-
-def test_type_of_py_nodelete():
- # If the above test deleted the class, this will segfault
- assert m.get_type_of(m.DerivedClass1()) == m.DerivedClass1
-
-
-def test_as_type_py():
- assert m.as_type(int) == int
-
- with pytest.raises(TypeError):
- assert m.as_type(1) == int
-
- with pytest.raises(TypeError):
- assert m.as_type(m.DerivedClass1()) == m.DerivedClass1
-
-
-def test_docstrings(doc):
- assert doc(UserType) == "A `py::class_` type for testing"
- assert UserType.__name__ == "UserType"
- assert UserType.__module__ == "pybind11_tests"
- assert UserType.get_value.__name__ == "get_value"
- assert UserType.get_value.__module__ == "pybind11_tests"
-
- assert (
- doc(UserType.get_value)
- == """
- get_value(self: m.UserType) -> int
-
- Get value using a method
- """
- )
- assert doc(UserType.value) == "Get/set value using a property"
-
- assert (
- doc(m.NoConstructor.new_instance)
- == """
- new_instance() -> m.class_.NoConstructor
-
- Return an instance
- """
- )
-
-
-def test_qualname(doc):
- """Tests that a properly qualified name is set in __qualname__ (even in pre-3.3, where we
- backport the attribute) and that generated docstrings properly use it and the module name"""
- assert m.NestBase.__qualname__ == "NestBase"
- assert m.NestBase.Nested.__qualname__ == "NestBase.Nested"
-
- assert (
- doc(m.NestBase.__init__)
- == """
- __init__(self: m.class_.NestBase) -> None
- """
- )
- assert (
- doc(m.NestBase.g)
- == """
- g(self: m.class_.NestBase, arg0: m.class_.NestBase.Nested) -> None
- """
- )
- assert (
- doc(m.NestBase.Nested.__init__)
- == """
- __init__(self: m.class_.NestBase.Nested) -> None
- """
- )
- assert (
- doc(m.NestBase.Nested.fn)
- == """
- fn(self: m.class_.NestBase.Nested, arg0: int, arg1: m.class_.NestBase, arg2: m.class_.NestBase.Nested) -> None
- """ # noqa: E501 line too long
- )
- assert (
- doc(m.NestBase.Nested.fa)
- == """
- fa(self: m.class_.NestBase.Nested, a: int, b: m.class_.NestBase, c: m.class_.NestBase.Nested) -> None
- """ # noqa: E501 line too long
- )
- assert m.NestBase.__module__ == "pybind11_tests.class_"
- assert m.NestBase.Nested.__module__ == "pybind11_tests.class_"
-
-
-def test_inheritance(msg):
- roger = m.Rabbit("Rabbit")
- assert roger.name() + " is a " + roger.species() == "Rabbit is a parrot"
- assert m.pet_name_species(roger) == "Rabbit is a parrot"
-
- polly = m.Pet("Polly", "parrot")
- assert polly.name() + " is a " + polly.species() == "Polly is a parrot"
- assert m.pet_name_species(polly) == "Polly is a parrot"
-
- molly = m.Dog("Molly")
- assert molly.name() + " is a " + molly.species() == "Molly is a dog"
- assert m.pet_name_species(molly) == "Molly is a dog"
-
- fred = m.Hamster("Fred")
- assert fred.name() + " is a " + fred.species() == "Fred is a rodent"
-
- assert m.dog_bark(molly) == "Woof!"
-
- with pytest.raises(TypeError) as excinfo:
- m.dog_bark(polly)
- assert (
- msg(excinfo.value)
- == """
- dog_bark(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: m.class_.Dog) -> str
-
- Invoked with: <m.class_.Pet object at 0>
- """
- )
-
- with pytest.raises(TypeError) as excinfo:
- m.Chimera("lion", "goat")
- assert "No constructor defined!" in str(excinfo.value)
-
-
-def test_inheritance_init(msg):
-
- # Single base
- class Python(m.Pet):
- def __init__(self):
- pass
-
- with pytest.raises(TypeError) as exc_info:
- Python()
- expected = "m.class_.Pet.__init__() must be called when overriding __init__"
- assert msg(exc_info.value) == expected
-
- # Multiple bases
- class RabbitHamster(m.Rabbit, m.Hamster):
- def __init__(self):
- m.Rabbit.__init__(self, "RabbitHamster")
-
- with pytest.raises(TypeError) as exc_info:
- RabbitHamster()
- expected = "m.class_.Hamster.__init__() must be called when overriding __init__"
- assert msg(exc_info.value) == expected
-
-
-def test_automatic_upcasting():
- assert type(m.return_class_1()).__name__ == "DerivedClass1"
- assert type(m.return_class_2()).__name__ == "DerivedClass2"
- assert type(m.return_none()).__name__ == "NoneType"
- # Repeat these a few times in a random order to ensure no invalid caching is applied
- assert type(m.return_class_n(1)).__name__ == "DerivedClass1"
- assert type(m.return_class_n(2)).__name__ == "DerivedClass2"
- assert type(m.return_class_n(0)).__name__ == "BaseClass"
- assert type(m.return_class_n(2)).__name__ == "DerivedClass2"
- assert type(m.return_class_n(2)).__name__ == "DerivedClass2"
- assert type(m.return_class_n(0)).__name__ == "BaseClass"
- assert type(m.return_class_n(1)).__name__ == "DerivedClass1"
-
-
-def test_isinstance():
- objects = [tuple(), dict(), m.Pet("Polly", "parrot")] + [m.Dog("Molly")] * 4
- expected = (True, True, True, True, True, False, False)
- assert m.check_instances(objects) == expected
-
-
-def test_mismatched_holder():
- import re
-
- with pytest.raises(RuntimeError) as excinfo:
- m.mismatched_holder_1()
- assert re.match(
- 'generic_type: type ".*MismatchDerived1" does not have a non-default '
- 'holder type while its base ".*MismatchBase1" does',
- str(excinfo.value),
- )
-
- with pytest.raises(RuntimeError) as excinfo:
- m.mismatched_holder_2()
- assert re.match(
- 'generic_type: type ".*MismatchDerived2" has a non-default holder type '
- 'while its base ".*MismatchBase2" does not',
- str(excinfo.value),
- )
-
-
-def test_override_static():
- """#511: problem with inheritance + overwritten def_static"""
- b = m.MyBase.make()
- d1 = m.MyDerived.make2()
- d2 = m.MyDerived.make()
-
- assert isinstance(b, m.MyBase)
- assert isinstance(d1, m.MyDerived)
- assert isinstance(d2, m.MyDerived)
-
-
-def test_implicit_conversion_life_support():
- """Ensure the lifetime of temporary objects created for implicit conversions"""
- assert m.implicitly_convert_argument(UserType(5)) == 5
- assert m.implicitly_convert_variable(UserType(5)) == 5
-
- assert "outside a bound function" in m.implicitly_convert_variable_fail(UserType(5))
-
-
-def test_operator_new_delete(capture):
- """Tests that class-specific operator new/delete functions are invoked"""
-
- class SubAliased(m.AliasedHasOpNewDelSize):
- pass
-
- with capture:
- a = m.HasOpNewDel()
- b = m.HasOpNewDelSize()
- d = m.HasOpNewDelBoth()
- assert (
- capture
- == """
- A new 8
- B new 4
- D new 32
- """
- )
- sz_alias = str(m.AliasedHasOpNewDelSize.size_alias)
- sz_noalias = str(m.AliasedHasOpNewDelSize.size_noalias)
- with capture:
- c = m.AliasedHasOpNewDelSize()
- c2 = SubAliased()
- assert capture == ("C new " + sz_noalias + "\n" + "C new " + sz_alias + "\n")
-
- with capture:
- del a
- pytest.gc_collect()
- del b
- pytest.gc_collect()
- del d
- pytest.gc_collect()
- assert (
- capture
- == """
- A delete
- B delete 4
- D delete
- """
- )
-
- with capture:
- del c
- pytest.gc_collect()
- del c2
- pytest.gc_collect()
- assert capture == ("C delete " + sz_noalias + "\n" + "C delete " + sz_alias + "\n")
-
-
-def test_bind_protected_functions():
- """Expose protected member functions to Python using a helper class"""
- a = m.ProtectedA()
- assert a.foo() == 42
-
- b = m.ProtectedB()
- assert b.foo() == 42
-
- class C(m.ProtectedB):
- def __init__(self):
- m.ProtectedB.__init__(self)
-
- def foo(self):
- return 0
-
- c = C()
- assert c.foo() == 0
-
-
-def test_brace_initialization():
- """ Tests that simple POD classes can be constructed using C++11 brace initialization """
- a = m.BraceInitialization(123, "test")
- assert a.field1 == 123
- assert a.field2 == "test"
-
- # Tests that a non-simple class doesn't get brace initialization (if the
- # class defines an initializer_list constructor, in particular, it would
- # win over the expected constructor).
- b = m.NoBraceInitialization([123, 456])
- assert b.vec == [123, 456]
-
-
-@pytest.mark.xfail("env.PYPY")
-def test_class_refcount():
- """Instances must correctly increase/decrease the reference count of their types (#1029)"""
- from sys import getrefcount
-
- class PyDog(m.Dog):
- pass
-
- for cls in m.Dog, PyDog:
- refcount_1 = getrefcount(cls)
- molly = [cls("Molly") for _ in range(10)]
- refcount_2 = getrefcount(cls)
-
- del molly
- pytest.gc_collect()
- refcount_3 = getrefcount(cls)
-
- assert refcount_1 == refcount_3
- assert refcount_2 > refcount_1
-
-
-def test_reentrant_implicit_conversion_failure(msg):
- # ensure that there is no runaway reentrant implicit conversion (#1035)
- with pytest.raises(TypeError) as excinfo:
- m.BogusImplicitConversion(0)
- assert (
- msg(excinfo.value)
- == """
- __init__(): incompatible constructor arguments. The following argument types are supported:
- 1. m.class_.BogusImplicitConversion(arg0: m.class_.BogusImplicitConversion)
-
- Invoked with: 0
- """
- )
-
-
-def test_error_after_conversions():
- with pytest.raises(TypeError) as exc_info:
- m.test_error_after_conversions("hello")
- assert str(exc_info.value).startswith(
- "Unable to convert function return value to a Python type!"
- )
-
-
-def test_aligned():
- if hasattr(m, "Aligned"):
- p = m.Aligned().ptr()
- assert p % 1024 == 0
-
-
-# https://foss.heptapod.net/pypy/pypy/-/issues/2742
-@pytest.mark.xfail("env.PYPY")
-def test_final():
- with pytest.raises(TypeError) as exc_info:
-
- class PyFinalChild(m.IsFinal):
- pass
-
- assert str(exc_info.value).endswith("is not an acceptable base type")
-
-
-# https://foss.heptapod.net/pypy/pypy/-/issues/2742
-@pytest.mark.xfail("env.PYPY")
-def test_non_final_final():
- with pytest.raises(TypeError) as exc_info:
-
- class PyNonFinalFinalChild(m.IsNonFinalFinal):
- pass
-
- assert str(exc_info.value).endswith("is not an acceptable base type")
-
-
-# https://github.com/pybind/pybind11/issues/1878
-def test_exception_rvalue_abort():
- with pytest.raises(RuntimeError):
- m.PyPrintDestructor().throw_something()
-
-
-# https://github.com/pybind/pybind11/issues/1568
-def test_multiple_instances_with_same_pointer(capture):
- n = 100
- instances = [m.SamePointer() for _ in range(n)]
- for i in range(n):
- # We need to reuse the same allocated memory for with a different type,
- # to ensure the bug in `deregister_instance_impl` is detected. Otherwise
- # `Py_TYPE(self) == Py_TYPE(it->second)` will still succeed, even though
- # the `instance` is already deleted.
- instances[i] = m.Empty()
- # No assert: if this does not trigger the error
- # pybind11_fail("pybind11_object_dealloc(): Tried to deallocate unregistered instance!");
- # and just completes without crashing, we're good.
-
-
-# https://github.com/pybind/pybind11/issues/1624
-def test_base_and_derived_nested_scope():
- assert issubclass(m.DerivedWithNested, m.BaseWithNested)
- assert m.BaseWithNested.Nested != m.DerivedWithNested.Nested
- assert m.BaseWithNested.Nested.get_name() == "BaseWithNested::Nested"
- assert m.DerivedWithNested.Nested.get_name() == "DerivedWithNested::Nested"
-
-
-def test_register_duplicate_class():
- import types
-
- module_scope = types.ModuleType("module_scope")
- with pytest.raises(RuntimeError) as exc_info:
- m.register_duplicate_class_name(module_scope)
- expected = (
- 'generic_type: cannot initialize type "Duplicate": '
- "an object with that name is already defined"
- )
- assert str(exc_info.value) == expected
- with pytest.raises(RuntimeError) as exc_info:
- m.register_duplicate_class_type(module_scope)
- expected = 'generic_type: type "YetAnotherDuplicate" is already registered!'
- assert str(exc_info.value) == expected
-
- class ClassScope:
- pass
-
- with pytest.raises(RuntimeError) as exc_info:
- m.register_duplicate_nested_class_name(ClassScope)
- expected = (
- 'generic_type: cannot initialize type "DuplicateNested": '
- "an object with that name is already defined"
- )
- assert str(exc_info.value) == expected
- with pytest.raises(RuntimeError) as exc_info:
- m.register_duplicate_nested_class_type(ClassScope)
- expected = 'generic_type: type "YetAnotherDuplicateNested" is already registered!'
- assert str(exc_info.value) == expected
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/CMakeLists.txt
deleted file mode 100644
index 0c0578ad3d3cead093940452968a0b165f2a3fdc..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/CMakeLists.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-# Built-in in CMake 3.5+
-include(CMakeParseArguments)
-
-add_custom_target(test_cmake_build)
-
-function(pybind11_add_build_test name)
- cmake_parse_arguments(ARG "INSTALL" "" "" ${ARGN})
-
- set(build_options "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
-
- if(PYBIND11_FINDPYTHON)
- list(APPEND build_options "-DPYBIND11_FINDPYTHON=${PYBIND11_FINDPYTHON}")
-
- if(DEFINED Python_ROOT_DIR)
- list(APPEND build_options "-DPython_ROOT_DIR=${Python_ROOT_DIR}")
- endif()
-
- list(APPEND build_options "-DPython_EXECUTABLE=${Python_EXECUTABLE}")
- else()
- list(APPEND build_options "-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}")
- endif()
-
- if(DEFINED CMAKE_CXX_STANDARD)
- list(APPEND build_options "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}")
- endif()
-
- if(NOT ARG_INSTALL)
- list(APPEND build_options "-DPYBIND11_PROJECT_DIR=${pybind11_SOURCE_DIR}")
- else()
- list(APPEND build_options "-DCMAKE_PREFIX_PATH=${pybind11_BINARY_DIR}/mock_install")
- endif()
-
- add_custom_target(
- test_build_${name}
- ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMAKE_CURRENT_SOURCE_DIR}/${name}"
- "${CMAKE_CURRENT_BINARY_DIR}/${name}"
- --build-config
- Release
- --build-noclean
- --build-generator
- ${CMAKE_GENERATOR}
- $<$<BOOL:${CMAKE_GENERATOR_PLATFORM}>:--build-generator-platform>
- ${CMAKE_GENERATOR_PLATFORM}
- --build-makeprogram
- ${CMAKE_MAKE_PROGRAM}
- --build-target
- check_${name}
- --build-options
- ${build_options})
- if(ARG_INSTALL)
- add_dependencies(test_build_${name} mock_install)
- endif()
- add_dependencies(test_cmake_build test_build_${name})
-endfunction()
-
-pybind11_add_build_test(subdirectory_function)
-pybind11_add_build_test(subdirectory_target)
-if("${PYTHON_MODULE_EXTENSION}" MATCHES "pypy" OR "${Python_INTERPRETER_ID}" STREQUAL "PyPy")
- message(STATUS "Skipping embed test on PyPy")
-else()
- pybind11_add_build_test(subdirectory_embed)
-endif()
-
-if(PYBIND11_INSTALL)
- add_custom_target(
- mock_install ${CMAKE_COMMAND} "-DCMAKE_INSTALL_PREFIX=${pybind11_BINARY_DIR}/mock_install" -P
- "${pybind11_BINARY_DIR}/cmake_install.cmake")
-
- pybind11_add_build_test(installed_function INSTALL)
- pybind11_add_build_test(installed_target INSTALL)
- if(NOT ("${PYTHON_MODULE_EXTENSION}" MATCHES "pypy" OR "${Python_INTERPRETER_ID}" STREQUAL "PyPy"
- ))
- pybind11_add_build_test(installed_embed INSTALL)
- endif()
-endif()
-
-add_dependencies(check test_cmake_build)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/embed.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/embed.cpp
deleted file mode 100644
index a3abc8a84d88eecfb43323b2af90c077fecae7fd..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/embed.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <pybind11/embed.h>
-namespace py = pybind11;
-
-PYBIND11_EMBEDDED_MODULE(test_cmake_build, m) {
- m.def("add", [](int i, int j) { return i + j; });
-}
-
-int main(int argc, char *argv[]) {
- if (argc != 2)
- throw std::runtime_error("Expected test.py file as the first argument");
- auto test_py_file = argv[1];
-
- py::scoped_interpreter guard{};
-
- auto m = py::module_::import("test_cmake_build");
- if (m.attr("add")(1, 2).cast<int>() != 3)
- throw std::runtime_error("embed.cpp failed");
-
- py::module_::import("sys").attr("argv") = py::make_tuple("test.py", "embed.cpp");
- py::eval_file(test_py_file, py::globals());
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/installed_embed/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/installed_embed/CMakeLists.txt
deleted file mode 100644
index 64ae5c4bff13d32c06639d310aebb682ca376d4e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/installed_embed/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-
-# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
-# some versions of VS that have a patched CMake 3.11. This forces us to emulate
-# the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.18)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.18)
-endif()
-
-project(test_installed_embed CXX)
-
-find_package(pybind11 CONFIG REQUIRED)
-message(STATUS "Found pybind11 v${pybind11_VERSION}: ${pybind11_INCLUDE_DIRS}")
-
-add_executable(test_installed_embed ../embed.cpp)
-target_link_libraries(test_installed_embed PRIVATE pybind11::embed)
-set_target_properties(test_installed_embed PROPERTIES OUTPUT_NAME test_cmake_build)
-
-# Do not treat includes from IMPORTED target as SYSTEM (Python headers in pybind11::embed).
-# This may be needed to resolve header conflicts, e.g. between Python release and debug headers.
-set_target_properties(test_installed_embed PROPERTIES NO_SYSTEM_FROM_IMPORTED ON)
-
-add_custom_target(check_installed_embed $<TARGET_FILE:test_installed_embed>
- ${PROJECT_SOURCE_DIR}/../test.py)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/installed_function/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/installed_function/CMakeLists.txt
deleted file mode 100644
index 1a502863c0c64ad891ebe159a548f0c47dc6ce34..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/installed_function/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-project(test_installed_module CXX)
-
-# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
-# some versions of VS that have a patched CMake 3.11. This forces us to emulate
-# the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.18)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.18)
-endif()
-
-project(test_installed_function CXX)
-
-find_package(pybind11 CONFIG REQUIRED)
-message(
- STATUS "Found pybind11 v${pybind11_VERSION} ${pybind11_VERSION_TYPE}: ${pybind11_INCLUDE_DIRS}")
-
-pybind11_add_module(test_installed_function SHARED NO_EXTRAS ../main.cpp)
-set_target_properties(test_installed_function PROPERTIES OUTPUT_NAME test_cmake_build)
-
-if(DEFINED Python_EXECUTABLE)
- set(_Python_EXECUTABLE "${Python_EXECUTABLE}")
-elseif(DEFINED PYTHON_EXECUTABLE)
- set(_Python_EXECUTABLE "${PYTHON_EXECUTABLE}")
-else()
- message(FATAL_ERROR "No Python executable defined (should not be possible at this stage)")
-endif()
-
-add_custom_target(
- check_installed_function
- ${CMAKE_COMMAND}
- -E
- env
- PYTHONPATH=$<TARGET_FILE_DIR:test_installed_function>
- ${_Python_EXECUTABLE}
- ${PROJECT_SOURCE_DIR}/../test.py
- ${PROJECT_NAME})
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/installed_target/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/installed_target/CMakeLists.txt
deleted file mode 100644
index b38eb77470e3efa45d8ceb490312b0461118ab82..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/installed_target/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-
-# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
-# some versions of VS that have a patched CMake 3.11. This forces us to emulate
-# the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.18)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.18)
-endif()
-
-project(test_installed_target CXX)
-
-find_package(pybind11 CONFIG REQUIRED)
-message(STATUS "Found pybind11 v${pybind11_VERSION}: ${pybind11_INCLUDE_DIRS}")
-
-add_library(test_installed_target MODULE ../main.cpp)
-
-target_link_libraries(test_installed_target PRIVATE pybind11::module)
-set_target_properties(test_installed_target PROPERTIES OUTPUT_NAME test_cmake_build)
-
-# Make sure result is, for example, test_installed_target.so, not libtest_installed_target.dylib
-pybind11_extension(test_installed_target)
-
-# Do not treat includes from IMPORTED target as SYSTEM (Python headers in pybind11::module).
-# This may be needed to resolve header conflicts, e.g. between Python release and debug headers.
-set_target_properties(test_installed_target PROPERTIES NO_SYSTEM_FROM_IMPORTED ON)
-
-if(DEFINED Python_EXECUTABLE)
- set(_Python_EXECUTABLE "${Python_EXECUTABLE}")
-elseif(DEFINED PYTHON_EXECUTABLE)
- set(_Python_EXECUTABLE "${PYTHON_EXECUTABLE}")
-else()
- message(FATAL_ERROR "No Python executable defined (should not be possible at this stage)")
-endif()
-
-add_custom_target(
- check_installed_target
- ${CMAKE_COMMAND}
- -E
- env
- PYTHONPATH=$<TARGET_FILE_DIR:test_installed_target>
- ${_Python_EXECUTABLE}
- ${PROJECT_SOURCE_DIR}/../test.py
- ${PROJECT_NAME})
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/main.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/main.cpp
deleted file mode 100644
index e30f2c4b9a31205185d2b221a994dc001a30730a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/main.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <pybind11/pybind11.h>
-namespace py = pybind11;
-
-PYBIND11_MODULE(test_cmake_build, m) {
- m.def("add", [](int i, int j) { return i + j; });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
deleted file mode 100644
index c7df0cf77c99b5ca39571fd00aea421bf647256d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-
-# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
-# some versions of VS that have a patched CMake 3.11. This forces us to emulate
-# the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.18)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.18)
-endif()
-
-project(test_subdirectory_embed CXX)
-
-set(PYBIND11_INSTALL
- ON
- CACHE BOOL "")
-set(PYBIND11_EXPORT_NAME test_export)
-
-add_subdirectory(${PYBIND11_PROJECT_DIR} pybind11)
-
-# Test basic target functionality
-add_executable(test_subdirectory_embed ../embed.cpp)
-target_link_libraries(test_subdirectory_embed PRIVATE pybind11::embed)
-set_target_properties(test_subdirectory_embed PROPERTIES OUTPUT_NAME test_cmake_build)
-
-add_custom_target(check_subdirectory_embed $<TARGET_FILE:test_subdirectory_embed>
- ${PROJECT_SOURCE_DIR}/../test.py)
-
-# Test custom export group -- PYBIND11_EXPORT_NAME
-add_library(test_embed_lib ../embed.cpp)
-target_link_libraries(test_embed_lib PRIVATE pybind11::embed)
-
-install(
- TARGETS test_embed_lib
- EXPORT test_export
- ARCHIVE DESTINATION bin
- LIBRARY DESTINATION lib
- RUNTIME DESTINATION lib)
-install(EXPORT test_export DESTINATION lib/cmake/test_export/test_export-Targets.cmake)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/subdirectory_function/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
deleted file mode 100644
index 624c600f8511bfc2950e702dfd453918375a79af..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-
-# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
-# some versions of VS that have a patched CMake 3.11. This forces us to emulate
-# the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.18)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.18)
-endif()
-
-project(test_subdirectory_function CXX)
-
-add_subdirectory("${PYBIND11_PROJECT_DIR}" pybind11)
-pybind11_add_module(test_subdirectory_function ../main.cpp)
-set_target_properties(test_subdirectory_function PROPERTIES OUTPUT_NAME test_cmake_build)
-
-if(DEFINED Python_EXECUTABLE)
- set(_Python_EXECUTABLE "${Python_EXECUTABLE}")
-elseif(DEFINED PYTHON_EXECUTABLE)
- set(_Python_EXECUTABLE "${PYTHON_EXECUTABLE}")
-else()
- message(FATAL_ERROR "No Python executable defined (should not be possible at this stage)")
-endif()
-
-add_custom_target(
- check_subdirectory_function
- ${CMAKE_COMMAND}
- -E
- env
- PYTHONPATH=$<TARGET_FILE_DIR:test_subdirectory_function>
- ${_Python_EXECUTABLE}
- ${PROJECT_SOURCE_DIR}/../test.py
- ${PROJECT_NAME})
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/subdirectory_target/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
deleted file mode 100644
index 2471941fb682951dd6e5224dbeee38a7a738862b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-
-# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
-# some versions of VS that have a patched CMake 3.11. This forces us to emulate
-# the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.18)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.18)
-endif()
-
-project(test_subdirectory_target CXX)
-
-add_subdirectory(${PYBIND11_PROJECT_DIR} pybind11)
-
-add_library(test_subdirectory_target MODULE ../main.cpp)
-set_target_properties(test_subdirectory_target PROPERTIES OUTPUT_NAME test_cmake_build)
-
-target_link_libraries(test_subdirectory_target PRIVATE pybind11::module)
-
-# Make sure result is, for example, test_installed_target.so, not libtest_installed_target.dylib
-pybind11_extension(test_subdirectory_target)
-
-if(DEFINED Python_EXECUTABLE)
- set(_Python_EXECUTABLE "${Python_EXECUTABLE}")
-elseif(DEFINED PYTHON_EXECUTABLE)
- set(_Python_EXECUTABLE "${PYTHON_EXECUTABLE}")
-else()
- message(FATAL_ERROR "No Python executable defined (should not be possible at this stage)")
-endif()
-
-add_custom_target(
- check_subdirectory_target
- ${CMAKE_COMMAND}
- -E
- env
- PYTHONPATH=$<TARGET_FILE_DIR:test_subdirectory_target>
- ${_Python_EXECUTABLE}
- ${PROJECT_SOURCE_DIR}/../test.py
- ${PROJECT_NAME})
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/test.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/test.py
deleted file mode 100644
index 87ed5135ff415bab7a56bf4ab8dea3200fd53cca..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_cmake_build/test.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys
-import test_cmake_build
-
-assert test_cmake_build.add(1, 2) == 3
-print("{} imports, runs, and adds: 1 + 2 = 3".format(sys.argv[1]))
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_constants_and_functions.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_constants_and_functions.cpp
deleted file mode 100644
index f60779559362d9ed833b56c760502ffdb279857c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_constants_and_functions.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- tests/test_constants_and_functions.cpp -- global constants and functions, enumerations, raw byte strings
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-enum MyEnum { EFirstEntry = 1, ESecondEntry };
-
-std::string test_function1() {
- return "test_function()";
-}
-
-std::string test_function2(MyEnum k) {
- return "test_function(enum=" + std::to_string(k) + ")";
-}
-
-std::string test_function3(int i) {
- return "test_function(" + std::to_string(i) + ")";
-}
-
-py::str test_function4() { return "test_function()"; }
-py::str test_function4(char *) { return "test_function(char *)"; }
-py::str test_function4(int, float) { return "test_function(int, float)"; }
-py::str test_function4(float, int) { return "test_function(float, int)"; }
-
-py::bytes return_bytes() {
- const char *data = "\x01\x00\x02\x00";
- return std::string(data, 4);
-}
-
-std::string print_bytes(py::bytes bytes) {
- std::string ret = "bytes[";
- const auto value = static_cast<std::string>(bytes);
- for (size_t i = 0; i < value.length(); ++i) {
- ret += std::to_string(static_cast<int>(value[i])) + " ";
- }
- ret.back() = ']';
- return ret;
-}
-
-// Test that we properly handle C++17 exception specifiers (which are part of the function signature
-// in C++17). These should all still work before C++17, but don't affect the function signature.
-namespace test_exc_sp {
-int f1(int x) noexcept { return x+1; }
-int f2(int x) noexcept(true) { return x+2; }
-int f3(int x) noexcept(false) { return x+3; }
-#if defined(__GNUG__)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated"
-#endif
-int f4(int x) throw() { return x+4; } // Deprecated equivalent to noexcept(true)
-#if defined(__GNUG__)
-# pragma GCC diagnostic pop
-#endif
-struct C {
- int m1(int x) noexcept { return x-1; }
- int m2(int x) const noexcept { return x-2; }
- int m3(int x) noexcept(true) { return x-3; }
- int m4(int x) const noexcept(true) { return x-4; }
- int m5(int x) noexcept(false) { return x-5; }
- int m6(int x) const noexcept(false) { return x-6; }
-#if defined(__GNUG__)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated"
-#endif
- int m7(int x) throw() { return x-7; }
- int m8(int x) const throw() { return x-8; }
-#if defined(__GNUG__)
-# pragma GCC diagnostic pop
-#endif
-};
-} // namespace test_exc_sp
-
-
-TEST_SUBMODULE(constants_and_functions, m) {
- // test_constants
- m.attr("some_constant") = py::int_(14);
-
- // test_function_overloading
- m.def("test_function", &test_function1);
- m.def("test_function", &test_function2);
- m.def("test_function", &test_function3);
-
-#if defined(PYBIND11_OVERLOAD_CAST)
- m.def("test_function", py::overload_cast<>(&test_function4));
- m.def("test_function", py::overload_cast<char *>(&test_function4));
- m.def("test_function", py::overload_cast<int, float>(&test_function4));
- m.def("test_function", py::overload_cast<float, int>(&test_function4));
-#else
- m.def("test_function", static_cast<py::str (*)()>(&test_function4));
- m.def("test_function", static_cast<py::str (*)(char *)>(&test_function4));
- m.def("test_function", static_cast<py::str (*)(int, float)>(&test_function4));
- m.def("test_function", static_cast<py::str (*)(float, int)>(&test_function4));
-#endif
-
- py::enum_<MyEnum>(m, "MyEnum")
- .value("EFirstEntry", EFirstEntry)
- .value("ESecondEntry", ESecondEntry)
- .export_values();
-
- // test_bytes
- m.def("return_bytes", &return_bytes);
- m.def("print_bytes", &print_bytes);
-
- // test_exception_specifiers
- using namespace test_exc_sp;
- py::class_<C>(m, "C")
- .def(py::init<>())
- .def("m1", &C::m1)
- .def("m2", &C::m2)
- .def("m3", &C::m3)
- .def("m4", &C::m4)
- .def("m5", &C::m5)
- .def("m6", &C::m6)
- .def("m7", &C::m7)
- .def("m8", &C::m8)
- ;
- m.def("f1", f1);
- m.def("f2", f2);
- m.def("f3", f3);
- m.def("f4", f4);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_constants_and_functions.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_constants_and_functions.py
deleted file mode 100644
index b980ccf1cc9da1096523c8744530eee021c268a4..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_constants_and_functions.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-m = pytest.importorskip("pybind11_tests.constants_and_functions")
-
-
-def test_constants():
- assert m.some_constant == 14
-
-
-def test_function_overloading():
- assert m.test_function() == "test_function()"
- assert m.test_function(7) == "test_function(7)"
- assert m.test_function(m.MyEnum.EFirstEntry) == "test_function(enum=1)"
- assert m.test_function(m.MyEnum.ESecondEntry) == "test_function(enum=2)"
-
- assert m.test_function() == "test_function()"
- assert m.test_function("abcd") == "test_function(char *)"
- assert m.test_function(1, 1.0) == "test_function(int, float)"
- assert m.test_function(1, 1.0) == "test_function(int, float)"
- assert m.test_function(2.0, 2) == "test_function(float, int)"
-
-
-def test_bytes():
- assert m.print_bytes(m.return_bytes()) == "bytes[1 0 2 0]"
-
-
-def test_exception_specifiers():
- c = m.C()
- assert c.m1(2) == 1
- assert c.m2(3) == 1
- assert c.m3(5) == 2
- assert c.m4(7) == 3
- assert c.m5(10) == 5
- assert c.m6(14) == 8
- assert c.m7(20) == 13
- assert c.m8(29) == 21
-
- assert m.f1(33) == 34
- assert m.f2(53) == 55
- assert m.f3(86) == 89
- assert m.f4(140) == 144
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_copy_move.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_copy_move.cpp
deleted file mode 100644
index 05d5c47677e2c377563e3fb7c81f476e47f372b8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_copy_move.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- tests/test_copy_move_policies.cpp -- 'copy' and 'move' return value policies
- and related tests
-
- Copyright (c) 2016 Ben North <ben@redfrontdoor.org>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <pybind11/stl.h>
-
-template <typename derived>
-struct empty {
- static const derived& get_one() { return instance_; }
- static derived instance_;
-};
-
-struct lacking_copy_ctor : public empty<lacking_copy_ctor> {
- lacking_copy_ctor() = default;
- lacking_copy_ctor(const lacking_copy_ctor& other) = delete;
-};
-
-template <> lacking_copy_ctor empty<lacking_copy_ctor>::instance_ = {};
-
-struct lacking_move_ctor : public empty<lacking_move_ctor> {
- lacking_move_ctor() = default;
- lacking_move_ctor(const lacking_move_ctor& other) = delete;
- lacking_move_ctor(lacking_move_ctor&& other) = delete;
-};
-
-template <> lacking_move_ctor empty<lacking_move_ctor>::instance_ = {};
-
-/* Custom type caster move/copy test classes */
-class MoveOnlyInt {
-public:
- MoveOnlyInt() { print_default_created(this); }
- MoveOnlyInt(int v) : value{std::move(v)} { print_created(this, value); }
- MoveOnlyInt(MoveOnlyInt &&m) { print_move_created(this, m.value); std::swap(value, m.value); }
- MoveOnlyInt &operator=(MoveOnlyInt &&m) { print_move_assigned(this, m.value); std::swap(value, m.value); return *this; }
- MoveOnlyInt(const MoveOnlyInt &) = delete;
- MoveOnlyInt &operator=(const MoveOnlyInt &) = delete;
- ~MoveOnlyInt() { print_destroyed(this); }
-
- int value;
-};
-class MoveOrCopyInt {
-public:
- MoveOrCopyInt() { print_default_created(this); }
- MoveOrCopyInt(int v) : value{std::move(v)} { print_created(this, value); }
- MoveOrCopyInt(MoveOrCopyInt &&m) { print_move_created(this, m.value); std::swap(value, m.value); }
- MoveOrCopyInt &operator=(MoveOrCopyInt &&m) { print_move_assigned(this, m.value); std::swap(value, m.value); return *this; }
- MoveOrCopyInt(const MoveOrCopyInt &c) { print_copy_created(this, c.value); value = c.value; }
- MoveOrCopyInt &operator=(const MoveOrCopyInt &c) { print_copy_assigned(this, c.value); value = c.value; return *this; }
- ~MoveOrCopyInt() { print_destroyed(this); }
-
- int value;
-};
-class CopyOnlyInt {
-public:
- CopyOnlyInt() { print_default_created(this); }
- CopyOnlyInt(int v) : value{std::move(v)} { print_created(this, value); }
- CopyOnlyInt(const CopyOnlyInt &c) { print_copy_created(this, c.value); value = c.value; }
- CopyOnlyInt &operator=(const CopyOnlyInt &c) { print_copy_assigned(this, c.value); value = c.value; return *this; }
- ~CopyOnlyInt() { print_destroyed(this); }
-
- int value;
-};
-PYBIND11_NAMESPACE_BEGIN(pybind11)
-PYBIND11_NAMESPACE_BEGIN(detail)
-template <> struct type_caster<MoveOnlyInt> {
- PYBIND11_TYPE_CASTER(MoveOnlyInt, _("MoveOnlyInt"));
- bool load(handle src, bool) { value = MoveOnlyInt(src.cast<int>()); return true; }
- static handle cast(const MoveOnlyInt &m, return_value_policy r, handle p) { return pybind11::cast(m.value, r, p); }
-};
-
-template <> struct type_caster<MoveOrCopyInt> {
- PYBIND11_TYPE_CASTER(MoveOrCopyInt, _("MoveOrCopyInt"));
- bool load(handle src, bool) { value = MoveOrCopyInt(src.cast<int>()); return true; }
- static handle cast(const MoveOrCopyInt &m, return_value_policy r, handle p) { return pybind11::cast(m.value, r, p); }
-};
-
-template <> struct type_caster<CopyOnlyInt> {
-protected:
- CopyOnlyInt value;
-public:
- static constexpr auto name = _("CopyOnlyInt");
- bool load(handle src, bool) { value = CopyOnlyInt(src.cast<int>()); return true; }
- static handle cast(const CopyOnlyInt &m, return_value_policy r, handle p) { return pybind11::cast(m.value, r, p); }
- static handle cast(const CopyOnlyInt *src, return_value_policy policy, handle parent) {
- if (!src) return none().release();
- return cast(*src, policy, parent);
- }
- operator CopyOnlyInt*() { return &value; }
- operator CopyOnlyInt&() { return value; }
- template <typename T> using cast_op_type = pybind11::detail::cast_op_type<T>;
-};
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(pybind11)
-
-TEST_SUBMODULE(copy_move_policies, m) {
- // test_lacking_copy_ctor
- py::class_<lacking_copy_ctor>(m, "lacking_copy_ctor")
- .def_static("get_one", &lacking_copy_ctor::get_one,
- py::return_value_policy::copy);
- // test_lacking_move_ctor
- py::class_<lacking_move_ctor>(m, "lacking_move_ctor")
- .def_static("get_one", &lacking_move_ctor::get_one,
- py::return_value_policy::move);
-
- // test_move_and_copy_casts
- m.def("move_and_copy_casts", [](py::object o) {
- int r = 0;
- r += py::cast<MoveOrCopyInt>(o).value; /* moves */
- r += py::cast<MoveOnlyInt>(o).value; /* moves */
- r += py::cast<CopyOnlyInt>(o).value; /* copies */
- MoveOrCopyInt m1(py::cast<MoveOrCopyInt>(o)); /* moves */
- MoveOnlyInt m2(py::cast<MoveOnlyInt>(o)); /* moves */
- CopyOnlyInt m3(py::cast<CopyOnlyInt>(o)); /* copies */
- r += m1.value + m2.value + m3.value;
-
- return r;
- });
-
- // test_move_and_copy_loads
- m.def("move_only", [](MoveOnlyInt m) { return m.value; });
- m.def("move_or_copy", [](MoveOrCopyInt m) { return m.value; });
- m.def("copy_only", [](CopyOnlyInt m) { return m.value; });
- m.def("move_pair", [](std::pair<MoveOnlyInt, MoveOrCopyInt> p) {
- return p.first.value + p.second.value;
- });
- m.def("move_tuple", [](std::tuple<MoveOnlyInt, MoveOrCopyInt, MoveOnlyInt> t) {
- return std::get<0>(t).value + std::get<1>(t).value + std::get<2>(t).value;
- });
- m.def("copy_tuple", [](std::tuple<CopyOnlyInt, CopyOnlyInt> t) {
- return std::get<0>(t).value + std::get<1>(t).value;
- });
- m.def("move_copy_nested", [](std::pair<MoveOnlyInt, std::pair<std::tuple<MoveOrCopyInt, CopyOnlyInt, std::tuple<MoveOnlyInt>>, MoveOrCopyInt>> x) {
- return x.first.value + std::get<0>(x.second.first).value + std::get<1>(x.second.first).value +
- std::get<0>(std::get<2>(x.second.first)).value + x.second.second.value;
- });
- m.def("move_and_copy_cstats", []() {
- ConstructorStats::gc();
- // Reset counts to 0 so that previous tests don't affect later ones:
- auto &mc = ConstructorStats::get<MoveOrCopyInt>();
- mc.move_assignments = mc.move_constructions = mc.copy_assignments = mc.copy_constructions = 0;
- auto &mo = ConstructorStats::get<MoveOnlyInt>();
- mo.move_assignments = mo.move_constructions = mo.copy_assignments = mo.copy_constructions = 0;
- auto &co = ConstructorStats::get<CopyOnlyInt>();
- co.move_assignments = co.move_constructions = co.copy_assignments = co.copy_constructions = 0;
- py::dict d;
- d["MoveOrCopyInt"] = py::cast(mc, py::return_value_policy::reference);
- d["MoveOnlyInt"] = py::cast(mo, py::return_value_policy::reference);
- d["CopyOnlyInt"] = py::cast(co, py::return_value_policy::reference);
- return d;
- });
-#ifdef PYBIND11_HAS_OPTIONAL
- // test_move_and_copy_load_optional
- m.attr("has_optional") = true;
- m.def("move_optional", [](std::optional<MoveOnlyInt> o) {
- return o->value;
- });
- m.def("move_or_copy_optional", [](std::optional<MoveOrCopyInt> o) {
- return o->value;
- });
- m.def("copy_optional", [](std::optional<CopyOnlyInt> o) {
- return o->value;
- });
- m.def("move_optional_tuple", [](std::optional<std::tuple<MoveOrCopyInt, MoveOnlyInt, CopyOnlyInt>> x) {
- return std::get<0>(*x).value + std::get<1>(*x).value + std::get<2>(*x).value;
- });
-#else
- m.attr("has_optional") = false;
-#endif
-
- // #70 compilation issue if operator new is not public - simple body added
- // but not needed on most compilers; MSVC and nvcc don't like a local
- // struct not having a method defined when declared, since it can not be
- // added later.
- struct PrivateOpNew {
- int value = 1;
- private:
- void *operator new(size_t bytes) {
- void *ptr = std::malloc(bytes);
- if (ptr)
- return ptr;
- else
- throw std::bad_alloc{};
- }
- };
- py::class_<PrivateOpNew>(m, "PrivateOpNew").def_readonly("value", &PrivateOpNew::value);
- m.def("private_op_new_value", []() { return PrivateOpNew(); });
- m.def("private_op_new_reference", []() -> const PrivateOpNew & {
- static PrivateOpNew x{};
- return x;
- }, py::return_value_policy::reference);
-
- // test_move_fallback
- // #389: rvp::move should fall-through to copy on non-movable objects
- struct MoveIssue1 {
- int v;
- MoveIssue1(int v) : v{v} {}
- MoveIssue1(const MoveIssue1 &c) = default;
- MoveIssue1(MoveIssue1 &&) = delete;
- };
- py::class_<MoveIssue1>(m, "MoveIssue1").def(py::init<int>()).def_readwrite("value", &MoveIssue1::v);
-
- struct MoveIssue2 {
- int v;
- MoveIssue2(int v) : v{v} {}
- MoveIssue2(MoveIssue2 &&) = default;
- };
- py::class_<MoveIssue2>(m, "MoveIssue2").def(py::init<int>()).def_readwrite("value", &MoveIssue2::v);
-
- m.def("get_moveissue1", [](int i) { return new MoveIssue1(i); }, py::return_value_policy::move);
- m.def("get_moveissue2", [](int i) { return MoveIssue2(i); }, py::return_value_policy::move);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_copy_move.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_copy_move.py
deleted file mode 100644
index 7e3cc168ca054420c8eb9447ab3d8b14c2031b1c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_copy_move.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-from pybind11_tests import copy_move_policies as m
-
-
-def test_lacking_copy_ctor():
- with pytest.raises(RuntimeError) as excinfo:
- m.lacking_copy_ctor.get_one()
- assert "is non-copyable!" in str(excinfo.value)
-
-
-def test_lacking_move_ctor():
- with pytest.raises(RuntimeError) as excinfo:
- m.lacking_move_ctor.get_one()
- assert "is neither movable nor copyable!" in str(excinfo.value)
-
-
-def test_move_and_copy_casts():
- """Cast some values in C++ via custom type casters and count the number of moves/copies."""
-
- cstats = m.move_and_copy_cstats()
- c_m, c_mc, c_c = (
- cstats["MoveOnlyInt"],
- cstats["MoveOrCopyInt"],
- cstats["CopyOnlyInt"],
- )
-
- # The type move constructions/assignments below each get incremented: the move assignment comes
- # from the type_caster load; the move construction happens when extracting that via a cast or
- # loading into an argument.
- assert m.move_and_copy_casts(3) == 18
- assert c_m.copy_assignments + c_m.copy_constructions == 0
- assert c_m.move_assignments == 2
- assert c_m.move_constructions >= 2
- assert c_mc.alive() == 0
- assert c_mc.copy_assignments + c_mc.copy_constructions == 0
- assert c_mc.move_assignments == 2
- assert c_mc.move_constructions >= 2
- assert c_c.alive() == 0
- assert c_c.copy_assignments == 2
- assert c_c.copy_constructions >= 2
- assert c_m.alive() + c_mc.alive() + c_c.alive() == 0
-
-
-def test_move_and_copy_loads():
- """Call some functions that load arguments via custom type casters and count the number of
- moves/copies."""
-
- cstats = m.move_and_copy_cstats()
- c_m, c_mc, c_c = (
- cstats["MoveOnlyInt"],
- cstats["MoveOrCopyInt"],
- cstats["CopyOnlyInt"],
- )
-
- assert m.move_only(10) == 10 # 1 move, c_m
- assert m.move_or_copy(11) == 11 # 1 move, c_mc
- assert m.copy_only(12) == 12 # 1 copy, c_c
- assert m.move_pair((13, 14)) == 27 # 1 c_m move, 1 c_mc move
- assert m.move_tuple((15, 16, 17)) == 48 # 2 c_m moves, 1 c_mc move
- assert m.copy_tuple((18, 19)) == 37 # 2 c_c copies
- # Direct constructions: 2 c_m moves, 2 c_mc moves, 1 c_c copy
- # Extra moves/copies when moving pairs/tuples: 3 c_m, 3 c_mc, 2 c_c
- assert m.move_copy_nested((1, ((2, 3, (4,)), 5))) == 15
-
- assert c_m.copy_assignments + c_m.copy_constructions == 0
- assert c_m.move_assignments == 6
- assert c_m.move_constructions == 9
- assert c_mc.copy_assignments + c_mc.copy_constructions == 0
- assert c_mc.move_assignments == 5
- assert c_mc.move_constructions == 8
- assert c_c.copy_assignments == 4
- assert c_c.copy_constructions == 6
- assert c_m.alive() + c_mc.alive() + c_c.alive() == 0
-
-
-@pytest.mark.skipif(not m.has_optional, reason="no <optional>")
-def test_move_and_copy_load_optional():
- """Tests move/copy loads of std::optional arguments"""
-
- cstats = m.move_and_copy_cstats()
- c_m, c_mc, c_c = (
- cstats["MoveOnlyInt"],
- cstats["MoveOrCopyInt"],
- cstats["CopyOnlyInt"],
- )
-
- # The extra move/copy constructions below come from the std::optional move (which has to move
- # its arguments):
- assert m.move_optional(10) == 10 # c_m: 1 move assign, 2 move construct
- assert m.move_or_copy_optional(11) == 11 # c_mc: 1 move assign, 2 move construct
- assert m.copy_optional(12) == 12 # c_c: 1 copy assign, 2 copy construct
- # 1 move assign + move construct moves each of c_m, c_mc, 1 c_c copy
- # +1 move/copy construct each from moving the tuple
- # +1 move/copy construct each from moving the optional (which moves the tuple again)
- assert m.move_optional_tuple((3, 4, 5)) == 12
-
- assert c_m.copy_assignments + c_m.copy_constructions == 0
- assert c_m.move_assignments == 2
- assert c_m.move_constructions == 5
- assert c_mc.copy_assignments + c_mc.copy_constructions == 0
- assert c_mc.move_assignments == 2
- assert c_mc.move_constructions == 5
- assert c_c.copy_assignments == 2
- assert c_c.copy_constructions == 5
- assert c_m.alive() + c_mc.alive() + c_c.alive() == 0
-
-
-def test_private_op_new():
- """An object with a private `operator new` cannot be returned by value"""
-
- with pytest.raises(RuntimeError) as excinfo:
- m.private_op_new_value()
- assert "is neither movable nor copyable" in str(excinfo.value)
-
- assert m.private_op_new_reference().value == 1
-
-
-def test_move_fallback():
- """#389: rvp::move should fall-through to copy on non-movable objects"""
-
- m2 = m.get_moveissue2(2)
- assert m2.value == 2
- m1 = m.get_moveissue1(1)
- assert m1.value == 1
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_custom_type_casters.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_custom_type_casters.cpp
deleted file mode 100644
index d565add264447f51624b6cc662719f1ba21cf56c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_custom_type_casters.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- tests/test_custom_type_casters.cpp -- tests type_caster<T>
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-
-
-// py::arg/py::arg_v testing: these arguments just record their argument when invoked
-class ArgInspector1 { public: std::string arg = "(default arg inspector 1)"; };
-class ArgInspector2 { public: std::string arg = "(default arg inspector 2)"; };
-class ArgAlwaysConverts { };
-namespace pybind11 { namespace detail {
-template <> struct type_caster<ArgInspector1> {
-public:
- PYBIND11_TYPE_CASTER(ArgInspector1, _("ArgInspector1"));
-
- bool load(handle src, bool convert) {
- value.arg = "loading ArgInspector1 argument " +
- std::string(convert ? "WITH" : "WITHOUT") + " conversion allowed. "
- "Argument value = " + (std::string) str(src);
- return true;
- }
-
- static handle cast(const ArgInspector1 &src, return_value_policy, handle) {
- return str(src.arg).release();
- }
-};
-template <> struct type_caster<ArgInspector2> {
-public:
- PYBIND11_TYPE_CASTER(ArgInspector2, _("ArgInspector2"));
-
- bool load(handle src, bool convert) {
- value.arg = "loading ArgInspector2 argument " +
- std::string(convert ? "WITH" : "WITHOUT") + " conversion allowed. "
- "Argument value = " + (std::string) str(src);
- return true;
- }
-
- static handle cast(const ArgInspector2 &src, return_value_policy, handle) {
- return str(src.arg).release();
- }
-};
-template <> struct type_caster<ArgAlwaysConverts> {
-public:
- PYBIND11_TYPE_CASTER(ArgAlwaysConverts, _("ArgAlwaysConverts"));
-
- bool load(handle, bool convert) {
- return convert;
- }
-
- static handle cast(const ArgAlwaysConverts &, return_value_policy, handle) {
- return py::none().release();
- }
-};
-} // namespace detail
-} // namespace pybind11
-
-// test_custom_caster_destruction
-class DestructionTester {
-public:
- DestructionTester() { print_default_created(this); }
- ~DestructionTester() { print_destroyed(this); }
- DestructionTester(const DestructionTester &) { print_copy_created(this); }
- DestructionTester(DestructionTester &&) { print_move_created(this); }
- DestructionTester &operator=(const DestructionTester &) { print_copy_assigned(this); return *this; }
- DestructionTester &operator=(DestructionTester &&) { print_move_assigned(this); return *this; }
-};
-namespace pybind11 { namespace detail {
-template <> struct type_caster<DestructionTester> {
- PYBIND11_TYPE_CASTER(DestructionTester, _("DestructionTester"));
- bool load(handle, bool) { return true; }
-
- static handle cast(const DestructionTester &, return_value_policy, handle) {
- return py::bool_(true).release();
- }
-};
-} // namespace detail
-} // namespace pybind11
-
-TEST_SUBMODULE(custom_type_casters, m) {
- // test_custom_type_casters
-
- // test_noconvert_args
- //
- // Test converting. The ArgAlwaysConverts is just there to make the first no-conversion pass
- // fail so that our call always ends up happening via the second dispatch (the one that allows
- // some conversion).
- class ArgInspector {
- public:
- ArgInspector1 f(ArgInspector1 a, ArgAlwaysConverts) { return a; }
- std::string g(ArgInspector1 a, const ArgInspector1 &b, int c, ArgInspector2 *d, ArgAlwaysConverts) {
- return a.arg + "\n" + b.arg + "\n" + std::to_string(c) + "\n" + d->arg;
- }
- static ArgInspector2 h(ArgInspector2 a, ArgAlwaysConverts) { return a; }
- };
- py::class_<ArgInspector>(m, "ArgInspector")
- .def(py::init<>())
- .def("f", &ArgInspector::f, py::arg(), py::arg() = ArgAlwaysConverts())
- .def("g", &ArgInspector::g, "a"_a.noconvert(), "b"_a, "c"_a.noconvert()=13, "d"_a=ArgInspector2(), py::arg() = ArgAlwaysConverts())
- .def_static("h", &ArgInspector::h, py::arg().noconvert(), py::arg() = ArgAlwaysConverts())
- ;
- m.def("arg_inspect_func", [](ArgInspector2 a, ArgInspector1 b, ArgAlwaysConverts) { return a.arg + "\n" + b.arg; },
- py::arg().noconvert(false), py::arg_v(nullptr, ArgInspector1()).noconvert(true), py::arg() = ArgAlwaysConverts());
-
- m.def("floats_preferred", [](double f) { return 0.5 * f; }, py::arg("f"));
- m.def("floats_only", [](double f) { return 0.5 * f; }, py::arg("f").noconvert());
- m.def("ints_preferred", [](int i) { return i / 2; }, py::arg("i"));
- m.def("ints_only", [](int i) { return i / 2; }, py::arg("i").noconvert());
-
- // test_custom_caster_destruction
- // Test that `take_ownership` works on types with a custom type caster when given a pointer
-
- // default policy: don't take ownership:
- m.def("custom_caster_no_destroy", []() { static auto *dt = new DestructionTester(); return dt; });
-
- m.def("custom_caster_destroy", []() { return new DestructionTester(); },
- py::return_value_policy::take_ownership); // Takes ownership: destroy when finished
- m.def("custom_caster_destroy_const", []() -> const DestructionTester * { return new DestructionTester(); },
- py::return_value_policy::take_ownership); // Likewise (const doesn't inhibit destruction)
- m.def("destruction_tester_cstats", &ConstructorStats::get<DestructionTester>, py::return_value_policy::reference);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_custom_type_casters.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_custom_type_casters.py
deleted file mode 100644
index bb74d54eb3f0ce118e0c10f8443a8478d553e2bb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_custom_type_casters.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-from pybind11_tests import custom_type_casters as m
-
-
-def test_noconvert_args(msg):
- a = m.ArgInspector()
- assert (
- msg(a.f("hi"))
- == """
- loading ArgInspector1 argument WITH conversion allowed. Argument value = hi
- """
- )
- assert (
- msg(a.g("this is a", "this is b"))
- == """
- loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = this is a
- loading ArgInspector1 argument WITH conversion allowed. Argument value = this is b
- 13
- loading ArgInspector2 argument WITH conversion allowed. Argument value = (default arg inspector 2)
- """ # noqa: E501 line too long
- )
- assert (
- msg(a.g("this is a", "this is b", 42))
- == """
- loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = this is a
- loading ArgInspector1 argument WITH conversion allowed. Argument value = this is b
- 42
- loading ArgInspector2 argument WITH conversion allowed. Argument value = (default arg inspector 2)
- """ # noqa: E501 line too long
- )
- assert (
- msg(a.g("this is a", "this is b", 42, "this is d"))
- == """
- loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = this is a
- loading ArgInspector1 argument WITH conversion allowed. Argument value = this is b
- 42
- loading ArgInspector2 argument WITH conversion allowed. Argument value = this is d
- """
- )
- assert (
- a.h("arg 1")
- == "loading ArgInspector2 argument WITHOUT conversion allowed. Argument value = arg 1"
- )
- assert (
- msg(m.arg_inspect_func("A1", "A2"))
- == """
- loading ArgInspector2 argument WITH conversion allowed. Argument value = A1
- loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = A2
- """
- )
-
- assert m.floats_preferred(4) == 2.0
- assert m.floats_only(4.0) == 2.0
- with pytest.raises(TypeError) as excinfo:
- m.floats_only(4)
- assert (
- msg(excinfo.value)
- == """
- floats_only(): incompatible function arguments. The following argument types are supported:
- 1. (f: float) -> float
-
- Invoked with: 4
- """
- )
-
- assert m.ints_preferred(4) == 2
- assert m.ints_preferred(True) == 0
- with pytest.raises(TypeError) as excinfo:
- m.ints_preferred(4.0)
- assert (
- msg(excinfo.value)
- == """
- ints_preferred(): incompatible function arguments. The following argument types are supported:
- 1. (i: int) -> int
-
- Invoked with: 4.0
- """ # noqa: E501 line too long
- )
-
- assert m.ints_only(4) == 2
- with pytest.raises(TypeError) as excinfo:
- m.ints_only(4.0)
- assert (
- msg(excinfo.value)
- == """
- ints_only(): incompatible function arguments. The following argument types are supported:
- 1. (i: int) -> int
-
- Invoked with: 4.0
- """
- )
-
-
-def test_custom_caster_destruction():
- """Tests that returning a pointer to a type that gets converted with a custom type caster gets
- destroyed when the function has py::return_value_policy::take_ownership policy applied."""
-
- cstats = m.destruction_tester_cstats()
- # This one *doesn't* have take_ownership: the pointer should be used but not destroyed:
- z = m.custom_caster_no_destroy()
- assert cstats.alive() == 1 and cstats.default_constructions == 1
- assert z
-
- # take_ownership applied: this constructs a new object, casts it, then destroys it:
- z = m.custom_caster_destroy()
- assert z
- assert cstats.default_constructions == 2
-
- # Same, but with a const pointer return (which should *not* inhibit destruction):
- z = m.custom_caster_destroy_const()
- assert z
- assert cstats.default_constructions == 3
-
- # Make sure we still only have the original object (from ..._no_destroy()) alive:
- assert cstats.alive() == 1
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_docstring_options.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_docstring_options.cpp
deleted file mode 100644
index 8c8f79fd5f6308caab1ee2d22525af2a408eca07..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_docstring_options.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- tests/test_docstring_options.cpp -- generation of docstrings and signatures
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-TEST_SUBMODULE(docstring_options, m) {
- // test_docstring_options
- {
- py::options options;
- options.disable_function_signatures();
-
- m.def("test_function1", [](int, int) {}, py::arg("a"), py::arg("b"));
- m.def("test_function2", [](int, int) {}, py::arg("a"), py::arg("b"), "A custom docstring");
-
- m.def("test_overloaded1", [](int) {}, py::arg("i"), "Overload docstring");
- m.def("test_overloaded1", [](double) {}, py::arg("d"));
-
- m.def("test_overloaded2", [](int) {}, py::arg("i"), "overload docstring 1");
- m.def("test_overloaded2", [](double) {}, py::arg("d"), "overload docstring 2");
-
- m.def("test_overloaded3", [](int) {}, py::arg("i"));
- m.def("test_overloaded3", [](double) {}, py::arg("d"), "Overload docstr");
-
- options.enable_function_signatures();
-
- m.def("test_function3", [](int, int) {}, py::arg("a"), py::arg("b"));
- m.def("test_function4", [](int, int) {}, py::arg("a"), py::arg("b"), "A custom docstring");
-
- options.disable_function_signatures().disable_user_defined_docstrings();
-
- m.def("test_function5", [](int, int) {}, py::arg("a"), py::arg("b"), "A custom docstring");
-
- {
- py::options nested_options;
- nested_options.enable_user_defined_docstrings();
- m.def("test_function6", [](int, int) {}, py::arg("a"), py::arg("b"), "A custom docstring");
- }
- }
-
- m.def("test_function7", [](int, int) {}, py::arg("a"), py::arg("b"), "A custom docstring");
-
- {
- py::options options;
- options.disable_user_defined_docstrings();
-
- struct DocstringTestFoo {
- int value;
- void setValue(int v) { value = v; }
- int getValue() const { return value; }
- };
- py::class_<DocstringTestFoo>(m, "DocstringTestFoo", "This is a class docstring")
- .def_property("value_prop", &DocstringTestFoo::getValue, &DocstringTestFoo::setValue, "This is a property docstring")
- ;
- }
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_docstring_options.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_docstring_options.py
deleted file mode 100644
index 87d80d2df6269b86f7093a809a98a02a2c16ecc5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_docstring_options.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-from pybind11_tests import docstring_options as m
-
-
-def test_docstring_options():
- # options.disable_function_signatures()
- assert not m.test_function1.__doc__
-
- assert m.test_function2.__doc__ == "A custom docstring"
-
- # docstring specified on just the first overload definition:
- assert m.test_overloaded1.__doc__ == "Overload docstring"
-
- # docstring on both overloads:
- assert m.test_overloaded2.__doc__ == "overload docstring 1\noverload docstring 2"
-
- # docstring on only second overload:
- assert m.test_overloaded3.__doc__ == "Overload docstr"
-
- # options.enable_function_signatures()
- assert m.test_function3.__doc__.startswith("test_function3(a: int, b: int) -> None")
-
- assert m.test_function4.__doc__.startswith("test_function4(a: int, b: int) -> None")
- assert m.test_function4.__doc__.endswith("A custom docstring\n")
-
- # options.disable_function_signatures()
- # options.disable_user_defined_docstrings()
- assert not m.test_function5.__doc__
-
- # nested options.enable_user_defined_docstrings()
- assert m.test_function6.__doc__ == "A custom docstring"
-
- # RAII destructor
- assert m.test_function7.__doc__.startswith("test_function7(a: int, b: int) -> None")
- assert m.test_function7.__doc__.endswith("A custom docstring\n")
-
- # Suppression of user-defined docstrings for non-function objects
- assert not m.DocstringTestFoo.__doc__
- assert not m.DocstringTestFoo.value_prop.__doc__
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eigen.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_eigen.cpp
deleted file mode 100644
index 807d0a311a1a3a5534441950c52235ebe7248064..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eigen.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- tests/eigen.cpp -- automatic conversion of Eigen types
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <pybind11/eigen.h>
-#include <pybind11/stl.h>
-
-#if defined(_MSC_VER)
-# pragma warning(disable: 4996) // C4996: std::unary_negation is deprecated
-#endif
-
-#include <Eigen/Cholesky>
-
-using MatrixXdR = Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>;
-
-
-
-// Sets/resets a testing reference matrix to have values of 10*r + c, where r and c are the
-// (1-based) row/column number.
-template <typename M> void reset_ref(M &x) {
- for (int i = 0; i < x.rows(); i++) for (int j = 0; j < x.cols(); j++)
- x(i, j) = 11 + 10*i + j;
-}
-
-// Returns a static, column-major matrix
-Eigen::MatrixXd &get_cm() {
- static Eigen::MatrixXd *x;
- if (!x) {
- x = new Eigen::MatrixXd(3, 3);
- reset_ref(*x);
- }
- return *x;
-}
-// Likewise, but row-major
-MatrixXdR &get_rm() {
- static MatrixXdR *x;
- if (!x) {
- x = new MatrixXdR(3, 3);
- reset_ref(*x);
- }
- return *x;
-}
-// Resets the values of the static matrices returned by get_cm()/get_rm()
-void reset_refs() {
- reset_ref(get_cm());
- reset_ref(get_rm());
-}
-
-// Returns element 2,1 from a matrix (used to test copy/nocopy)
-double get_elem(Eigen::Ref<const Eigen::MatrixXd> m) { return m(2, 1); };
-
-
-// Returns a matrix with 10*r + 100*c added to each matrix element (to help test that the matrix
-// reference is referencing rows/columns correctly).
-template <typename MatrixArgType> Eigen::MatrixXd adjust_matrix(MatrixArgType m) {
- Eigen::MatrixXd ret(m);
- for (int c = 0; c < m.cols(); c++) for (int r = 0; r < m.rows(); r++)
- ret(r, c) += 10*r + 100*c;
- return ret;
-}
-
-struct CustomOperatorNew {
- CustomOperatorNew() = default;
-
- Eigen::Matrix4d a = Eigen::Matrix4d::Zero();
- Eigen::Matrix4d b = Eigen::Matrix4d::Identity();
-
- EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
-};
-
-TEST_SUBMODULE(eigen, m) {
- using FixedMatrixR = Eigen::Matrix<float, 5, 6, Eigen::RowMajor>;
- using FixedMatrixC = Eigen::Matrix<float, 5, 6>;
- using DenseMatrixR = Eigen::Matrix<float, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>;
- using DenseMatrixC = Eigen::Matrix<float, Eigen::Dynamic, Eigen::Dynamic>;
- using FourRowMatrixC = Eigen::Matrix<float, 4, Eigen::Dynamic>;
- using FourColMatrixC = Eigen::Matrix<float, Eigen::Dynamic, 4>;
- using FourRowMatrixR = Eigen::Matrix<float, 4, Eigen::Dynamic>;
- using FourColMatrixR = Eigen::Matrix<float, Eigen::Dynamic, 4>;
- using SparseMatrixR = Eigen::SparseMatrix<float, Eigen::RowMajor>;
- using SparseMatrixC = Eigen::SparseMatrix<float>;
-
- // various tests
- m.def("double_col", [](const Eigen::VectorXf &x) -> Eigen::VectorXf { return 2.0f * x; });
- m.def("double_row", [](const Eigen::RowVectorXf &x) -> Eigen::RowVectorXf { return 2.0f * x; });
- m.def("double_complex", [](const Eigen::VectorXcf &x) -> Eigen::VectorXcf { return 2.0f * x; });
- m.def("double_threec", [](py::EigenDRef<Eigen::Vector3f> x) { x *= 2; });
- m.def("double_threer", [](py::EigenDRef<Eigen::RowVector3f> x) { x *= 2; });
- m.def("double_mat_cm", [](Eigen::MatrixXf x) -> Eigen::MatrixXf { return 2.0f * x; });
- m.def("double_mat_rm", [](DenseMatrixR x) -> DenseMatrixR { return 2.0f * x; });
-
- // test_eigen_ref_to_python
- // Different ways of passing via Eigen::Ref; the first and second are the Eigen-recommended
- m.def("cholesky1", [](Eigen::Ref<MatrixXdR> x) -> Eigen::MatrixXd { return x.llt().matrixL(); });
- m.def("cholesky2", [](const Eigen::Ref<const MatrixXdR> &x) -> Eigen::MatrixXd { return x.llt().matrixL(); });
- m.def("cholesky3", [](const Eigen::Ref<MatrixXdR> &x) -> Eigen::MatrixXd { return x.llt().matrixL(); });
- m.def("cholesky4", [](Eigen::Ref<const MatrixXdR> x) -> Eigen::MatrixXd { return x.llt().matrixL(); });
-
- // test_eigen_ref_mutators
- // Mutators: these add some value to the given element using Eigen, but Eigen should be mapping into
- // the numpy array data and so the result should show up there. There are three versions: one that
- // works on a contiguous-row matrix (numpy's default), one for a contiguous-column matrix, and one
- // for any matrix.
- auto add_rm = [](Eigen::Ref<MatrixXdR> x, int r, int c, double v) { x(r,c) += v; };
- auto add_cm = [](Eigen::Ref<Eigen::MatrixXd> x, int r, int c, double v) { x(r,c) += v; };
-
- // Mutators (Eigen maps into numpy variables):
- m.def("add_rm", add_rm); // Only takes row-contiguous
- m.def("add_cm", add_cm); // Only takes column-contiguous
- // Overloaded versions that will accept either row or column contiguous:
- m.def("add1", add_rm);
- m.def("add1", add_cm);
- m.def("add2", add_cm);
- m.def("add2", add_rm);
- // This one accepts a matrix of any stride:
- m.def("add_any", [](py::EigenDRef<Eigen::MatrixXd> x, int r, int c, double v) { x(r,c) += v; });
-
- // Return mutable references (numpy maps into eigen variables)
- m.def("get_cm_ref", []() { return Eigen::Ref<Eigen::MatrixXd>(get_cm()); });
- m.def("get_rm_ref", []() { return Eigen::Ref<MatrixXdR>(get_rm()); });
- // The same references, but non-mutable (numpy maps into eigen variables, but is !writeable)
- m.def("get_cm_const_ref", []() { return Eigen::Ref<const Eigen::MatrixXd>(get_cm()); });
- m.def("get_rm_const_ref", []() { return Eigen::Ref<const MatrixXdR>(get_rm()); });
-
- m.def("reset_refs", reset_refs); // Restores get_{cm,rm}_ref to original values
-
- // Increments and returns ref to (same) matrix
- m.def("incr_matrix", [](Eigen::Ref<Eigen::MatrixXd> m, double v) {
- m += Eigen::MatrixXd::Constant(m.rows(), m.cols(), v);
- return m;
- }, py::return_value_policy::reference);
-
- // Same, but accepts a matrix of any strides
- m.def("incr_matrix_any", [](py::EigenDRef<Eigen::MatrixXd> m, double v) {
- m += Eigen::MatrixXd::Constant(m.rows(), m.cols(), v);
- return m;
- }, py::return_value_policy::reference);
-
- // Returns an eigen slice of even rows
- m.def("even_rows", [](py::EigenDRef<Eigen::MatrixXd> m) {
- return py::EigenDMap<Eigen::MatrixXd>(
- m.data(), (m.rows() + 1) / 2, m.cols(),
- py::EigenDStride(m.outerStride(), 2 * m.innerStride()));
- }, py::return_value_policy::reference);
-
- // Returns an eigen slice of even columns
- m.def("even_cols", [](py::EigenDRef<Eigen::MatrixXd> m) {
- return py::EigenDMap<Eigen::MatrixXd>(
- m.data(), m.rows(), (m.cols() + 1) / 2,
- py::EigenDStride(2 * m.outerStride(), m.innerStride()));
- }, py::return_value_policy::reference);
-
- // Returns diagonals: a vector-like object with an inner stride != 1
- m.def("diagonal", [](const Eigen::Ref<const Eigen::MatrixXd> &x) { return x.diagonal(); });
- m.def("diagonal_1", [](const Eigen::Ref<const Eigen::MatrixXd> &x) { return x.diagonal<1>(); });
- m.def("diagonal_n", [](const Eigen::Ref<const Eigen::MatrixXd> &x, int index) { return x.diagonal(index); });
-
- // Return a block of a matrix (gives non-standard strides)
- m.def("block", [](const Eigen::Ref<const Eigen::MatrixXd> &x, int start_row, int start_col, int block_rows, int block_cols) {
- return x.block(start_row, start_col, block_rows, block_cols);
- });
-
- // test_eigen_return_references, test_eigen_keepalive
- // return value referencing/copying tests:
- class ReturnTester {
- Eigen::MatrixXd mat = create();
- public:
- ReturnTester() { print_created(this); }
- ~ReturnTester() { print_destroyed(this); }
- static Eigen::MatrixXd create() { return Eigen::MatrixXd::Ones(10, 10); }
- static const Eigen::MatrixXd createConst() { return Eigen::MatrixXd::Ones(10, 10); }
- Eigen::MatrixXd &get() { return mat; }
- Eigen::MatrixXd *getPtr() { return &mat; }
- const Eigen::MatrixXd &view() { return mat; }
- const Eigen::MatrixXd *viewPtr() { return &mat; }
- Eigen::Ref<Eigen::MatrixXd> ref() { return mat; }
- Eigen::Ref<const Eigen::MatrixXd> refConst() { return mat; }
- Eigen::Block<Eigen::MatrixXd> block(int r, int c, int nrow, int ncol) { return mat.block(r, c, nrow, ncol); }
- Eigen::Block<const Eigen::MatrixXd> blockConst(int r, int c, int nrow, int ncol) const { return mat.block(r, c, nrow, ncol); }
- py::EigenDMap<Eigen::Matrix2d> corners() { return py::EigenDMap<Eigen::Matrix2d>(mat.data(),
- py::EigenDStride(mat.outerStride() * (mat.outerSize()-1), mat.innerStride() * (mat.innerSize()-1))); }
- py::EigenDMap<const Eigen::Matrix2d> cornersConst() const { return py::EigenDMap<const Eigen::Matrix2d>(mat.data(),
- py::EigenDStride(mat.outerStride() * (mat.outerSize()-1), mat.innerStride() * (mat.innerSize()-1))); }
- };
- using rvp = py::return_value_policy;
- py::class_<ReturnTester>(m, "ReturnTester")
- .def(py::init<>())
- .def_static("create", &ReturnTester::create)
- .def_static("create_const", &ReturnTester::createConst)
- .def("get", &ReturnTester::get, rvp::reference_internal)
- .def("get_ptr", &ReturnTester::getPtr, rvp::reference_internal)
- .def("view", &ReturnTester::view, rvp::reference_internal)
- .def("view_ptr", &ReturnTester::view, rvp::reference_internal)
- .def("copy_get", &ReturnTester::get) // Default rvp: copy
- .def("copy_view", &ReturnTester::view) // "
- .def("ref", &ReturnTester::ref) // Default for Ref is to reference
- .def("ref_const", &ReturnTester::refConst) // Likewise, but const
- .def("ref_safe", &ReturnTester::ref, rvp::reference_internal)
- .def("ref_const_safe", &ReturnTester::refConst, rvp::reference_internal)
- .def("copy_ref", &ReturnTester::ref, rvp::copy)
- .def("copy_ref_const", &ReturnTester::refConst, rvp::copy)
- .def("block", &ReturnTester::block)
- .def("block_safe", &ReturnTester::block, rvp::reference_internal)
- .def("block_const", &ReturnTester::blockConst, rvp::reference_internal)
- .def("copy_block", &ReturnTester::block, rvp::copy)
- .def("corners", &ReturnTester::corners, rvp::reference_internal)
- .def("corners_const", &ReturnTester::cornersConst, rvp::reference_internal)
- ;
-
- // test_special_matrix_objects
- // Returns a DiagonalMatrix with diagonal (1,2,3,...)
- m.def("incr_diag", [](int k) {
- Eigen::DiagonalMatrix<int, Eigen::Dynamic> m(k);
- for (int i = 0; i < k; i++) m.diagonal()[i] = i+1;
- return m;
- });
-
- // Returns a SelfAdjointView referencing the lower triangle of m
- m.def("symmetric_lower", [](const Eigen::MatrixXi &m) {
- return m.selfadjointView<Eigen::Lower>();
- });
- // Returns a SelfAdjointView referencing the lower triangle of m
- m.def("symmetric_upper", [](const Eigen::MatrixXi &m) {
- return m.selfadjointView<Eigen::Upper>();
- });
-
- // Test matrix for various functions below.
- Eigen::MatrixXf mat(5, 6);
- mat << 0, 3, 0, 0, 0, 11,
- 22, 0, 0, 0, 17, 11,
- 7, 5, 0, 1, 0, 11,
- 0, 0, 0, 0, 0, 11,
- 0, 0, 14, 0, 8, 11;
-
- // test_fixed, and various other tests
- m.def("fixed_r", [mat]() -> FixedMatrixR { return FixedMatrixR(mat); });
- m.def("fixed_r_const", [mat]() -> const FixedMatrixR { return FixedMatrixR(mat); });
- m.def("fixed_c", [mat]() -> FixedMatrixC { return FixedMatrixC(mat); });
- m.def("fixed_copy_r", [](const FixedMatrixR &m) -> FixedMatrixR { return m; });
- m.def("fixed_copy_c", [](const FixedMatrixC &m) -> FixedMatrixC { return m; });
- // test_mutator_descriptors
- m.def("fixed_mutator_r", [](Eigen::Ref<FixedMatrixR>) {});
- m.def("fixed_mutator_c", [](Eigen::Ref<FixedMatrixC>) {});
- m.def("fixed_mutator_a", [](py::EigenDRef<FixedMatrixC>) {});
- // test_dense
- m.def("dense_r", [mat]() -> DenseMatrixR { return DenseMatrixR(mat); });
- m.def("dense_c", [mat]() -> DenseMatrixC { return DenseMatrixC(mat); });
- m.def("dense_copy_r", [](const DenseMatrixR &m) -> DenseMatrixR { return m; });
- m.def("dense_copy_c", [](const DenseMatrixC &m) -> DenseMatrixC { return m; });
- // test_sparse, test_sparse_signature
- m.def("sparse_r", [mat]() -> SparseMatrixR { return Eigen::SparseView<Eigen::MatrixXf>(mat); });
- m.def("sparse_c", [mat]() -> SparseMatrixC { return Eigen::SparseView<Eigen::MatrixXf>(mat); });
- m.def("sparse_copy_r", [](const SparseMatrixR &m) -> SparseMatrixR { return m; });
- m.def("sparse_copy_c", [](const SparseMatrixC &m) -> SparseMatrixC { return m; });
- // test_partially_fixed
- m.def("partial_copy_four_rm_r", [](const FourRowMatrixR &m) -> FourRowMatrixR { return m; });
- m.def("partial_copy_four_rm_c", [](const FourColMatrixR &m) -> FourColMatrixR { return m; });
- m.def("partial_copy_four_cm_r", [](const FourRowMatrixC &m) -> FourRowMatrixC { return m; });
- m.def("partial_copy_four_cm_c", [](const FourColMatrixC &m) -> FourColMatrixC { return m; });
-
- // test_cpp_casting
- // Test that we can cast a numpy object to a Eigen::MatrixXd explicitly
- m.def("cpp_copy", [](py::handle m) { return m.cast<Eigen::MatrixXd>()(1, 0); });
- m.def("cpp_ref_c", [](py::handle m) { return m.cast<Eigen::Ref<Eigen::MatrixXd>>()(1, 0); });
- m.def("cpp_ref_r", [](py::handle m) { return m.cast<Eigen::Ref<MatrixXdR>>()(1, 0); });
- m.def("cpp_ref_any", [](py::handle m) { return m.cast<py::EigenDRef<Eigen::MatrixXd>>()(1, 0); });
-
-
- // test_nocopy_wrapper
- // Test that we can prevent copying into an argument that would normally copy: First a version
- // that would allow copying (if types or strides don't match) for comparison:
- m.def("get_elem", &get_elem);
- // Now this alternative that calls the tells pybind to fail rather than copy:
- m.def("get_elem_nocopy", [](Eigen::Ref<const Eigen::MatrixXd> m) -> double { return get_elem(m); },
- py::arg().noconvert());
- // Also test a row-major-only no-copy const ref:
- m.def("get_elem_rm_nocopy", [](Eigen::Ref<const Eigen::Matrix<long, -1, -1, Eigen::RowMajor>> &m) -> long { return m(2, 1); },
- py::arg().noconvert());
-
- // test_issue738
- // Issue #738: 1xN or Nx1 2D matrices were neither accepted nor properly copied with an
- // incompatible stride value on the length-1 dimension--but that should be allowed (without
- // requiring a copy!) because the stride value can be safely ignored on a size-1 dimension.
- m.def("iss738_f1", &adjust_matrix<const Eigen::Ref<const Eigen::MatrixXd> &>, py::arg().noconvert());
- m.def("iss738_f2", &adjust_matrix<const Eigen::Ref<const Eigen::Matrix<double, -1, -1, Eigen::RowMajor>> &>, py::arg().noconvert());
-
- // test_issue1105
- // Issue #1105: when converting from a numpy two-dimensional (Nx1) or (1xN) value into a dense
- // eigen Vector or RowVector, the argument would fail to load because the numpy copy would fail:
- // numpy won't broadcast a Nx1 into a 1-dimensional vector.
- m.def("iss1105_col", [](Eigen::VectorXd) { return true; });
- m.def("iss1105_row", [](Eigen::RowVectorXd) { return true; });
-
- // test_named_arguments
- // Make sure named arguments are working properly:
- m.def("matrix_multiply", [](const py::EigenDRef<const Eigen::MatrixXd> A, const py::EigenDRef<const Eigen::MatrixXd> B)
- -> Eigen::MatrixXd {
- if (A.cols() != B.rows()) throw std::domain_error("Nonconformable matrices!");
- return A * B;
- }, py::arg("A"), py::arg("B"));
-
- // test_custom_operator_new
- py::class_<CustomOperatorNew>(m, "CustomOperatorNew")
- .def(py::init<>())
- .def_readonly("a", &CustomOperatorNew::a)
- .def_readonly("b", &CustomOperatorNew::b);
-
- // test_eigen_ref_life_support
- // In case of a failure (the caster's temp array does not live long enough), creating
- // a new array (np.ones(10)) increases the chances that the temp array will be garbage
- // collected and/or that its memory will be overridden with different values.
- m.def("get_elem_direct", [](Eigen::Ref<const Eigen::VectorXd> v) {
- py::module_::import("numpy").attr("ones")(10);
- return v(5);
- });
- m.def("get_elem_indirect", [](std::vector<Eigen::Ref<const Eigen::VectorXd>> v) {
- py::module_::import("numpy").attr("ones")(10);
- return v[0](5);
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eigen.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_eigen.py
deleted file mode 100644
index a131dc15d682c0704af61bc9e24789d197b495de..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eigen.py
+++ /dev/null
@@ -1,770 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-from pybind11_tests import ConstructorStats
-
-np = pytest.importorskip("numpy")
-m = pytest.importorskip("pybind11_tests.eigen")
-
-
-ref = np.array(
- [
- [0.0, 3, 0, 0, 0, 11],
- [22, 0, 0, 0, 17, 11],
- [7, 5, 0, 1, 0, 11],
- [0, 0, 0, 0, 0, 11],
- [0, 0, 14, 0, 8, 11],
- ]
-)
-
-
-def assert_equal_ref(mat):
- np.testing.assert_array_equal(mat, ref)
-
-
-def assert_sparse_equal_ref(sparse_mat):
- assert_equal_ref(sparse_mat.toarray())
-
-
-def test_fixed():
- assert_equal_ref(m.fixed_c())
- assert_equal_ref(m.fixed_r())
- assert_equal_ref(m.fixed_copy_r(m.fixed_r()))
- assert_equal_ref(m.fixed_copy_c(m.fixed_c()))
- assert_equal_ref(m.fixed_copy_r(m.fixed_c()))
- assert_equal_ref(m.fixed_copy_c(m.fixed_r()))
-
-
-def test_dense():
- assert_equal_ref(m.dense_r())
- assert_equal_ref(m.dense_c())
- assert_equal_ref(m.dense_copy_r(m.dense_r()))
- assert_equal_ref(m.dense_copy_c(m.dense_c()))
- assert_equal_ref(m.dense_copy_r(m.dense_c()))
- assert_equal_ref(m.dense_copy_c(m.dense_r()))
-
-
-def test_partially_fixed():
- ref2 = np.array([[0.0, 1, 2, 3], [4, 5, 6, 7], [8, 9, 10, 11], [12, 13, 14, 15]])
- np.testing.assert_array_equal(m.partial_copy_four_rm_r(ref2), ref2)
- np.testing.assert_array_equal(m.partial_copy_four_rm_c(ref2), ref2)
- np.testing.assert_array_equal(m.partial_copy_four_rm_r(ref2[:, 1]), ref2[:, [1]])
- np.testing.assert_array_equal(m.partial_copy_four_rm_c(ref2[0, :]), ref2[[0], :])
- np.testing.assert_array_equal(
- m.partial_copy_four_rm_r(ref2[:, (0, 2)]), ref2[:, (0, 2)]
- )
- np.testing.assert_array_equal(
- m.partial_copy_four_rm_c(ref2[(3, 1, 2), :]), ref2[(3, 1, 2), :]
- )
-
- np.testing.assert_array_equal(m.partial_copy_four_cm_r(ref2), ref2)
- np.testing.assert_array_equal(m.partial_copy_four_cm_c(ref2), ref2)
- np.testing.assert_array_equal(m.partial_copy_four_cm_r(ref2[:, 1]), ref2[:, [1]])
- np.testing.assert_array_equal(m.partial_copy_four_cm_c(ref2[0, :]), ref2[[0], :])
- np.testing.assert_array_equal(
- m.partial_copy_four_cm_r(ref2[:, (0, 2)]), ref2[:, (0, 2)]
- )
- np.testing.assert_array_equal(
- m.partial_copy_four_cm_c(ref2[(3, 1, 2), :]), ref2[(3, 1, 2), :]
- )
-
- # TypeError should be raise for a shape mismatch
- functions = [
- m.partial_copy_four_rm_r,
- m.partial_copy_four_rm_c,
- m.partial_copy_four_cm_r,
- m.partial_copy_four_cm_c,
- ]
- matrix_with_wrong_shape = [[1, 2], [3, 4]]
- for f in functions:
- with pytest.raises(TypeError) as excinfo:
- f(matrix_with_wrong_shape)
- assert "incompatible function arguments" in str(excinfo.value)
-
-
-def test_mutator_descriptors():
- zr = np.arange(30, dtype="float32").reshape(5, 6) # row-major
- zc = zr.reshape(6, 5).transpose() # column-major
-
- m.fixed_mutator_r(zr)
- m.fixed_mutator_c(zc)
- m.fixed_mutator_a(zr)
- m.fixed_mutator_a(zc)
- with pytest.raises(TypeError) as excinfo:
- m.fixed_mutator_r(zc)
- assert (
- "(arg0: numpy.ndarray[numpy.float32[5, 6],"
- " flags.writeable, flags.c_contiguous]) -> None" in str(excinfo.value)
- )
- with pytest.raises(TypeError) as excinfo:
- m.fixed_mutator_c(zr)
- assert (
- "(arg0: numpy.ndarray[numpy.float32[5, 6],"
- " flags.writeable, flags.f_contiguous]) -> None" in str(excinfo.value)
- )
- with pytest.raises(TypeError) as excinfo:
- m.fixed_mutator_a(np.array([[1, 2], [3, 4]], dtype="float32"))
- assert "(arg0: numpy.ndarray[numpy.float32[5, 6], flags.writeable]) -> None" in str(
- excinfo.value
- )
- zr.flags.writeable = False
- with pytest.raises(TypeError):
- m.fixed_mutator_r(zr)
- with pytest.raises(TypeError):
- m.fixed_mutator_a(zr)
-
-
-def test_cpp_casting():
- assert m.cpp_copy(m.fixed_r()) == 22.0
- assert m.cpp_copy(m.fixed_c()) == 22.0
- z = np.array([[5.0, 6], [7, 8]])
- assert m.cpp_copy(z) == 7.0
- assert m.cpp_copy(m.get_cm_ref()) == 21.0
- assert m.cpp_copy(m.get_rm_ref()) == 21.0
- assert m.cpp_ref_c(m.get_cm_ref()) == 21.0
- assert m.cpp_ref_r(m.get_rm_ref()) == 21.0
- with pytest.raises(RuntimeError) as excinfo:
- # Can't reference m.fixed_c: it contains floats, m.cpp_ref_any wants doubles
- m.cpp_ref_any(m.fixed_c())
- assert "Unable to cast Python instance" in str(excinfo.value)
- with pytest.raises(RuntimeError) as excinfo:
- # Can't reference m.fixed_r: it contains floats, m.cpp_ref_any wants doubles
- m.cpp_ref_any(m.fixed_r())
- assert "Unable to cast Python instance" in str(excinfo.value)
- assert m.cpp_ref_any(m.ReturnTester.create()) == 1.0
-
- assert m.cpp_ref_any(m.get_cm_ref()) == 21.0
- assert m.cpp_ref_any(m.get_cm_ref()) == 21.0
-
-
-def test_pass_readonly_array():
- z = np.full((5, 6), 42.0)
- z.flags.writeable = False
- np.testing.assert_array_equal(z, m.fixed_copy_r(z))
- np.testing.assert_array_equal(m.fixed_r_const(), m.fixed_r())
- assert not m.fixed_r_const().flags.writeable
- np.testing.assert_array_equal(m.fixed_copy_r(m.fixed_r_const()), m.fixed_r_const())
-
-
-def test_nonunit_stride_from_python():
- counting_mat = np.arange(9.0, dtype=np.float32).reshape((3, 3))
- second_row = counting_mat[1, :]
- second_col = counting_mat[:, 1]
- np.testing.assert_array_equal(m.double_row(second_row), 2.0 * second_row)
- np.testing.assert_array_equal(m.double_col(second_row), 2.0 * second_row)
- np.testing.assert_array_equal(m.double_complex(second_row), 2.0 * second_row)
- np.testing.assert_array_equal(m.double_row(second_col), 2.0 * second_col)
- np.testing.assert_array_equal(m.double_col(second_col), 2.0 * second_col)
- np.testing.assert_array_equal(m.double_complex(second_col), 2.0 * second_col)
-
- counting_3d = np.arange(27.0, dtype=np.float32).reshape((3, 3, 3))
- slices = [counting_3d[0, :, :], counting_3d[:, 0, :], counting_3d[:, :, 0]]
- for ref_mat in slices:
- np.testing.assert_array_equal(m.double_mat_cm(ref_mat), 2.0 * ref_mat)
- np.testing.assert_array_equal(m.double_mat_rm(ref_mat), 2.0 * ref_mat)
-
- # Mutator:
- m.double_threer(second_row)
- m.double_threec(second_col)
- np.testing.assert_array_equal(counting_mat, [[0.0, 2, 2], [6, 16, 10], [6, 14, 8]])
-
-
-def test_negative_stride_from_python(msg):
- """Eigen doesn't support (as of yet) negative strides. When a function takes an Eigen matrix by
- copy or const reference, we can pass a numpy array that has negative strides. Otherwise, an
- exception will be thrown as Eigen will not be able to map the numpy array."""
-
- counting_mat = np.arange(9.0, dtype=np.float32).reshape((3, 3))
- counting_mat = counting_mat[::-1, ::-1]
- second_row = counting_mat[1, :]
- second_col = counting_mat[:, 1]
- np.testing.assert_array_equal(m.double_row(second_row), 2.0 * second_row)
- np.testing.assert_array_equal(m.double_col(second_row), 2.0 * second_row)
- np.testing.assert_array_equal(m.double_complex(second_row), 2.0 * second_row)
- np.testing.assert_array_equal(m.double_row(second_col), 2.0 * second_col)
- np.testing.assert_array_equal(m.double_col(second_col), 2.0 * second_col)
- np.testing.assert_array_equal(m.double_complex(second_col), 2.0 * second_col)
-
- counting_3d = np.arange(27.0, dtype=np.float32).reshape((3, 3, 3))
- counting_3d = counting_3d[::-1, ::-1, ::-1]
- slices = [counting_3d[0, :, :], counting_3d[:, 0, :], counting_3d[:, :, 0]]
- for ref_mat in slices:
- np.testing.assert_array_equal(m.double_mat_cm(ref_mat), 2.0 * ref_mat)
- np.testing.assert_array_equal(m.double_mat_rm(ref_mat), 2.0 * ref_mat)
-
- # Mutator:
- with pytest.raises(TypeError) as excinfo:
- m.double_threer(second_row)
- assert (
- msg(excinfo.value)
- == """
- double_threer(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: numpy.ndarray[numpy.float32[1, 3], flags.writeable]) -> None
-
- Invoked with: """ # noqa: E501 line too long
- + repr(np.array([5.0, 4.0, 3.0], dtype="float32"))
- )
-
- with pytest.raises(TypeError) as excinfo:
- m.double_threec(second_col)
- assert (
- msg(excinfo.value)
- == """
- double_threec(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: numpy.ndarray[numpy.float32[3, 1], flags.writeable]) -> None
-
- Invoked with: """ # noqa: E501 line too long
- + repr(np.array([7.0, 4.0, 1.0], dtype="float32"))
- )
-
-
-def test_nonunit_stride_to_python():
- assert np.all(m.diagonal(ref) == ref.diagonal())
- assert np.all(m.diagonal_1(ref) == ref.diagonal(1))
- for i in range(-5, 7):
- assert np.all(
- m.diagonal_n(ref, i) == ref.diagonal(i)
- ), "m.diagonal_n({})".format(i)
-
- assert np.all(m.block(ref, 2, 1, 3, 3) == ref[2:5, 1:4])
- assert np.all(m.block(ref, 1, 4, 4, 2) == ref[1:, 4:])
- assert np.all(m.block(ref, 1, 4, 3, 2) == ref[1:4, 4:])
-
-
-def test_eigen_ref_to_python():
- chols = [m.cholesky1, m.cholesky2, m.cholesky3, m.cholesky4]
- for i, chol in enumerate(chols, start=1):
- mymat = chol(np.array([[1.0, 2, 4], [2, 13, 23], [4, 23, 77]]))
- assert np.all(
- mymat == np.array([[1, 0, 0], [2, 3, 0], [4, 5, 6]])
- ), "cholesky{}".format(i)
-
-
-def assign_both(a1, a2, r, c, v):
- a1[r, c] = v
- a2[r, c] = v
-
-
-def array_copy_but_one(a, r, c, v):
- z = np.array(a, copy=True)
- z[r, c] = v
- return z
-
-
-def test_eigen_return_references():
- """Tests various ways of returning references and non-referencing copies"""
-
- master = np.ones((10, 10))
- a = m.ReturnTester()
- a_get1 = a.get()
- assert not a_get1.flags.owndata and a_get1.flags.writeable
- assign_both(a_get1, master, 3, 3, 5)
- a_get2 = a.get_ptr()
- assert not a_get2.flags.owndata and a_get2.flags.writeable
- assign_both(a_get1, master, 2, 3, 6)
-
- a_view1 = a.view()
- assert not a_view1.flags.owndata and not a_view1.flags.writeable
- with pytest.raises(ValueError):
- a_view1[2, 3] = 4
- a_view2 = a.view_ptr()
- assert not a_view2.flags.owndata and not a_view2.flags.writeable
- with pytest.raises(ValueError):
- a_view2[2, 3] = 4
-
- a_copy1 = a.copy_get()
- assert a_copy1.flags.owndata and a_copy1.flags.writeable
- np.testing.assert_array_equal(a_copy1, master)
- a_copy1[7, 7] = -44 # Shouldn't affect anything else
- c1want = array_copy_but_one(master, 7, 7, -44)
- a_copy2 = a.copy_view()
- assert a_copy2.flags.owndata and a_copy2.flags.writeable
- np.testing.assert_array_equal(a_copy2, master)
- a_copy2[4, 4] = -22 # Shouldn't affect anything else
- c2want = array_copy_but_one(master, 4, 4, -22)
-
- a_ref1 = a.ref()
- assert not a_ref1.flags.owndata and a_ref1.flags.writeable
- assign_both(a_ref1, master, 1, 1, 15)
- a_ref2 = a.ref_const()
- assert not a_ref2.flags.owndata and not a_ref2.flags.writeable
- with pytest.raises(ValueError):
- a_ref2[5, 5] = 33
- a_ref3 = a.ref_safe()
- assert not a_ref3.flags.owndata and a_ref3.flags.writeable
- assign_both(a_ref3, master, 0, 7, 99)
- a_ref4 = a.ref_const_safe()
- assert not a_ref4.flags.owndata and not a_ref4.flags.writeable
- with pytest.raises(ValueError):
- a_ref4[7, 0] = 987654321
-
- a_copy3 = a.copy_ref()
- assert a_copy3.flags.owndata and a_copy3.flags.writeable
- np.testing.assert_array_equal(a_copy3, master)
- a_copy3[8, 1] = 11
- c3want = array_copy_but_one(master, 8, 1, 11)
- a_copy4 = a.copy_ref_const()
- assert a_copy4.flags.owndata and a_copy4.flags.writeable
- np.testing.assert_array_equal(a_copy4, master)
- a_copy4[8, 4] = 88
- c4want = array_copy_but_one(master, 8, 4, 88)
-
- a_block1 = a.block(3, 3, 2, 2)
- assert not a_block1.flags.owndata and a_block1.flags.writeable
- a_block1[0, 0] = 55
- master[3, 3] = 55
- a_block2 = a.block_safe(2, 2, 3, 2)
- assert not a_block2.flags.owndata and a_block2.flags.writeable
- a_block2[2, 1] = -123
- master[4, 3] = -123
- a_block3 = a.block_const(6, 7, 4, 3)
- assert not a_block3.flags.owndata and not a_block3.flags.writeable
- with pytest.raises(ValueError):
- a_block3[2, 2] = -44444
-
- a_copy5 = a.copy_block(2, 2, 2, 3)
- assert a_copy5.flags.owndata and a_copy5.flags.writeable
- np.testing.assert_array_equal(a_copy5, master[2:4, 2:5])
- a_copy5[1, 1] = 777
- c5want = array_copy_but_one(master[2:4, 2:5], 1, 1, 777)
-
- a_corn1 = a.corners()
- assert not a_corn1.flags.owndata and a_corn1.flags.writeable
- a_corn1 *= 50
- a_corn1[1, 1] = 999
- master[0, 0] = 50
- master[0, 9] = 50
- master[9, 0] = 50
- master[9, 9] = 999
- a_corn2 = a.corners_const()
- assert not a_corn2.flags.owndata and not a_corn2.flags.writeable
- with pytest.raises(ValueError):
- a_corn2[1, 0] = 51
-
- # All of the changes made all the way along should be visible everywhere
- # now (except for the copies, of course)
- np.testing.assert_array_equal(a_get1, master)
- np.testing.assert_array_equal(a_get2, master)
- np.testing.assert_array_equal(a_view1, master)
- np.testing.assert_array_equal(a_view2, master)
- np.testing.assert_array_equal(a_ref1, master)
- np.testing.assert_array_equal(a_ref2, master)
- np.testing.assert_array_equal(a_ref3, master)
- np.testing.assert_array_equal(a_ref4, master)
- np.testing.assert_array_equal(a_block1, master[3:5, 3:5])
- np.testing.assert_array_equal(a_block2, master[2:5, 2:4])
- np.testing.assert_array_equal(a_block3, master[6:10, 7:10])
- np.testing.assert_array_equal(
- a_corn1, master[0 :: master.shape[0] - 1, 0 :: master.shape[1] - 1]
- )
- np.testing.assert_array_equal(
- a_corn2, master[0 :: master.shape[0] - 1, 0 :: master.shape[1] - 1]
- )
-
- np.testing.assert_array_equal(a_copy1, c1want)
- np.testing.assert_array_equal(a_copy2, c2want)
- np.testing.assert_array_equal(a_copy3, c3want)
- np.testing.assert_array_equal(a_copy4, c4want)
- np.testing.assert_array_equal(a_copy5, c5want)
-
-
-def assert_keeps_alive(cl, method, *args):
- cstats = ConstructorStats.get(cl)
- start_with = cstats.alive()
- a = cl()
- assert cstats.alive() == start_with + 1
- z = method(a, *args)
- assert cstats.alive() == start_with + 1
- del a
- # Here's the keep alive in action:
- assert cstats.alive() == start_with + 1
- del z
- # Keep alive should have expired:
- assert cstats.alive() == start_with
-
-
-def test_eigen_keepalive():
- a = m.ReturnTester()
- cstats = ConstructorStats.get(m.ReturnTester)
- assert cstats.alive() == 1
- unsafe = [a.ref(), a.ref_const(), a.block(1, 2, 3, 4)]
- copies = [
- a.copy_get(),
- a.copy_view(),
- a.copy_ref(),
- a.copy_ref_const(),
- a.copy_block(4, 3, 2, 1),
- ]
- del a
- assert cstats.alive() == 0
- del unsafe
- del copies
-
- for meth in [
- m.ReturnTester.get,
- m.ReturnTester.get_ptr,
- m.ReturnTester.view,
- m.ReturnTester.view_ptr,
- m.ReturnTester.ref_safe,
- m.ReturnTester.ref_const_safe,
- m.ReturnTester.corners,
- m.ReturnTester.corners_const,
- ]:
- assert_keeps_alive(m.ReturnTester, meth)
-
- for meth in [m.ReturnTester.block_safe, m.ReturnTester.block_const]:
- assert_keeps_alive(m.ReturnTester, meth, 4, 3, 2, 1)
-
-
-def test_eigen_ref_mutators():
- """Tests Eigen's ability to mutate numpy values"""
-
- orig = np.array([[1.0, 2, 3], [4, 5, 6], [7, 8, 9]])
- zr = np.array(orig)
- zc = np.array(orig, order="F")
- m.add_rm(zr, 1, 0, 100)
- assert np.all(zr == np.array([[1.0, 2, 3], [104, 5, 6], [7, 8, 9]]))
- m.add_cm(zc, 1, 0, 200)
- assert np.all(zc == np.array([[1.0, 2, 3], [204, 5, 6], [7, 8, 9]]))
-
- m.add_any(zr, 1, 0, 20)
- assert np.all(zr == np.array([[1.0, 2, 3], [124, 5, 6], [7, 8, 9]]))
- m.add_any(zc, 1, 0, 10)
- assert np.all(zc == np.array([[1.0, 2, 3], [214, 5, 6], [7, 8, 9]]))
-
- # Can't reference a col-major array with a row-major Ref, and vice versa:
- with pytest.raises(TypeError):
- m.add_rm(zc, 1, 0, 1)
- with pytest.raises(TypeError):
- m.add_cm(zr, 1, 0, 1)
-
- # Overloads:
- m.add1(zr, 1, 0, -100)
- m.add2(zr, 1, 0, -20)
- assert np.all(zr == orig)
- m.add1(zc, 1, 0, -200)
- m.add2(zc, 1, 0, -10)
- assert np.all(zc == orig)
-
- # a non-contiguous slice (this won't work on either the row- or
- # column-contiguous refs, but should work for the any)
- cornersr = zr[0::2, 0::2]
- cornersc = zc[0::2, 0::2]
-
- assert np.all(cornersr == np.array([[1.0, 3], [7, 9]]))
- assert np.all(cornersc == np.array([[1.0, 3], [7, 9]]))
-
- with pytest.raises(TypeError):
- m.add_rm(cornersr, 0, 1, 25)
- with pytest.raises(TypeError):
- m.add_cm(cornersr, 0, 1, 25)
- with pytest.raises(TypeError):
- m.add_rm(cornersc, 0, 1, 25)
- with pytest.raises(TypeError):
- m.add_cm(cornersc, 0, 1, 25)
- m.add_any(cornersr, 0, 1, 25)
- m.add_any(cornersc, 0, 1, 44)
- assert np.all(zr == np.array([[1.0, 2, 28], [4, 5, 6], [7, 8, 9]]))
- assert np.all(zc == np.array([[1.0, 2, 47], [4, 5, 6], [7, 8, 9]]))
-
- # You shouldn't be allowed to pass a non-writeable array to a mutating Eigen method:
- zro = zr[0:4, 0:4]
- zro.flags.writeable = False
- with pytest.raises(TypeError):
- m.add_rm(zro, 0, 0, 0)
- with pytest.raises(TypeError):
- m.add_any(zro, 0, 0, 0)
- with pytest.raises(TypeError):
- m.add1(zro, 0, 0, 0)
- with pytest.raises(TypeError):
- m.add2(zro, 0, 0, 0)
-
- # integer array shouldn't be passable to a double-matrix-accepting mutating func:
- zi = np.array([[1, 2], [3, 4]])
- with pytest.raises(TypeError):
- m.add_rm(zi)
-
-
-def test_numpy_ref_mutators():
- """Tests numpy mutating Eigen matrices (for returned Eigen::Ref<...>s)"""
-
- m.reset_refs() # In case another test already changed it
-
- zc = m.get_cm_ref()
- zcro = m.get_cm_const_ref()
- zr = m.get_rm_ref()
- zrro = m.get_rm_const_ref()
-
- assert [zc[1, 2], zcro[1, 2], zr[1, 2], zrro[1, 2]] == [23] * 4
-
- assert not zc.flags.owndata and zc.flags.writeable
- assert not zr.flags.owndata and zr.flags.writeable
- assert not zcro.flags.owndata and not zcro.flags.writeable
- assert not zrro.flags.owndata and not zrro.flags.writeable
-
- zc[1, 2] = 99
- expect = np.array([[11.0, 12, 13], [21, 22, 99], [31, 32, 33]])
- # We should have just changed zc, of course, but also zcro and the original eigen matrix
- assert np.all(zc == expect)
- assert np.all(zcro == expect)
- assert np.all(m.get_cm_ref() == expect)
-
- zr[1, 2] = 99
- assert np.all(zr == expect)
- assert np.all(zrro == expect)
- assert np.all(m.get_rm_ref() == expect)
-
- # Make sure the readonly ones are numpy-readonly:
- with pytest.raises(ValueError):
- zcro[1, 2] = 6
- with pytest.raises(ValueError):
- zrro[1, 2] = 6
-
- # We should be able to explicitly copy like this (and since we're copying,
- # the const should drop away)
- y1 = np.array(m.get_cm_const_ref())
-
- assert y1.flags.owndata and y1.flags.writeable
- # We should get copies of the eigen data, which was modified above:
- assert y1[1, 2] == 99
- y1[1, 2] += 12
- assert y1[1, 2] == 111
- assert zc[1, 2] == 99 # Make sure we aren't referencing the original
-
-
-def test_both_ref_mutators():
- """Tests a complex chain of nested eigen/numpy references"""
-
- m.reset_refs() # In case another test already changed it
-
- z = m.get_cm_ref() # numpy -> eigen
- z[0, 2] -= 3
- z2 = m.incr_matrix(z, 1) # numpy -> eigen -> numpy -> eigen
- z2[1, 1] += 6
- z3 = m.incr_matrix(z, 2) # (numpy -> eigen)^3
- z3[2, 2] += -5
- z4 = m.incr_matrix(z, 3) # (numpy -> eigen)^4
- z4[1, 1] -= 1
- z5 = m.incr_matrix(z, 4) # (numpy -> eigen)^5
- z5[0, 0] = 0
- assert np.all(z == z2)
- assert np.all(z == z3)
- assert np.all(z == z4)
- assert np.all(z == z5)
- expect = np.array([[0.0, 22, 20], [31, 37, 33], [41, 42, 38]])
- assert np.all(z == expect)
-
- y = np.array(range(100), dtype="float64").reshape(10, 10)
- y2 = m.incr_matrix_any(y, 10) # np -> eigen -> np
- y3 = m.incr_matrix_any(
- y2[0::2, 0::2], -33
- ) # np -> eigen -> np slice -> np -> eigen -> np
- y4 = m.even_rows(y3) # numpy -> eigen slice -> (... y3)
- y5 = m.even_cols(y4) # numpy -> eigen slice -> (... y4)
- y6 = m.incr_matrix_any(y5, 1000) # numpy -> eigen -> (... y5)
-
- # Apply same mutations using just numpy:
- yexpect = np.array(range(100), dtype="float64").reshape(10, 10)
- yexpect += 10
- yexpect[0::2, 0::2] -= 33
- yexpect[0::4, 0::4] += 1000
- assert np.all(y6 == yexpect[0::4, 0::4])
- assert np.all(y5 == yexpect[0::4, 0::4])
- assert np.all(y4 == yexpect[0::4, 0::2])
- assert np.all(y3 == yexpect[0::2, 0::2])
- assert np.all(y2 == yexpect)
- assert np.all(y == yexpect)
-
-
-def test_nocopy_wrapper():
- # get_elem requires a column-contiguous matrix reference, but should be
- # callable with other types of matrix (via copying):
- int_matrix_colmajor = np.array([[1, 2, 3], [4, 5, 6], [7, 8, 9]], order="F")
- dbl_matrix_colmajor = np.array(
- int_matrix_colmajor, dtype="double", order="F", copy=True
- )
- int_matrix_rowmajor = np.array(int_matrix_colmajor, order="C", copy=True)
- dbl_matrix_rowmajor = np.array(
- int_matrix_rowmajor, dtype="double", order="C", copy=True
- )
-
- # All should be callable via get_elem:
- assert m.get_elem(int_matrix_colmajor) == 8
- assert m.get_elem(dbl_matrix_colmajor) == 8
- assert m.get_elem(int_matrix_rowmajor) == 8
- assert m.get_elem(dbl_matrix_rowmajor) == 8
-
- # All but the second should fail with m.get_elem_nocopy:
- with pytest.raises(TypeError) as excinfo:
- m.get_elem_nocopy(int_matrix_colmajor)
- assert "get_elem_nocopy(): incompatible function arguments." in str(
- excinfo.value
- ) and ", flags.f_contiguous" in str(excinfo.value)
- assert m.get_elem_nocopy(dbl_matrix_colmajor) == 8
- with pytest.raises(TypeError) as excinfo:
- m.get_elem_nocopy(int_matrix_rowmajor)
- assert "get_elem_nocopy(): incompatible function arguments." in str(
- excinfo.value
- ) and ", flags.f_contiguous" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.get_elem_nocopy(dbl_matrix_rowmajor)
- assert "get_elem_nocopy(): incompatible function arguments." in str(
- excinfo.value
- ) and ", flags.f_contiguous" in str(excinfo.value)
-
- # For the row-major test, we take a long matrix in row-major, so only the third is allowed:
- with pytest.raises(TypeError) as excinfo:
- m.get_elem_rm_nocopy(int_matrix_colmajor)
- assert "get_elem_rm_nocopy(): incompatible function arguments." in str(
- excinfo.value
- ) and ", flags.c_contiguous" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.get_elem_rm_nocopy(dbl_matrix_colmajor)
- assert "get_elem_rm_nocopy(): incompatible function arguments." in str(
- excinfo.value
- ) and ", flags.c_contiguous" in str(excinfo.value)
- assert m.get_elem_rm_nocopy(int_matrix_rowmajor) == 8
- with pytest.raises(TypeError) as excinfo:
- m.get_elem_rm_nocopy(dbl_matrix_rowmajor)
- assert "get_elem_rm_nocopy(): incompatible function arguments." in str(
- excinfo.value
- ) and ", flags.c_contiguous" in str(excinfo.value)
-
-
-def test_eigen_ref_life_support():
- """Ensure the lifetime of temporary arrays created by the `Ref` caster
-
- The `Ref` caster sometimes creates a copy which needs to stay alive. This needs to
- happen both for directs casts (just the array) or indirectly (e.g. list of arrays).
- """
-
- a = np.full(shape=10, fill_value=8, dtype=np.int8)
- assert m.get_elem_direct(a) == 8
-
- list_of_a = [a]
- assert m.get_elem_indirect(list_of_a) == 8
-
-
-def test_special_matrix_objects():
- assert np.all(m.incr_diag(7) == np.diag([1.0, 2, 3, 4, 5, 6, 7]))
-
- asymm = np.array([[1.0, 2, 3, 4], [5, 6, 7, 8], [9, 10, 11, 12], [13, 14, 15, 16]])
- symm_lower = np.array(asymm)
- symm_upper = np.array(asymm)
- for i in range(4):
- for j in range(i + 1, 4):
- symm_lower[i, j] = symm_lower[j, i]
- symm_upper[j, i] = symm_upper[i, j]
-
- assert np.all(m.symmetric_lower(asymm) == symm_lower)
- assert np.all(m.symmetric_upper(asymm) == symm_upper)
-
-
-def test_dense_signature(doc):
- assert (
- doc(m.double_col)
- == """
- double_col(arg0: numpy.ndarray[numpy.float32[m, 1]]) -> numpy.ndarray[numpy.float32[m, 1]]
- """
- )
- assert (
- doc(m.double_row)
- == """
- double_row(arg0: numpy.ndarray[numpy.float32[1, n]]) -> numpy.ndarray[numpy.float32[1, n]]
- """
- )
- assert doc(m.double_complex) == (
- """
- double_complex(arg0: numpy.ndarray[numpy.complex64[m, 1]])"""
- """ -> numpy.ndarray[numpy.complex64[m, 1]]
- """
- )
- assert doc(m.double_mat_rm) == (
- """
- double_mat_rm(arg0: numpy.ndarray[numpy.float32[m, n]])"""
- """ -> numpy.ndarray[numpy.float32[m, n]]
- """
- )
-
-
-def test_named_arguments():
- a = np.array([[1.0, 2], [3, 4], [5, 6]])
- b = np.ones((2, 1))
-
- assert np.all(m.matrix_multiply(a, b) == np.array([[3.0], [7], [11]]))
- assert np.all(m.matrix_multiply(A=a, B=b) == np.array([[3.0], [7], [11]]))
- assert np.all(m.matrix_multiply(B=b, A=a) == np.array([[3.0], [7], [11]]))
-
- with pytest.raises(ValueError) as excinfo:
- m.matrix_multiply(b, a)
- assert str(excinfo.value) == "Nonconformable matrices!"
-
- with pytest.raises(ValueError) as excinfo:
- m.matrix_multiply(A=b, B=a)
- assert str(excinfo.value) == "Nonconformable matrices!"
-
- with pytest.raises(ValueError) as excinfo:
- m.matrix_multiply(B=a, A=b)
- assert str(excinfo.value) == "Nonconformable matrices!"
-
-
-def test_sparse():
- pytest.importorskip("scipy")
- assert_sparse_equal_ref(m.sparse_r())
- assert_sparse_equal_ref(m.sparse_c())
- assert_sparse_equal_ref(m.sparse_copy_r(m.sparse_r()))
- assert_sparse_equal_ref(m.sparse_copy_c(m.sparse_c()))
- assert_sparse_equal_ref(m.sparse_copy_r(m.sparse_c()))
- assert_sparse_equal_ref(m.sparse_copy_c(m.sparse_r()))
-
-
-def test_sparse_signature(doc):
- pytest.importorskip("scipy")
- assert (
- doc(m.sparse_copy_r)
- == """
- sparse_copy_r(arg0: scipy.sparse.csr_matrix[numpy.float32]) -> scipy.sparse.csr_matrix[numpy.float32]
- """ # noqa: E501 line too long
- )
- assert (
- doc(m.sparse_copy_c)
- == """
- sparse_copy_c(arg0: scipy.sparse.csc_matrix[numpy.float32]) -> scipy.sparse.csc_matrix[numpy.float32]
- """ # noqa: E501 line too long
- )
-
-
-def test_issue738():
- """Ignore strides on a length-1 dimension (even if they would be incompatible length > 1)"""
- assert np.all(m.iss738_f1(np.array([[1.0, 2, 3]])) == np.array([[1.0, 102, 203]]))
- assert np.all(
- m.iss738_f1(np.array([[1.0], [2], [3]])) == np.array([[1.0], [12], [23]])
- )
-
- assert np.all(m.iss738_f2(np.array([[1.0, 2, 3]])) == np.array([[1.0, 102, 203]]))
- assert np.all(
- m.iss738_f2(np.array([[1.0], [2], [3]])) == np.array([[1.0], [12], [23]])
- )
-
-
-def test_issue1105():
- """Issue 1105: 1xN or Nx1 input arrays weren't accepted for eigen
- compile-time row vectors or column vector"""
- assert m.iss1105_row(np.ones((1, 7)))
- assert m.iss1105_col(np.ones((7, 1)))
-
- # These should still fail (incompatible dimensions):
- with pytest.raises(TypeError) as excinfo:
- m.iss1105_row(np.ones((7, 1)))
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.iss1105_col(np.ones((1, 7)))
- assert "incompatible function arguments" in str(excinfo.value)
-
-
-def test_custom_operator_new():
- """Using Eigen types as member variables requires a class-specific
- operator new with proper alignment"""
-
- o = m.CustomOperatorNew()
- np.testing.assert_allclose(o.a, 0.0)
- np.testing.assert_allclose(o.b.diagonal(), 1.0)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/CMakeLists.txt
deleted file mode 100644
index 2e298fa7e44684cfae77184e6218f83b62d90c1c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-if("${PYTHON_MODULE_EXTENSION}" MATCHES "pypy" OR "${Python_INTERPRETER_ID}" STREQUAL "PyPy")
- add_custom_target(cpptest) # Dummy target on PyPy. Embedding is not supported.
- set(_suppress_unused_variable_warning "${DOWNLOAD_CATCH}")
- return()
-endif()
-
-find_package(Catch 2.13.0)
-
-if(CATCH_FOUND)
- message(STATUS "Building interpreter tests using Catch v${CATCH_VERSION}")
-else()
- message(STATUS "Catch not detected. Interpreter tests will be skipped. Install Catch headers"
- " manually or use `cmake -DDOWNLOAD_CATCH=ON` to fetch them automatically.")
- return()
-endif()
-
-find_package(Threads REQUIRED)
-
-add_executable(test_embed catch.cpp test_interpreter.cpp)
-pybind11_enable_warnings(test_embed)
-
-target_link_libraries(test_embed PRIVATE pybind11::embed Catch2::Catch2 Threads::Threads)
-
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
- file(COPY test_interpreter.py DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-endif()
-
-add_custom_target(
- cpptest
- COMMAND "$<TARGET_FILE:test_embed>"
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-
-pybind11_add_module(external_module THIN_LTO external_module.cpp)
-set_target_properties(external_module PROPERTIES LIBRARY_OUTPUT_DIRECTORY
- "${CMAKE_CURRENT_BINARY_DIR}")
-foreach(config ${CMAKE_CONFIGURATION_TYPES})
- string(TOUPPER ${config} config)
- set_target_properties(external_module PROPERTIES LIBRARY_OUTPUT_DIRECTORY_${config}
- "${CMAKE_CURRENT_BINARY_DIR}")
-endforeach()
-add_dependencies(cpptest external_module)
-
-add_dependencies(check cpptest)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/catch.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/catch.cpp
deleted file mode 100644
index dd137385cb32250b8640169934fb96aa5e80f069..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/catch.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// The Catch implementation is compiled here. This is a standalone
-// translation unit to avoid recompiling it for every test change.
-
-#include <pybind11/embed.h>
-
-#ifdef _MSC_VER
-// Silence MSVC C++17 deprecation warning from Catch regarding std::uncaught_exceptions (up to catch
-// 2.0.1; this should be fixed in the next catch release after 2.0.1).
-# pragma warning(disable: 4996)
-#endif
-
-#define CATCH_CONFIG_RUNNER
-#include <catch.hpp>
-
-namespace py = pybind11;
-
-int main(int argc, char *argv[]) {
- py::scoped_interpreter guard{};
- auto result = Catch::Session().run(argc, argv);
-
- return result < 0xff ? result : 0xff;
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/external_module.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/external_module.cpp
deleted file mode 100644
index e9a6058b179400545479412e5549d7a54f94caeb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/external_module.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <pybind11/pybind11.h>
-
-namespace py = pybind11;
-
-/* Simple test module/test class to check that the referenced internals data of external pybind11
- * modules aren't preserved over a finalize/initialize.
- */
-
-PYBIND11_MODULE(external_module, m) {
- class A {
- public:
- A(int value) : v{value} {};
- int v;
- };
-
- py::class_<A>(m, "A")
- .def(py::init<int>())
- .def_readwrite("value", &A::v);
-
- m.def("internals_at", []() {
- return reinterpret_cast<uintptr_t>(&py::detail::get_internals());
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/test_interpreter.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/test_interpreter.cpp
deleted file mode 100644
index 944334ce661af4c016b499a9374f34249cfcef8f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/test_interpreter.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-#include <pybind11/embed.h>
-
-#ifdef _MSC_VER
-// Silence MSVC C++17 deprecation warning from Catch regarding std::uncaught_exceptions (up to catch
-// 2.0.1; this should be fixed in the next catch release after 2.0.1).
-# pragma warning(disable: 4996)
-#endif
-
-#include <catch.hpp>
-
-#include <thread>
-#include <fstream>
-#include <functional>
-
-namespace py = pybind11;
-using namespace py::literals;
-
-class Widget {
-public:
- Widget(std::string message) : message(message) { }
- virtual ~Widget() = default;
-
- std::string the_message() const { return message; }
- virtual int the_answer() const = 0;
-
-private:
- std::string message;
-};
-
-class PyWidget final : public Widget {
- using Widget::Widget;
-
- int the_answer() const override { PYBIND11_OVERRIDE_PURE(int, Widget, the_answer); }
-};
-
-PYBIND11_EMBEDDED_MODULE(widget_module, m) {
- py::class_<Widget, PyWidget>(m, "Widget")
- .def(py::init<std::string>())
- .def_property_readonly("the_message", &Widget::the_message);
-
- m.def("add", [](int i, int j) { return i + j; });
-}
-
-PYBIND11_EMBEDDED_MODULE(throw_exception, ) {
- throw std::runtime_error("C++ Error");
-}
-
-PYBIND11_EMBEDDED_MODULE(throw_error_already_set, ) {
- auto d = py::dict();
- d["missing"].cast<py::object>();
-}
-
-TEST_CASE("Pass classes and data between modules defined in C++ and Python") {
- auto module_ = py::module_::import("test_interpreter");
- REQUIRE(py::hasattr(module_, "DerivedWidget"));
-
- auto locals = py::dict("hello"_a="Hello, World!", "x"_a=5, **module_.attr("__dict__"));
- py::exec(R"(
- widget = DerivedWidget("{} - {}".format(hello, x))
- message = widget.the_message
- )", py::globals(), locals);
- REQUIRE(locals["message"].cast<std::string>() == "Hello, World! - 5");
-
- auto py_widget = module_.attr("DerivedWidget")("The question");
- auto message = py_widget.attr("the_message");
- REQUIRE(message.cast<std::string>() == "The question");
-
- const auto &cpp_widget = py_widget.cast<const Widget &>();
- REQUIRE(cpp_widget.the_answer() == 42);
-}
-
-TEST_CASE("Import error handling") {
- REQUIRE_NOTHROW(py::module_::import("widget_module"));
- REQUIRE_THROWS_WITH(py::module_::import("throw_exception"),
- "ImportError: C++ Error");
- REQUIRE_THROWS_WITH(py::module_::import("throw_error_already_set"),
- Catch::Contains("ImportError: KeyError"));
-}
-
-TEST_CASE("There can be only one interpreter") {
- static_assert(std::is_move_constructible<py::scoped_interpreter>::value, "");
- static_assert(!std::is_move_assignable<py::scoped_interpreter>::value, "");
- static_assert(!std::is_copy_constructible<py::scoped_interpreter>::value, "");
- static_assert(!std::is_copy_assignable<py::scoped_interpreter>::value, "");
-
- REQUIRE_THROWS_WITH(py::initialize_interpreter(), "The interpreter is already running");
- REQUIRE_THROWS_WITH(py::scoped_interpreter(), "The interpreter is already running");
-
- py::finalize_interpreter();
- REQUIRE_NOTHROW(py::scoped_interpreter());
- {
- auto pyi1 = py::scoped_interpreter();
- auto pyi2 = std::move(pyi1);
- }
- py::initialize_interpreter();
-}
-
-bool has_pybind11_internals_builtin() {
- auto builtins = py::handle(PyEval_GetBuiltins());
- return builtins.contains(PYBIND11_INTERNALS_ID);
-};
-
-bool has_pybind11_internals_static() {
- auto **&ipp = py::detail::get_internals_pp();
- return ipp && *ipp;
-}
-
-TEST_CASE("Restart the interpreter") {
- // Verify pre-restart state.
- REQUIRE(py::module_::import("widget_module").attr("add")(1, 2).cast<int>() == 3);
- REQUIRE(has_pybind11_internals_builtin());
- REQUIRE(has_pybind11_internals_static());
- REQUIRE(py::module_::import("external_module").attr("A")(123).attr("value").cast<int>() == 123);
-
- // local and foreign module internals should point to the same internals:
- REQUIRE(reinterpret_cast<uintptr_t>(*py::detail::get_internals_pp()) ==
- py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>());
-
- // Restart the interpreter.
- py::finalize_interpreter();
- REQUIRE(Py_IsInitialized() == 0);
-
- py::initialize_interpreter();
- REQUIRE(Py_IsInitialized() == 1);
-
- // Internals are deleted after a restart.
- REQUIRE_FALSE(has_pybind11_internals_builtin());
- REQUIRE_FALSE(has_pybind11_internals_static());
- pybind11::detail::get_internals();
- REQUIRE(has_pybind11_internals_builtin());
- REQUIRE(has_pybind11_internals_static());
- REQUIRE(reinterpret_cast<uintptr_t>(*py::detail::get_internals_pp()) ==
- py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>());
-
- // Make sure that an interpreter with no get_internals() created until finalize still gets the
- // internals destroyed
- py::finalize_interpreter();
- py::initialize_interpreter();
- bool ran = false;
- py::module_::import("__main__").attr("internals_destroy_test") =
- py::capsule(&ran, [](void *ran) { py::detail::get_internals(); *static_cast<bool *>(ran) = true; });
- REQUIRE_FALSE(has_pybind11_internals_builtin());
- REQUIRE_FALSE(has_pybind11_internals_static());
- REQUIRE_FALSE(ran);
- py::finalize_interpreter();
- REQUIRE(ran);
- py::initialize_interpreter();
- REQUIRE_FALSE(has_pybind11_internals_builtin());
- REQUIRE_FALSE(has_pybind11_internals_static());
-
- // C++ modules can be reloaded.
- auto cpp_module = py::module_::import("widget_module");
- REQUIRE(cpp_module.attr("add")(1, 2).cast<int>() == 3);
-
- // C++ type information is reloaded and can be used in python modules.
- auto py_module = py::module_::import("test_interpreter");
- auto py_widget = py_module.attr("DerivedWidget")("Hello after restart");
- REQUIRE(py_widget.attr("the_message").cast<std::string>() == "Hello after restart");
-}
-
-TEST_CASE("Subinterpreter") {
- // Add tags to the modules in the main interpreter and test the basics.
- py::module_::import("__main__").attr("main_tag") = "main interpreter";
- {
- auto m = py::module_::import("widget_module");
- m.attr("extension_module_tag") = "added to module in main interpreter";
-
- REQUIRE(m.attr("add")(1, 2).cast<int>() == 3);
- }
- REQUIRE(has_pybind11_internals_builtin());
- REQUIRE(has_pybind11_internals_static());
-
- /// Create and switch to a subinterpreter.
- auto main_tstate = PyThreadState_Get();
- auto sub_tstate = Py_NewInterpreter();
-
- // Subinterpreters get their own copy of builtins. detail::get_internals() still
- // works by returning from the static variable, i.e. all interpreters share a single
- // global pybind11::internals;
- REQUIRE_FALSE(has_pybind11_internals_builtin());
- REQUIRE(has_pybind11_internals_static());
-
- // Modules tags should be gone.
- REQUIRE_FALSE(py::hasattr(py::module_::import("__main__"), "tag"));
- {
- auto m = py::module_::import("widget_module");
- REQUIRE_FALSE(py::hasattr(m, "extension_module_tag"));
-
- // Function bindings should still work.
- REQUIRE(m.attr("add")(1, 2).cast<int>() == 3);
- }
-
- // Restore main interpreter.
- Py_EndInterpreter(sub_tstate);
- PyThreadState_Swap(main_tstate);
-
- REQUIRE(py::hasattr(py::module_::import("__main__"), "main_tag"));
- REQUIRE(py::hasattr(py::module_::import("widget_module"), "extension_module_tag"));
-}
-
-TEST_CASE("Execution frame") {
- // When the interpreter is embedded, there is no execution frame, but `py::exec`
- // should still function by using reasonable globals: `__main__.__dict__`.
- py::exec("var = dict(number=42)");
- REQUIRE(py::globals()["var"]["number"].cast<int>() == 42);
-}
-
-TEST_CASE("Threads") {
- // Restart interpreter to ensure threads are not initialized
- py::finalize_interpreter();
- py::initialize_interpreter();
- REQUIRE_FALSE(has_pybind11_internals_static());
-
- constexpr auto num_threads = 10;
- auto locals = py::dict("count"_a=0);
-
- {
- py::gil_scoped_release gil_release{};
- REQUIRE(has_pybind11_internals_static());
-
- auto threads = std::vector<std::thread>();
- for (auto i = 0; i < num_threads; ++i) {
- threads.emplace_back([&]() {
- py::gil_scoped_acquire gil{};
- locals["count"] = locals["count"].cast<int>() + 1;
- });
- }
-
- for (auto &thread : threads) {
- thread.join();
- }
- }
-
- REQUIRE(locals["count"].cast<int>() == num_threads);
-}
-
-// Scope exit utility https://stackoverflow.com/a/36644501/7255855
-struct scope_exit {
- std::function<void()> f_;
- explicit scope_exit(std::function<void()> f) noexcept : f_(std::move(f)) {}
- ~scope_exit() { if (f_) f_(); }
-};
-
-TEST_CASE("Reload module from file") {
- // Disable generation of cached bytecode (.pyc files) for this test, otherwise
- // Python might pick up an old version from the cache instead of the new versions
- // of the .py files generated below
- auto sys = py::module_::import("sys");
- bool dont_write_bytecode = sys.attr("dont_write_bytecode").cast<bool>();
- sys.attr("dont_write_bytecode") = true;
- // Reset the value at scope exit
- scope_exit reset_dont_write_bytecode([&]() {
- sys.attr("dont_write_bytecode") = dont_write_bytecode;
- });
-
- std::string module_name = "test_module_reload";
- std::string module_file = module_name + ".py";
-
- // Create the module .py file
- std::ofstream test_module(module_file);
- test_module << "def test():\n";
- test_module << " return 1\n";
- test_module.close();
- // Delete the file at scope exit
- scope_exit delete_module_file([&]() {
- std::remove(module_file.c_str());
- });
-
- // Import the module from file
- auto module_ = py::module_::import(module_name.c_str());
- int result = module_.attr("test")().cast<int>();
- REQUIRE(result == 1);
-
- // Update the module .py file with a small change
- test_module.open(module_file);
- test_module << "def test():\n";
- test_module << " return 2\n";
- test_module.close();
-
- // Reload the module
- module_.reload();
- result = module_.attr("test")().cast<int>();
- REQUIRE(result == 2);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/test_interpreter.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/test_interpreter.py
deleted file mode 100644
index 6174ede446f0356fbdf61aee4136535a78a32479..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_embed/test_interpreter.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-from widget_module import Widget
-
-
-class DerivedWidget(Widget):
- def __init__(self, message):
- super(DerivedWidget, self).__init__(message)
-
- def the_answer(self):
- return 42
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_enum.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_enum.cpp
deleted file mode 100644
index 3153089208c964346e2fc39cafad8d0b372f1154..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_enum.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- tests/test_enums.cpp -- enumerations
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-TEST_SUBMODULE(enums, m) {
- // test_unscoped_enum
- enum UnscopedEnum {
- EOne = 1,
- ETwo,
- EThree
- };
- py::enum_<UnscopedEnum>(m, "UnscopedEnum", py::arithmetic(), "An unscoped enumeration")
- .value("EOne", EOne, "Docstring for EOne")
- .value("ETwo", ETwo, "Docstring for ETwo")
- .value("EThree", EThree, "Docstring for EThree")
- .export_values();
-
- // test_scoped_enum
- enum class ScopedEnum {
- Two = 2,
- Three
- };
- py::enum_<ScopedEnum>(m, "ScopedEnum", py::arithmetic())
- .value("Two", ScopedEnum::Two)
- .value("Three", ScopedEnum::Three);
-
- m.def("test_scoped_enum", [](ScopedEnum z) {
- return "ScopedEnum::" + std::string(z == ScopedEnum::Two ? "Two" : "Three");
- });
-
- // test_binary_operators
- enum Flags {
- Read = 4,
- Write = 2,
- Execute = 1
- };
- py::enum_<Flags>(m, "Flags", py::arithmetic())
- .value("Read", Flags::Read)
- .value("Write", Flags::Write)
- .value("Execute", Flags::Execute)
- .export_values();
-
- // test_implicit_conversion
- class ClassWithUnscopedEnum {
- public:
- enum EMode {
- EFirstMode = 1,
- ESecondMode
- };
-
- static EMode test_function(EMode mode) {
- return mode;
- }
- };
- py::class_<ClassWithUnscopedEnum> exenum_class(m, "ClassWithUnscopedEnum");
- exenum_class.def_static("test_function", &ClassWithUnscopedEnum::test_function);
- py::enum_<ClassWithUnscopedEnum::EMode>(exenum_class, "EMode")
- .value("EFirstMode", ClassWithUnscopedEnum::EFirstMode)
- .value("ESecondMode", ClassWithUnscopedEnum::ESecondMode)
- .export_values();
-
- // test_enum_to_int
- m.def("test_enum_to_int", [](int) { });
- m.def("test_enum_to_uint", [](uint32_t) { });
- m.def("test_enum_to_long_long", [](long long) { });
-
- // test_duplicate_enum_name
- enum SimpleEnum
- {
- ONE, TWO, THREE
- };
-
- m.def("register_bad_enum", [m]() {
- py::enum_<SimpleEnum>(m, "SimpleEnum")
- .value("ONE", SimpleEnum::ONE) //NOTE: all value function calls are called with the same first parameter value
- .value("ONE", SimpleEnum::TWO)
- .value("ONE", SimpleEnum::THREE)
- .export_values();
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_enum.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_enum.py
deleted file mode 100644
index 385fbbc9ebc4044d70570e025fdd4978c05d573d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_enum.py
+++ /dev/null
@@ -1,220 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-from pybind11_tests import enums as m
-
-
-def test_unscoped_enum():
- assert str(m.UnscopedEnum.EOne) == "UnscopedEnum.EOne"
- assert str(m.UnscopedEnum.ETwo) == "UnscopedEnum.ETwo"
- assert str(m.EOne) == "UnscopedEnum.EOne"
- assert repr(m.UnscopedEnum.EOne) == "<UnscopedEnum.EOne: 1>"
- assert repr(m.UnscopedEnum.ETwo) == "<UnscopedEnum.ETwo: 2>"
- assert repr(m.EOne) == "<UnscopedEnum.EOne: 1>"
-
- # name property
- assert m.UnscopedEnum.EOne.name == "EOne"
- assert m.UnscopedEnum.ETwo.name == "ETwo"
- assert m.EOne.name == "EOne"
- # name readonly
- with pytest.raises(AttributeError):
- m.UnscopedEnum.EOne.name = ""
- # name returns a copy
- foo = m.UnscopedEnum.EOne.name
- foo = "bar"
- assert m.UnscopedEnum.EOne.name == "EOne"
-
- # __members__ property
- assert m.UnscopedEnum.__members__ == {
- "EOne": m.UnscopedEnum.EOne,
- "ETwo": m.UnscopedEnum.ETwo,
- "EThree": m.UnscopedEnum.EThree,
- }
- # __members__ readonly
- with pytest.raises(AttributeError):
- m.UnscopedEnum.__members__ = {}
- # __members__ returns a copy
- foo = m.UnscopedEnum.__members__
- foo["bar"] = "baz"
- assert m.UnscopedEnum.__members__ == {
- "EOne": m.UnscopedEnum.EOne,
- "ETwo": m.UnscopedEnum.ETwo,
- "EThree": m.UnscopedEnum.EThree,
- }
-
- for docstring_line in """An unscoped enumeration
-
-Members:
-
- EOne : Docstring for EOne
-
- ETwo : Docstring for ETwo
-
- EThree : Docstring for EThree""".split(
- "\n"
- ):
- assert docstring_line in m.UnscopedEnum.__doc__
-
- # Unscoped enums will accept ==/!= int comparisons
- y = m.UnscopedEnum.ETwo
- assert y == 2
- assert 2 == y
- assert y != 3
- assert 3 != y
- # Compare with None
- assert y != None # noqa: E711
- assert not (y == None) # noqa: E711
- # Compare with an object
- assert y != object()
- assert not (y == object())
- # Compare with string
- assert y != "2"
- assert "2" != y
- assert not ("2" == y)
- assert not (y == "2")
-
- with pytest.raises(TypeError):
- y < object()
-
- with pytest.raises(TypeError):
- y <= object()
-
- with pytest.raises(TypeError):
- y > object()
-
- with pytest.raises(TypeError):
- y >= object()
-
- with pytest.raises(TypeError):
- y | object()
-
- with pytest.raises(TypeError):
- y & object()
-
- with pytest.raises(TypeError):
- y ^ object()
-
- assert int(m.UnscopedEnum.ETwo) == 2
- assert str(m.UnscopedEnum(2)) == "UnscopedEnum.ETwo"
-
- # order
- assert m.UnscopedEnum.EOne < m.UnscopedEnum.ETwo
- assert m.UnscopedEnum.EOne < 2
- assert m.UnscopedEnum.ETwo > m.UnscopedEnum.EOne
- assert m.UnscopedEnum.ETwo > 1
- assert m.UnscopedEnum.ETwo <= 2
- assert m.UnscopedEnum.ETwo >= 2
- assert m.UnscopedEnum.EOne <= m.UnscopedEnum.ETwo
- assert m.UnscopedEnum.EOne <= 2
- assert m.UnscopedEnum.ETwo >= m.UnscopedEnum.EOne
- assert m.UnscopedEnum.ETwo >= 1
- assert not (m.UnscopedEnum.ETwo < m.UnscopedEnum.EOne)
- assert not (2 < m.UnscopedEnum.EOne)
-
- # arithmetic
- assert m.UnscopedEnum.EOne & m.UnscopedEnum.EThree == m.UnscopedEnum.EOne
- assert m.UnscopedEnum.EOne | m.UnscopedEnum.ETwo == m.UnscopedEnum.EThree
- assert m.UnscopedEnum.EOne ^ m.UnscopedEnum.EThree == m.UnscopedEnum.ETwo
-
-
-def test_scoped_enum():
- assert m.test_scoped_enum(m.ScopedEnum.Three) == "ScopedEnum::Three"
- z = m.ScopedEnum.Two
- assert m.test_scoped_enum(z) == "ScopedEnum::Two"
-
- # Scoped enums will *NOT* accept ==/!= int comparisons (Will always return False)
- assert not z == 3
- assert not 3 == z
- assert z != 3
- assert 3 != z
- # Compare with None
- assert z != None # noqa: E711
- assert not (z == None) # noqa: E711
- # Compare with an object
- assert z != object()
- assert not (z == object())
- # Scoped enums will *NOT* accept >, <, >= and <= int comparisons (Will throw exceptions)
- with pytest.raises(TypeError):
- z > 3
- with pytest.raises(TypeError):
- z < 3
- with pytest.raises(TypeError):
- z >= 3
- with pytest.raises(TypeError):
- z <= 3
-
- # order
- assert m.ScopedEnum.Two < m.ScopedEnum.Three
- assert m.ScopedEnum.Three > m.ScopedEnum.Two
- assert m.ScopedEnum.Two <= m.ScopedEnum.Three
- assert m.ScopedEnum.Two <= m.ScopedEnum.Two
- assert m.ScopedEnum.Two >= m.ScopedEnum.Two
- assert m.ScopedEnum.Three >= m.ScopedEnum.Two
-
-
-def test_implicit_conversion():
- assert str(m.ClassWithUnscopedEnum.EMode.EFirstMode) == "EMode.EFirstMode"
- assert str(m.ClassWithUnscopedEnum.EFirstMode) == "EMode.EFirstMode"
- assert repr(m.ClassWithUnscopedEnum.EMode.EFirstMode) == "<EMode.EFirstMode: 1>"
- assert repr(m.ClassWithUnscopedEnum.EFirstMode) == "<EMode.EFirstMode: 1>"
-
- f = m.ClassWithUnscopedEnum.test_function
- first = m.ClassWithUnscopedEnum.EFirstMode
- second = m.ClassWithUnscopedEnum.ESecondMode
-
- assert f(first) == 1
-
- assert f(first) == f(first)
- assert not f(first) != f(first)
-
- assert f(first) != f(second)
- assert not f(first) == f(second)
-
- assert f(first) == int(f(first))
- assert not f(first) != int(f(first))
-
- assert f(first) != int(f(second))
- assert not f(first) == int(f(second))
-
- # noinspection PyDictCreation
- x = {f(first): 1, f(second): 2}
- x[f(first)] = 3
- x[f(second)] = 4
- # Hashing test
- assert repr(x) == "{<EMode.EFirstMode: 1>: 3, <EMode.ESecondMode: 2>: 4}"
-
-
-def test_binary_operators():
- assert int(m.Flags.Read) == 4
- assert int(m.Flags.Write) == 2
- assert int(m.Flags.Execute) == 1
- assert int(m.Flags.Read | m.Flags.Write | m.Flags.Execute) == 7
- assert int(m.Flags.Read | m.Flags.Write) == 6
- assert int(m.Flags.Read | m.Flags.Execute) == 5
- assert int(m.Flags.Write | m.Flags.Execute) == 3
- assert int(m.Flags.Write | 1) == 3
- assert ~m.Flags.Write == -3
-
- state = m.Flags.Read | m.Flags.Write
- assert (state & m.Flags.Read) != 0
- assert (state & m.Flags.Write) != 0
- assert (state & m.Flags.Execute) == 0
- assert (state & 1) == 0
-
- state2 = ~state
- assert state2 == -7
- assert int(state ^ state2) == -1
-
-
-def test_enum_to_int():
- m.test_enum_to_int(m.Flags.Read)
- m.test_enum_to_int(m.ClassWithUnscopedEnum.EMode.EFirstMode)
- m.test_enum_to_uint(m.Flags.Read)
- m.test_enum_to_uint(m.ClassWithUnscopedEnum.EMode.EFirstMode)
- m.test_enum_to_long_long(m.Flags.Read)
- m.test_enum_to_long_long(m.ClassWithUnscopedEnum.EMode.EFirstMode)
-
-
-def test_duplicate_enum_name():
- with pytest.raises(ValueError) as excinfo:
- m.register_bad_enum()
- assert str(excinfo.value) == 'SimpleEnum: element "ONE" already exists!'
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eval.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_eval.cpp
deleted file mode 100644
index 03d0fb366620c7890dc40f554c38bbe0b5fb4b58..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eval.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- tests/test_eval.cpp -- Usage of eval() and eval_file()
-
- Copyright (c) 2016 Klemens D. Morgenstern
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-
-#include <pybind11/eval.h>
-#include "pybind11_tests.h"
-
-TEST_SUBMODULE(eval_, m) {
- // test_evals
-
- auto global = py::dict(py::module_::import("__main__").attr("__dict__"));
-
- m.def("test_eval_statements", [global]() {
- auto local = py::dict();
- local["call_test"] = py::cpp_function([&]() -> int {
- return 42;
- });
-
- // Regular string literal
- py::exec(
- "message = 'Hello World!'\n"
- "x = call_test()",
- global, local
- );
-
- // Multi-line raw string literal
- py::exec(R"(
- if x == 42:
- print(message)
- else:
- raise RuntimeError
- )", global, local
- );
- auto x = local["x"].cast<int>();
-
- return x == 42;
- });
-
- m.def("test_eval", [global]() {
- auto local = py::dict();
- local["x"] = py::int_(42);
- auto x = py::eval("x", global, local);
- return x.cast<int>() == 42;
- });
-
- m.def("test_eval_single_statement", []() {
- auto local = py::dict();
- local["call_test"] = py::cpp_function([&]() -> int {
- return 42;
- });
-
- auto result = py::eval<py::eval_single_statement>("x = call_test()", py::dict(), local);
- auto x = local["x"].cast<int>();
- return result.is_none() && x == 42;
- });
-
- m.def("test_eval_file", [global](py::str filename) {
- auto local = py::dict();
- local["y"] = py::int_(43);
-
- int val_out;
- local["call_test2"] = py::cpp_function([&](int value) { val_out = value; });
-
- auto result = py::eval_file(filename, global, local);
- return val_out == 43 && result.is_none();
- });
-
- m.def("test_eval_failure", []() {
- try {
- py::eval("nonsense code ...");
- } catch (py::error_already_set &) {
- return true;
- }
- return false;
- });
-
- m.def("test_eval_file_failure", []() {
- try {
- py::eval_file("non-existing file");
- } catch (std::exception &) {
- return true;
- }
- return false;
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eval.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_eval.py
deleted file mode 100644
index b6f9d1881db8d3154c73226414fa87f257a20bc8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eval.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import eval_ as m
-
-
-def test_evals(capture):
- with capture:
- assert m.test_eval_statements()
- assert capture == "Hello World!"
-
- assert m.test_eval()
- assert m.test_eval_single_statement()
-
- assert m.test_eval_failure()
-
-
-@pytest.mark.xfail("env.PYPY and not env.PY2", raises=RuntimeError)
-def test_eval_file():
- filename = os.path.join(os.path.dirname(__file__), "test_eval_call.py")
- assert m.test_eval_file(filename)
-
- assert m.test_eval_file_failure()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eval_call.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_eval_call.py
deleted file mode 100644
index 373b67bac8e6c0d5659b3ae508fd50c296e460e6..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_eval_call.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-# This file is called from 'test_eval.py'
-
-if "call_test2" in locals():
- call_test2(y) # noqa: F821 undefined name
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_exceptions.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_exceptions.cpp
deleted file mode 100644
index b95ff478054a808a142aea174b966b00048c8be1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_exceptions.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- tests/test_custom-exceptions.cpp -- exception translation
-
- Copyright (c) 2016 Pim Schellart <P.Schellart@princeton.edu>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-// A type that should be raised as an exception in Python
-class MyException : public std::exception {
-public:
- explicit MyException(const char * m) : message{m} {}
- const char * what() const noexcept override {return message.c_str();}
-private:
- std::string message = "";
-};
-
-// A type that should be translated to a standard Python exception
-class MyException2 : public std::exception {
-public:
- explicit MyException2(const char * m) : message{m} {}
- const char * what() const noexcept override {return message.c_str();}
-private:
- std::string message = "";
-};
-
-// A type that is not derived from std::exception (and is thus unknown)
-class MyException3 {
-public:
- explicit MyException3(const char * m) : message{m} {}
- virtual const char * what() const noexcept {return message.c_str();}
-private:
- std::string message = "";
-};
-
-// A type that should be translated to MyException
-// and delegated to its exception translator
-class MyException4 : public std::exception {
-public:
- explicit MyException4(const char * m) : message{m} {}
- const char * what() const noexcept override {return message.c_str();}
-private:
- std::string message = "";
-};
-
-
-// Like the above, but declared via the helper function
-class MyException5 : public std::logic_error {
-public:
- explicit MyException5(const std::string &what) : std::logic_error(what) {}
-};
-
-// Inherits from MyException5
-class MyException5_1 : public MyException5 {
- using MyException5::MyException5;
-};
-
-struct PythonCallInDestructor {
- PythonCallInDestructor(const py::dict &d) : d(d) {}
- ~PythonCallInDestructor() { d["good"] = true; }
-
- py::dict d;
-};
-
-
-
-struct PythonAlreadySetInDestructor {
- PythonAlreadySetInDestructor(const py::str &s) : s(s) {}
- ~PythonAlreadySetInDestructor() {
- py::dict foo;
- try {
- // Assign to a py::object to force read access of nonexistent dict entry
- py::object o = foo["bar"];
- }
- catch (py::error_already_set& ex) {
- ex.discard_as_unraisable(s);
- }
- }
-
- py::str s;
-};
-
-
-TEST_SUBMODULE(exceptions, m) {
- m.def("throw_std_exception", []() {
- throw std::runtime_error("This exception was intentionally thrown.");
- });
-
- // make a new custom exception and use it as a translation target
- static py::exception<MyException> ex(m, "MyException");
- py::register_exception_translator([](std::exception_ptr p) {
- try {
- if (p) std::rethrow_exception(p);
- } catch (const MyException &e) {
- // Set MyException as the active python error
- ex(e.what());
- }
- });
-
- // register new translator for MyException2
- // no need to store anything here because this type will
- // never by visible from Python
- py::register_exception_translator([](std::exception_ptr p) {
- try {
- if (p) std::rethrow_exception(p);
- } catch (const MyException2 &e) {
- // Translate this exception to a standard RuntimeError
- PyErr_SetString(PyExc_RuntimeError, e.what());
- }
- });
-
- // register new translator for MyException4
- // which will catch it and delegate to the previously registered
- // translator for MyException by throwing a new exception
- py::register_exception_translator([](std::exception_ptr p) {
- try {
- if (p) std::rethrow_exception(p);
- } catch (const MyException4 &e) {
- throw MyException(e.what());
- }
- });
-
- // A simple exception translation:
- auto ex5 = py::register_exception<MyException5>(m, "MyException5");
- // A slightly more complicated one that declares MyException5_1 as a subclass of MyException5
- py::register_exception<MyException5_1>(m, "MyException5_1", ex5.ptr());
-
- m.def("throws1", []() { throw MyException("this error should go to a custom type"); });
- m.def("throws2", []() { throw MyException2("this error should go to a standard Python exception"); });
- m.def("throws3", []() { throw MyException3("this error cannot be translated"); });
- m.def("throws4", []() { throw MyException4("this error is rethrown"); });
- m.def("throws5", []() { throw MyException5("this is a helper-defined translated exception"); });
- m.def("throws5_1", []() { throw MyException5_1("MyException5 subclass"); });
- m.def("throws_logic_error", []() { throw std::logic_error("this error should fall through to the standard handler"); });
- m.def("throws_overflow_error", []() {throw std::overflow_error(""); });
- m.def("exception_matches", []() {
- py::dict foo;
- try {
- // Assign to a py::object to force read access of nonexistent dict entry
- py::object o = foo["bar"];
- }
- catch (py::error_already_set& ex) {
- if (!ex.matches(PyExc_KeyError)) throw;
- return true;
- }
- return false;
- });
- m.def("exception_matches_base", []() {
- py::dict foo;
- try {
- // Assign to a py::object to force read access of nonexistent dict entry
- py::object o = foo["bar"];
- }
- catch (py::error_already_set &ex) {
- if (!ex.matches(PyExc_Exception)) throw;
- return true;
- }
- return false;
- });
- m.def("modulenotfound_exception_matches_base", []() {
- try {
- // On Python >= 3.6, this raises a ModuleNotFoundError, a subclass of ImportError
- py::module_::import("nonexistent");
- }
- catch (py::error_already_set &ex) {
- if (!ex.matches(PyExc_ImportError)) throw;
- return true;
- }
- return false;
- });
-
- m.def("throw_already_set", [](bool err) {
- if (err)
- PyErr_SetString(PyExc_ValueError, "foo");
- try {
- throw py::error_already_set();
- } catch (const std::runtime_error& e) {
- if ((err && e.what() != std::string("ValueError: foo")) ||
- (!err && e.what() != std::string("Unknown internal error occurred")))
- {
- PyErr_Clear();
- throw std::runtime_error("error message mismatch");
- }
- }
- PyErr_Clear();
- if (err)
- PyErr_SetString(PyExc_ValueError, "foo");
- throw py::error_already_set();
- });
-
- m.def("python_call_in_destructor", [](py::dict d) {
- try {
- PythonCallInDestructor set_dict_in_destructor(d);
- PyErr_SetString(PyExc_ValueError, "foo");
- throw py::error_already_set();
- } catch (const py::error_already_set&) {
- return true;
- }
- return false;
- });
-
- m.def("python_alreadyset_in_destructor", [](py::str s) {
- PythonAlreadySetInDestructor alreadyset_in_destructor(s);
- return true;
- });
-
- // test_nested_throws
- m.def("try_catch", [m](py::object exc_type, py::function f, py::args args) {
- try { f(*args); }
- catch (py::error_already_set &ex) {
- if (ex.matches(exc_type))
- py::print(ex.what());
- else
- throw;
- }
- });
-
- // Test repr that cannot be displayed
- m.def("simple_bool_passthrough", [](bool x) {return x;});
-
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_exceptions.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_exceptions.py
deleted file mode 100644
index 95eac70928c21893bc43292e1a2d5eab5c08b703..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_exceptions.py
+++ /dev/null
@@ -1,198 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys
-
-import pytest
-
-from pybind11_tests import exceptions as m
-import pybind11_cross_module_tests as cm
-
-
-def test_std_exception(msg):
- with pytest.raises(RuntimeError) as excinfo:
- m.throw_std_exception()
- assert msg(excinfo.value) == "This exception was intentionally thrown."
-
-
-def test_error_already_set(msg):
- with pytest.raises(RuntimeError) as excinfo:
- m.throw_already_set(False)
- assert msg(excinfo.value) == "Unknown internal error occurred"
-
- with pytest.raises(ValueError) as excinfo:
- m.throw_already_set(True)
- assert msg(excinfo.value) == "foo"
-
-
-def test_cross_module_exceptions():
- with pytest.raises(RuntimeError) as excinfo:
- cm.raise_runtime_error()
- assert str(excinfo.value) == "My runtime error"
-
- with pytest.raises(ValueError) as excinfo:
- cm.raise_value_error()
- assert str(excinfo.value) == "My value error"
-
- with pytest.raises(ValueError) as excinfo:
- cm.throw_pybind_value_error()
- assert str(excinfo.value) == "pybind11 value error"
-
- with pytest.raises(TypeError) as excinfo:
- cm.throw_pybind_type_error()
- assert str(excinfo.value) == "pybind11 type error"
-
- with pytest.raises(StopIteration) as excinfo:
- cm.throw_stop_iteration()
-
-
-def test_python_call_in_catch():
- d = {}
- assert m.python_call_in_destructor(d) is True
- assert d["good"] is True
-
-
-def test_python_alreadyset_in_destructor(monkeypatch, capsys):
- hooked = False
- triggered = [False] # mutable, so Python 2.7 closure can modify it
-
- if hasattr(sys, "unraisablehook"): # Python 3.8+
- hooked = True
- default_hook = sys.unraisablehook
-
- def hook(unraisable_hook_args):
- exc_type, exc_value, exc_tb, err_msg, obj = unraisable_hook_args
- if obj == "already_set demo":
- triggered[0] = True
- default_hook(unraisable_hook_args)
- return
-
- # Use monkeypatch so pytest can apply and remove the patch as appropriate
- monkeypatch.setattr(sys, "unraisablehook", hook)
-
- assert m.python_alreadyset_in_destructor("already_set demo") is True
- if hooked:
- assert triggered[0] is True
-
- _, captured_stderr = capsys.readouterr()
- # Error message is different in Python 2 and 3, check for words that appear in both
- assert "ignored" in captured_stderr and "already_set demo" in captured_stderr
-
-
-def test_exception_matches():
- assert m.exception_matches()
- assert m.exception_matches_base()
- assert m.modulenotfound_exception_matches_base()
-
-
-def test_custom(msg):
- # Can we catch a MyException?
- with pytest.raises(m.MyException) as excinfo:
- m.throws1()
- assert msg(excinfo.value) == "this error should go to a custom type"
-
- # Can we translate to standard Python exceptions?
- with pytest.raises(RuntimeError) as excinfo:
- m.throws2()
- assert msg(excinfo.value) == "this error should go to a standard Python exception"
-
- # Can we handle unknown exceptions?
- with pytest.raises(RuntimeError) as excinfo:
- m.throws3()
- assert msg(excinfo.value) == "Caught an unknown exception!"
-
- # Can we delegate to another handler by rethrowing?
- with pytest.raises(m.MyException) as excinfo:
- m.throws4()
- assert msg(excinfo.value) == "this error is rethrown"
-
- # Can we fall-through to the default handler?
- with pytest.raises(RuntimeError) as excinfo:
- m.throws_logic_error()
- assert (
- msg(excinfo.value) == "this error should fall through to the standard handler"
- )
-
- # OverFlow error translation.
- with pytest.raises(OverflowError) as excinfo:
- m.throws_overflow_error()
-
- # Can we handle a helper-declared exception?
- with pytest.raises(m.MyException5) as excinfo:
- m.throws5()
- assert msg(excinfo.value) == "this is a helper-defined translated exception"
-
- # Exception subclassing:
- with pytest.raises(m.MyException5) as excinfo:
- m.throws5_1()
- assert msg(excinfo.value) == "MyException5 subclass"
- assert isinstance(excinfo.value, m.MyException5_1)
-
- with pytest.raises(m.MyException5_1) as excinfo:
- m.throws5_1()
- assert msg(excinfo.value) == "MyException5 subclass"
-
- with pytest.raises(m.MyException5) as excinfo:
- try:
- m.throws5()
- except m.MyException5_1:
- raise RuntimeError("Exception error: caught child from parent")
- assert msg(excinfo.value) == "this is a helper-defined translated exception"
-
-
-def test_nested_throws(capture):
- """Tests nested (e.g. C++ -> Python -> C++) exception handling"""
-
- def throw_myex():
- raise m.MyException("nested error")
-
- def throw_myex5():
- raise m.MyException5("nested error 5")
-
- # In the comments below, the exception is caught in the first step, thrown in the last step
-
- # C++ -> Python
- with capture:
- m.try_catch(m.MyException5, throw_myex5)
- assert str(capture).startswith("MyException5: nested error 5")
-
- # Python -> C++ -> Python
- with pytest.raises(m.MyException) as excinfo:
- m.try_catch(m.MyException5, throw_myex)
- assert str(excinfo.value) == "nested error"
-
- def pycatch(exctype, f, *args):
- try:
- f(*args)
- except m.MyException as e:
- print(e)
-
- # C++ -> Python -> C++ -> Python
- with capture:
- m.try_catch(
- m.MyException5,
- pycatch,
- m.MyException,
- m.try_catch,
- m.MyException,
- throw_myex5,
- )
- assert str(capture).startswith("MyException5: nested error 5")
-
- # C++ -> Python -> C++
- with capture:
- m.try_catch(m.MyException, pycatch, m.MyException5, m.throws4)
- assert capture == "this error is rethrown"
-
- # Python -> C++ -> Python -> C++
- with pytest.raises(m.MyException5) as excinfo:
- m.try_catch(m.MyException, pycatch, m.MyException, m.throws5)
- assert str(excinfo.value) == "this is a helper-defined translated exception"
-
-
-# This can often happen if you wrap a pybind11 class in a Python wrapper
-def test_invalid_repr():
- class MyRepr(object):
- def __repr__(self):
- raise AttributeError("Example error")
-
- with pytest.raises(TypeError):
- m.simple_bool_passthrough(MyRepr())
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_factory_constructors.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_factory_constructors.cpp
deleted file mode 100644
index f42d1f29b93580063271a6ce674cd49b77e9a43e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_factory_constructors.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- tests/test_factory_constructors.cpp -- tests construction from a factory function
- via py::init_factory()
-
- Copyright (c) 2017 Jason Rhinelander <jason@imaginary.ca>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <cmath>
-#include <new>
-
-// Classes for testing python construction via C++ factory function:
-// Not publicly constructible, copyable, or movable:
-class TestFactory1 {
- friend class TestFactoryHelper;
- TestFactory1() : value("(empty)") { print_default_created(this); }
- TestFactory1(int v) : value(std::to_string(v)) { print_created(this, value); }
- TestFactory1(std::string v) : value(std::move(v)) { print_created(this, value); }
- TestFactory1(TestFactory1 &&) = delete;
- TestFactory1(const TestFactory1 &) = delete;
- TestFactory1 &operator=(TestFactory1 &&) = delete;
- TestFactory1 &operator=(const TestFactory1 &) = delete;
-public:
- std::string value;
- ~TestFactory1() { print_destroyed(this); }
-};
-// Non-public construction, but moveable:
-class TestFactory2 {
- friend class TestFactoryHelper;
- TestFactory2() : value("(empty2)") { print_default_created(this); }
- TestFactory2(int v) : value(std::to_string(v)) { print_created(this, value); }
- TestFactory2(std::string v) : value(std::move(v)) { print_created(this, value); }
-public:
- TestFactory2(TestFactory2 &&m) { value = std::move(m.value); print_move_created(this); }
- TestFactory2 &operator=(TestFactory2 &&m) { value = std::move(m.value); print_move_assigned(this); return *this; }
- std::string value;
- ~TestFactory2() { print_destroyed(this); }
-};
-// Mixed direct/factory construction:
-class TestFactory3 {
-protected:
- friend class TestFactoryHelper;
- TestFactory3() : value("(empty3)") { print_default_created(this); }
- TestFactory3(int v) : value(std::to_string(v)) { print_created(this, value); }
-public:
- TestFactory3(std::string v) : value(std::move(v)) { print_created(this, value); }
- TestFactory3(TestFactory3 &&m) { value = std::move(m.value); print_move_created(this); }
- TestFactory3 &operator=(TestFactory3 &&m) { value = std::move(m.value); print_move_assigned(this); return *this; }
- std::string value;
- virtual ~TestFactory3() { print_destroyed(this); }
-};
-// Inheritance test
-class TestFactory4 : public TestFactory3 {
-public:
- TestFactory4() : TestFactory3() { print_default_created(this); }
- TestFactory4(int v) : TestFactory3(v) { print_created(this, v); }
- ~TestFactory4() override { print_destroyed(this); }
-};
-// Another class for an invalid downcast test
-class TestFactory5 : public TestFactory3 {
-public:
- TestFactory5(int i) : TestFactory3(i) { print_created(this, i); }
- ~TestFactory5() override { print_destroyed(this); }
-};
-
-class TestFactory6 {
-protected:
- int value;
- bool alias = false;
-public:
- TestFactory6(int i) : value{i} { print_created(this, i); }
- TestFactory6(TestFactory6 &&f) { print_move_created(this); value = f.value; alias = f.alias; }
- TestFactory6(const TestFactory6 &f) { print_copy_created(this); value = f.value; alias = f.alias; }
- virtual ~TestFactory6() { print_destroyed(this); }
- virtual int get() { return value; }
- bool has_alias() { return alias; }
-};
-class PyTF6 : public TestFactory6 {
-public:
- // Special constructor that allows the factory to construct a PyTF6 from a TestFactory6 only
- // when an alias is needed:
- PyTF6(TestFactory6 &&base) : TestFactory6(std::move(base)) { alias = true; print_created(this, "move", value); }
- PyTF6(int i) : TestFactory6(i) { alias = true; print_created(this, i); }
- PyTF6(PyTF6 &&f) : TestFactory6(std::move(f)) { print_move_created(this); }
- PyTF6(const PyTF6 &f) : TestFactory6(f) { print_copy_created(this); }
- PyTF6(std::string s) : TestFactory6((int) s.size()) { alias = true; print_created(this, s); }
- ~PyTF6() override { print_destroyed(this); }
- int get() override { PYBIND11_OVERRIDE(int, TestFactory6, get, /*no args*/); }
-};
-
-class TestFactory7 {
-protected:
- int value;
- bool alias = false;
-public:
- TestFactory7(int i) : value{i} { print_created(this, i); }
- TestFactory7(TestFactory7 &&f) { print_move_created(this); value = f.value; alias = f.alias; }
- TestFactory7(const TestFactory7 &f) { print_copy_created(this); value = f.value; alias = f.alias; }
- virtual ~TestFactory7() { print_destroyed(this); }
- virtual int get() { return value; }
- bool has_alias() { return alias; }
-};
-class PyTF7 : public TestFactory7 {
-public:
- PyTF7(int i) : TestFactory7(i) { alias = true; print_created(this, i); }
- PyTF7(PyTF7 &&f) : TestFactory7(std::move(f)) { print_move_created(this); }
- PyTF7(const PyTF7 &f) : TestFactory7(f) { print_copy_created(this); }
- ~PyTF7() override { print_destroyed(this); }
- int get() override { PYBIND11_OVERRIDE(int, TestFactory7, get, /*no args*/); }
-};
-
-
-class TestFactoryHelper {
-public:
- // Non-movable, non-copyable type:
- // Return via pointer:
- static TestFactory1 *construct1() { return new TestFactory1(); }
- // Holder:
- static std::unique_ptr<TestFactory1> construct1(int a) { return std::unique_ptr<TestFactory1>(new TestFactory1(a)); }
- // pointer again
- static TestFactory1 *construct1_string(std::string a) { return new TestFactory1(a); }
-
- // Moveable type:
- // pointer:
- static TestFactory2 *construct2() { return new TestFactory2(); }
- // holder:
- static std::unique_ptr<TestFactory2> construct2(int a) { return std::unique_ptr<TestFactory2>(new TestFactory2(a)); }
- // by value moving:
- static TestFactory2 construct2(std::string a) { return TestFactory2(a); }
-
- // shared_ptr holder type:
- // pointer:
- static TestFactory3 *construct3() { return new TestFactory3(); }
- // holder:
- static std::shared_ptr<TestFactory3> construct3(int a) { return std::shared_ptr<TestFactory3>(new TestFactory3(a)); }
-};
-
-TEST_SUBMODULE(factory_constructors, m) {
-
- // Define various trivial types to allow simpler overload resolution:
- py::module_ m_tag = m.def_submodule("tag");
-#define MAKE_TAG_TYPE(Name) \
- struct Name##_tag {}; \
- py::class_<Name##_tag>(m_tag, #Name "_tag").def(py::init<>()); \
- m_tag.attr(#Name) = py::cast(Name##_tag{})
- MAKE_TAG_TYPE(pointer);
- MAKE_TAG_TYPE(unique_ptr);
- MAKE_TAG_TYPE(move);
- MAKE_TAG_TYPE(shared_ptr);
- MAKE_TAG_TYPE(derived);
- MAKE_TAG_TYPE(TF4);
- MAKE_TAG_TYPE(TF5);
- MAKE_TAG_TYPE(null_ptr);
- MAKE_TAG_TYPE(null_unique_ptr);
- MAKE_TAG_TYPE(null_shared_ptr);
- MAKE_TAG_TYPE(base);
- MAKE_TAG_TYPE(invalid_base);
- MAKE_TAG_TYPE(alias);
- MAKE_TAG_TYPE(unaliasable);
- MAKE_TAG_TYPE(mixed);
-
- // test_init_factory_basic, test_bad_type
- py::class_<TestFactory1>(m, "TestFactory1")
- .def(py::init([](unique_ptr_tag, int v) { return TestFactoryHelper::construct1(v); }))
- .def(py::init(&TestFactoryHelper::construct1_string)) // raw function pointer
- .def(py::init([](pointer_tag) { return TestFactoryHelper::construct1(); }))
- .def(py::init([](py::handle, int v, py::handle) { return TestFactoryHelper::construct1(v); }))
- .def_readwrite("value", &TestFactory1::value)
- ;
- py::class_<TestFactory2>(m, "TestFactory2")
- .def(py::init([](pointer_tag, int v) { return TestFactoryHelper::construct2(v); }))
- .def(py::init([](unique_ptr_tag, std::string v) { return TestFactoryHelper::construct2(v); }))
- .def(py::init([](move_tag) { return TestFactoryHelper::construct2(); }))
- .def_readwrite("value", &TestFactory2::value)
- ;
-
- // Stateful & reused:
- int c = 1;
- auto c4a = [c](pointer_tag, TF4_tag, int a) { (void) c; return new TestFactory4(a);};
-
- // test_init_factory_basic, test_init_factory_casting
- py::class_<TestFactory3, std::shared_ptr<TestFactory3>>(m, "TestFactory3")
- .def(py::init([](pointer_tag, int v) { return TestFactoryHelper::construct3(v); }))
- .def(py::init([](shared_ptr_tag) { return TestFactoryHelper::construct3(); }))
- .def("__init__", [](TestFactory3 &self, std::string v) { new (&self) TestFactory3(v); }) // placement-new ctor
-
- // factories returning a derived type:
- .def(py::init(c4a)) // derived ptr
- .def(py::init([](pointer_tag, TF5_tag, int a) { return new TestFactory5(a); }))
- // derived shared ptr:
- .def(py::init([](shared_ptr_tag, TF4_tag, int a) { return std::make_shared<TestFactory4>(a); }))
- .def(py::init([](shared_ptr_tag, TF5_tag, int a) { return std::make_shared<TestFactory5>(a); }))
-
- // Returns nullptr:
- .def(py::init([](null_ptr_tag) { return (TestFactory3 *) nullptr; }))
- .def(py::init([](null_unique_ptr_tag) { return std::unique_ptr<TestFactory3>(); }))
- .def(py::init([](null_shared_ptr_tag) { return std::shared_ptr<TestFactory3>(); }))
-
- .def_readwrite("value", &TestFactory3::value)
- ;
-
- // test_init_factory_casting
- py::class_<TestFactory4, TestFactory3, std::shared_ptr<TestFactory4>>(m, "TestFactory4")
- .def(py::init(c4a)) // pointer
- ;
-
- // Doesn't need to be registered, but registering makes getting ConstructorStats easier:
- py::class_<TestFactory5, TestFactory3, std::shared_ptr<TestFactory5>>(m, "TestFactory5");
-
- // test_init_factory_alias
- // Alias testing
- py::class_<TestFactory6, PyTF6>(m, "TestFactory6")
- .def(py::init([](base_tag, int i) { return TestFactory6(i); }))
- .def(py::init([](alias_tag, int i) { return PyTF6(i); }))
- .def(py::init([](alias_tag, std::string s) { return PyTF6(s); }))
- .def(py::init([](alias_tag, pointer_tag, int i) { return new PyTF6(i); }))
- .def(py::init([](base_tag, pointer_tag, int i) { return new TestFactory6(i); }))
- .def(py::init([](base_tag, alias_tag, pointer_tag, int i) { return (TestFactory6 *) new PyTF6(i); }))
-
- .def("get", &TestFactory6::get)
- .def("has_alias", &TestFactory6::has_alias)
-
- .def_static("get_cstats", &ConstructorStats::get<TestFactory6>, py::return_value_policy::reference)
- .def_static("get_alias_cstats", &ConstructorStats::get<PyTF6>, py::return_value_policy::reference)
- ;
-
- // test_init_factory_dual
- // Separate alias constructor testing
- py::class_<TestFactory7, PyTF7, std::shared_ptr<TestFactory7>>(m, "TestFactory7")
- .def(py::init(
- [](int i) { return TestFactory7(i); },
- [](int i) { return PyTF7(i); }))
- .def(py::init(
- [](pointer_tag, int i) { return new TestFactory7(i); },
- [](pointer_tag, int i) { return new PyTF7(i); }))
- .def(py::init(
- [](mixed_tag, int i) { return new TestFactory7(i); },
- [](mixed_tag, int i) { return PyTF7(i); }))
- .def(py::init(
- [](mixed_tag, std::string s) { return TestFactory7((int) s.size()); },
- [](mixed_tag, std::string s) { return new PyTF7((int) s.size()); }))
- .def(py::init(
- [](base_tag, pointer_tag, int i) { return new TestFactory7(i); },
- [](base_tag, pointer_tag, int i) { return (TestFactory7 *) new PyTF7(i); }))
- .def(py::init(
- [](alias_tag, pointer_tag, int i) { return new PyTF7(i); },
- [](alias_tag, pointer_tag, int i) { return new PyTF7(10*i); }))
- .def(py::init(
- [](shared_ptr_tag, base_tag, int i) { return std::make_shared<TestFactory7>(i); },
- [](shared_ptr_tag, base_tag, int i) { auto *p = new PyTF7(i); return std::shared_ptr<TestFactory7>(p); }))
- .def(py::init(
- [](shared_ptr_tag, invalid_base_tag, int i) { return std::make_shared<TestFactory7>(i); },
- [](shared_ptr_tag, invalid_base_tag, int i) { return std::make_shared<TestFactory7>(i); })) // <-- invalid alias factory
-
- .def("get", &TestFactory7::get)
- .def("has_alias", &TestFactory7::has_alias)
-
- .def_static("get_cstats", &ConstructorStats::get<TestFactory7>, py::return_value_policy::reference)
- .def_static("get_alias_cstats", &ConstructorStats::get<PyTF7>, py::return_value_policy::reference)
- ;
-
- // test_placement_new_alternative
- // Class with a custom new operator but *without* a placement new operator (issue #948)
- class NoPlacementNew {
- public:
- NoPlacementNew(int i) : i(i) { }
- static void *operator new(std::size_t s) {
- auto *p = ::operator new(s);
- py::print("operator new called, returning", reinterpret_cast<uintptr_t>(p));
- return p;
- }
- static void operator delete(void *p) {
- py::print("operator delete called on", reinterpret_cast<uintptr_t>(p));
- ::operator delete(p);
- }
- int i;
- };
- // As of 2.2, `py::init<args>` no longer requires placement new
- py::class_<NoPlacementNew>(m, "NoPlacementNew")
- .def(py::init<int>())
- .def(py::init([]() { return new NoPlacementNew(100); }))
- .def_readwrite("i", &NoPlacementNew::i)
- ;
-
-
- // test_reallocations
- // Class that has verbose operator_new/operator_delete calls
- struct NoisyAlloc {
- NoisyAlloc(const NoisyAlloc &) = default;
- NoisyAlloc(int i) { py::print(py::str("NoisyAlloc(int {})").format(i)); }
- NoisyAlloc(double d) { py::print(py::str("NoisyAlloc(double {})").format(d)); }
- ~NoisyAlloc() { py::print("~NoisyAlloc()"); }
-
- static void *operator new(size_t s) { py::print("noisy new"); return ::operator new(s); }
- static void *operator new(size_t, void *p) { py::print("noisy placement new"); return p; }
- static void operator delete(void *p, size_t) { py::print("noisy delete"); ::operator delete(p); }
- static void operator delete(void *, void *) { py::print("noisy placement delete"); }
-#if defined(_MSC_VER) && _MSC_VER < 1910
- // MSVC 2015 bug: the above "noisy delete" isn't invoked (fixed in MSVC 2017)
- static void operator delete(void *p) { py::print("noisy delete"); ::operator delete(p); }
-#endif
- };
- py::class_<NoisyAlloc>(m, "NoisyAlloc")
- // Since these overloads have the same number of arguments, the dispatcher will try each of
- // them until the arguments convert. Thus we can get a pre-allocation here when passing a
- // single non-integer:
- .def("__init__", [](NoisyAlloc *a, int i) { new (a) NoisyAlloc(i); }) // Regular constructor, runs first, requires preallocation
- .def(py::init([](double d) { return new NoisyAlloc(d); }))
-
- // The two-argument version: first the factory pointer overload.
- .def(py::init([](int i, int) { return new NoisyAlloc(i); }))
- // Return-by-value:
- .def(py::init([](double d, int) { return NoisyAlloc(d); }))
- // Old-style placement new init; requires preallocation
- .def("__init__", [](NoisyAlloc &a, double d, double) { new (&a) NoisyAlloc(d); })
- // Requires deallocation of previous overload preallocated value:
- .def(py::init([](int i, double) { return new NoisyAlloc(i); }))
- // Regular again: requires yet another preallocation
- .def("__init__", [](NoisyAlloc &a, int i, std::string) { new (&a) NoisyAlloc(i); })
- ;
-
-
-
-
- // static_assert testing (the following def's should all fail with appropriate compilation errors):
-#if 0
- struct BadF1Base {};
- struct BadF1 : BadF1Base {};
- struct PyBadF1 : BadF1 {};
- py::class_<BadF1, PyBadF1, std::shared_ptr<BadF1>> bf1(m, "BadF1");
- // wrapped factory function must return a compatible pointer, holder, or value
- bf1.def(py::init([]() { return 3; }));
- // incompatible factory function pointer return type
- bf1.def(py::init([]() { static int three = 3; return &three; }));
- // incompatible factory function std::shared_ptr<T> return type: cannot convert shared_ptr<T> to holder
- // (non-polymorphic base)
- bf1.def(py::init([]() { return std::shared_ptr<BadF1Base>(new BadF1()); }));
-#endif
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_factory_constructors.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_factory_constructors.py
deleted file mode 100644
index ffcce6fd4ddb36a48692b4fa2c977a1f58a55663..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_factory_constructors.py
+++ /dev/null
@@ -1,518 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-import re
-
-import env # noqa: F401
-
-from pybind11_tests import factory_constructors as m
-from pybind11_tests.factory_constructors import tag
-from pybind11_tests import ConstructorStats
-
-
-def test_init_factory_basic():
- """Tests py::init_factory() wrapper around various ways of returning the object"""
-
- cstats = [
- ConstructorStats.get(c)
- for c in [m.TestFactory1, m.TestFactory2, m.TestFactory3]
- ]
- cstats[0].alive() # force gc
- n_inst = ConstructorStats.detail_reg_inst()
-
- x1 = m.TestFactory1(tag.unique_ptr, 3)
- assert x1.value == "3"
- y1 = m.TestFactory1(tag.pointer)
- assert y1.value == "(empty)"
- z1 = m.TestFactory1("hi!")
- assert z1.value == "hi!"
-
- assert ConstructorStats.detail_reg_inst() == n_inst + 3
-
- x2 = m.TestFactory2(tag.move)
- assert x2.value == "(empty2)"
- y2 = m.TestFactory2(tag.pointer, 7)
- assert y2.value == "7"
- z2 = m.TestFactory2(tag.unique_ptr, "hi again")
- assert z2.value == "hi again"
-
- assert ConstructorStats.detail_reg_inst() == n_inst + 6
-
- x3 = m.TestFactory3(tag.shared_ptr)
- assert x3.value == "(empty3)"
- y3 = m.TestFactory3(tag.pointer, 42)
- assert y3.value == "42"
- z3 = m.TestFactory3("bye")
- assert z3.value == "bye"
-
- for null_ptr_kind in [tag.null_ptr, tag.null_unique_ptr, tag.null_shared_ptr]:
- with pytest.raises(TypeError) as excinfo:
- m.TestFactory3(null_ptr_kind)
- assert (
- str(excinfo.value) == "pybind11::init(): factory function returned nullptr"
- )
-
- assert [i.alive() for i in cstats] == [3, 3, 3]
- assert ConstructorStats.detail_reg_inst() == n_inst + 9
-
- del x1, y2, y3, z3
- assert [i.alive() for i in cstats] == [2, 2, 1]
- assert ConstructorStats.detail_reg_inst() == n_inst + 5
- del x2, x3, y1, z1, z2
- assert [i.alive() for i in cstats] == [0, 0, 0]
- assert ConstructorStats.detail_reg_inst() == n_inst
-
- assert [i.values() for i in cstats] == [
- ["3", "hi!"],
- ["7", "hi again"],
- ["42", "bye"],
- ]
- assert [i.default_constructions for i in cstats] == [1, 1, 1]
-
-
-def test_init_factory_signature(msg):
- with pytest.raises(TypeError) as excinfo:
- m.TestFactory1("invalid", "constructor", "arguments")
- assert (
- msg(excinfo.value)
- == """
- __init__(): incompatible constructor arguments. The following argument types are supported:
- 1. m.factory_constructors.TestFactory1(arg0: m.factory_constructors.tag.unique_ptr_tag, arg1: int)
- 2. m.factory_constructors.TestFactory1(arg0: str)
- 3. m.factory_constructors.TestFactory1(arg0: m.factory_constructors.tag.pointer_tag)
- 4. m.factory_constructors.TestFactory1(arg0: handle, arg1: int, arg2: handle)
-
- Invoked with: 'invalid', 'constructor', 'arguments'
- """ # noqa: E501 line too long
- )
-
- assert (
- msg(m.TestFactory1.__init__.__doc__)
- == """
- __init__(*args, **kwargs)
- Overloaded function.
-
- 1. __init__(self: m.factory_constructors.TestFactory1, arg0: m.factory_constructors.tag.unique_ptr_tag, arg1: int) -> None
-
- 2. __init__(self: m.factory_constructors.TestFactory1, arg0: str) -> None
-
- 3. __init__(self: m.factory_constructors.TestFactory1, arg0: m.factory_constructors.tag.pointer_tag) -> None
-
- 4. __init__(self: m.factory_constructors.TestFactory1, arg0: handle, arg1: int, arg2: handle) -> None
- """ # noqa: E501 line too long
- )
-
-
-def test_init_factory_casting():
- """Tests py::init_factory() wrapper with various upcasting and downcasting returns"""
-
- cstats = [
- ConstructorStats.get(c)
- for c in [m.TestFactory3, m.TestFactory4, m.TestFactory5]
- ]
- cstats[0].alive() # force gc
- n_inst = ConstructorStats.detail_reg_inst()
-
- # Construction from derived references:
- a = m.TestFactory3(tag.pointer, tag.TF4, 4)
- assert a.value == "4"
- b = m.TestFactory3(tag.shared_ptr, tag.TF4, 5)
- assert b.value == "5"
- c = m.TestFactory3(tag.pointer, tag.TF5, 6)
- assert c.value == "6"
- d = m.TestFactory3(tag.shared_ptr, tag.TF5, 7)
- assert d.value == "7"
-
- assert ConstructorStats.detail_reg_inst() == n_inst + 4
-
- # Shared a lambda with TF3:
- e = m.TestFactory4(tag.pointer, tag.TF4, 8)
- assert e.value == "8"
-
- assert ConstructorStats.detail_reg_inst() == n_inst + 5
- assert [i.alive() for i in cstats] == [5, 3, 2]
-
- del a
- assert [i.alive() for i in cstats] == [4, 2, 2]
- assert ConstructorStats.detail_reg_inst() == n_inst + 4
-
- del b, c, e
- assert [i.alive() for i in cstats] == [1, 0, 1]
- assert ConstructorStats.detail_reg_inst() == n_inst + 1
-
- del d
- assert [i.alive() for i in cstats] == [0, 0, 0]
- assert ConstructorStats.detail_reg_inst() == n_inst
-
- assert [i.values() for i in cstats] == [
- ["4", "5", "6", "7", "8"],
- ["4", "5", "8"],
- ["6", "7"],
- ]
-
-
-def test_init_factory_alias():
- """Tests py::init_factory() wrapper with value conversions and alias types"""
-
- cstats = [m.TestFactory6.get_cstats(), m.TestFactory6.get_alias_cstats()]
- cstats[0].alive() # force gc
- n_inst = ConstructorStats.detail_reg_inst()
-
- a = m.TestFactory6(tag.base, 1)
- assert a.get() == 1
- assert not a.has_alias()
- b = m.TestFactory6(tag.alias, "hi there")
- assert b.get() == 8
- assert b.has_alias()
- c = m.TestFactory6(tag.alias, 3)
- assert c.get() == 3
- assert c.has_alias()
- d = m.TestFactory6(tag.alias, tag.pointer, 4)
- assert d.get() == 4
- assert d.has_alias()
- e = m.TestFactory6(tag.base, tag.pointer, 5)
- assert e.get() == 5
- assert not e.has_alias()
- f = m.TestFactory6(tag.base, tag.alias, tag.pointer, 6)
- assert f.get() == 6
- assert f.has_alias()
-
- assert ConstructorStats.detail_reg_inst() == n_inst + 6
- assert [i.alive() for i in cstats] == [6, 4]
-
- del a, b, e
- assert [i.alive() for i in cstats] == [3, 3]
- assert ConstructorStats.detail_reg_inst() == n_inst + 3
- del f, c, d
- assert [i.alive() for i in cstats] == [0, 0]
- assert ConstructorStats.detail_reg_inst() == n_inst
-
- class MyTest(m.TestFactory6):
- def __init__(self, *args):
- m.TestFactory6.__init__(self, *args)
-
- def get(self):
- return -5 + m.TestFactory6.get(self)
-
- # Return Class by value, moved into new alias:
- z = MyTest(tag.base, 123)
- assert z.get() == 118
- assert z.has_alias()
-
- # Return alias by value, moved into new alias:
- y = MyTest(tag.alias, "why hello!")
- assert y.get() == 5
- assert y.has_alias()
-
- # Return Class by pointer, moved into new alias then original destroyed:
- x = MyTest(tag.base, tag.pointer, 47)
- assert x.get() == 42
- assert x.has_alias()
-
- assert ConstructorStats.detail_reg_inst() == n_inst + 3
- assert [i.alive() for i in cstats] == [3, 3]
- del x, y, z
- assert [i.alive() for i in cstats] == [0, 0]
- assert ConstructorStats.detail_reg_inst() == n_inst
-
- assert [i.values() for i in cstats] == [
- ["1", "8", "3", "4", "5", "6", "123", "10", "47"],
- ["hi there", "3", "4", "6", "move", "123", "why hello!", "move", "47"],
- ]
-
-
-def test_init_factory_dual():
- """Tests init factory functions with dual main/alias factory functions"""
- from pybind11_tests.factory_constructors import TestFactory7
-
- cstats = [TestFactory7.get_cstats(), TestFactory7.get_alias_cstats()]
- cstats[0].alive() # force gc
- n_inst = ConstructorStats.detail_reg_inst()
-
- class PythFactory7(TestFactory7):
- def get(self):
- return 100 + TestFactory7.get(self)
-
- a1 = TestFactory7(1)
- a2 = PythFactory7(2)
- assert a1.get() == 1
- assert a2.get() == 102
- assert not a1.has_alias()
- assert a2.has_alias()
-
- b1 = TestFactory7(tag.pointer, 3)
- b2 = PythFactory7(tag.pointer, 4)
- assert b1.get() == 3
- assert b2.get() == 104
- assert not b1.has_alias()
- assert b2.has_alias()
-
- c1 = TestFactory7(tag.mixed, 5)
- c2 = PythFactory7(tag.mixed, 6)
- assert c1.get() == 5
- assert c2.get() == 106
- assert not c1.has_alias()
- assert c2.has_alias()
-
- d1 = TestFactory7(tag.base, tag.pointer, 7)
- d2 = PythFactory7(tag.base, tag.pointer, 8)
- assert d1.get() == 7
- assert d2.get() == 108
- assert not d1.has_alias()
- assert d2.has_alias()
-
- # Both return an alias; the second multiplies the value by 10:
- e1 = TestFactory7(tag.alias, tag.pointer, 9)
- e2 = PythFactory7(tag.alias, tag.pointer, 10)
- assert e1.get() == 9
- assert e2.get() == 200
- assert e1.has_alias()
- assert e2.has_alias()
-
- f1 = TestFactory7(tag.shared_ptr, tag.base, 11)
- f2 = PythFactory7(tag.shared_ptr, tag.base, 12)
- assert f1.get() == 11
- assert f2.get() == 112
- assert not f1.has_alias()
- assert f2.has_alias()
-
- g1 = TestFactory7(tag.shared_ptr, tag.invalid_base, 13)
- assert g1.get() == 13
- assert not g1.has_alias()
- with pytest.raises(TypeError) as excinfo:
- PythFactory7(tag.shared_ptr, tag.invalid_base, 14)
- assert (
- str(excinfo.value)
- == "pybind11::init(): construction failed: returned holder-wrapped instance is not an "
- "alias instance"
- )
-
- assert [i.alive() for i in cstats] == [13, 7]
- assert ConstructorStats.detail_reg_inst() == n_inst + 13
-
- del a1, a2, b1, d1, e1, e2
- assert [i.alive() for i in cstats] == [7, 4]
- assert ConstructorStats.detail_reg_inst() == n_inst + 7
- del b2, c1, c2, d2, f1, f2, g1
- assert [i.alive() for i in cstats] == [0, 0]
- assert ConstructorStats.detail_reg_inst() == n_inst
-
- assert [i.values() for i in cstats] == [
- ["1", "2", "3", "4", "5", "6", "7", "8", "9", "100", "11", "12", "13", "14"],
- ["2", "4", "6", "8", "9", "100", "12"],
- ]
-
-
-def test_no_placement_new(capture):
- """Prior to 2.2, `py::init<...>` relied on the type supporting placement
- new; this tests a class without placement new support."""
- with capture:
- a = m.NoPlacementNew(123)
-
- found = re.search(r"^operator new called, returning (\d+)\n$", str(capture))
- assert found
- assert a.i == 123
- with capture:
- del a
- pytest.gc_collect()
- assert capture == "operator delete called on " + found.group(1)
-
- with capture:
- b = m.NoPlacementNew()
-
- found = re.search(r"^operator new called, returning (\d+)\n$", str(capture))
- assert found
- assert b.i == 100
- with capture:
- del b
- pytest.gc_collect()
- assert capture == "operator delete called on " + found.group(1)
-
-
-def test_multiple_inheritance():
- class MITest(m.TestFactory1, m.TestFactory2):
- def __init__(self):
- m.TestFactory1.__init__(self, tag.unique_ptr, 33)
- m.TestFactory2.__init__(self, tag.move)
-
- a = MITest()
- assert m.TestFactory1.value.fget(a) == "33"
- assert m.TestFactory2.value.fget(a) == "(empty2)"
-
-
-def create_and_destroy(*args):
- a = m.NoisyAlloc(*args)
- print("---")
- del a
- pytest.gc_collect()
-
-
-def strip_comments(s):
- return re.sub(r"\s+#.*", "", s)
-
-
-def test_reallocation_a(capture, msg):
- """When the constructor is overloaded, previous overloads can require a preallocated value.
- This test makes sure that such preallocated values only happen when they might be necessary,
- and that they are deallocated properly."""
-
- pytest.gc_collect()
-
- with capture:
- create_and_destroy(1)
- assert (
- msg(capture)
- == """
- noisy new
- noisy placement new
- NoisyAlloc(int 1)
- ---
- ~NoisyAlloc()
- noisy delete
- """
- )
-
-
-def test_reallocation_b(capture, msg):
- with capture:
- create_and_destroy(1.5)
- assert msg(capture) == strip_comments(
- """
- noisy new # allocation required to attempt first overload
- noisy delete # have to dealloc before considering factory init overload
- noisy new # pointer factory calling "new", part 1: allocation
- NoisyAlloc(double 1.5) # ... part two, invoking constructor
- ---
- ~NoisyAlloc() # Destructor
- noisy delete # operator delete
- """
- )
-
-
-def test_reallocation_c(capture, msg):
- with capture:
- create_and_destroy(2, 3)
- assert msg(capture) == strip_comments(
- """
- noisy new # pointer factory calling "new", allocation
- NoisyAlloc(int 2) # constructor
- ---
- ~NoisyAlloc() # Destructor
- noisy delete # operator delete
- """
- )
-
-
-def test_reallocation_d(capture, msg):
- with capture:
- create_and_destroy(2.5, 3)
- assert msg(capture) == strip_comments(
- """
- NoisyAlloc(double 2.5) # construction (local func variable: operator_new not called)
- noisy new # return-by-value "new" part 1: allocation
- ~NoisyAlloc() # moved-away local func variable destruction
- ---
- ~NoisyAlloc() # Destructor
- noisy delete # operator delete
- """
- )
-
-
-def test_reallocation_e(capture, msg):
- with capture:
- create_and_destroy(3.5, 4.5)
- assert msg(capture) == strip_comments(
- """
- noisy new # preallocation needed before invoking placement-new overload
- noisy placement new # Placement new
- NoisyAlloc(double 3.5) # construction
- ---
- ~NoisyAlloc() # Destructor
- noisy delete # operator delete
- """
- )
-
-
-def test_reallocation_f(capture, msg):
- with capture:
- create_and_destroy(4, 0.5)
- assert msg(capture) == strip_comments(
- """
- noisy new # preallocation needed before invoking placement-new overload
- noisy delete # deallocation of preallocated storage
- noisy new # Factory pointer allocation
- NoisyAlloc(int 4) # factory pointer construction
- ---
- ~NoisyAlloc() # Destructor
- noisy delete # operator delete
- """
- )
-
-
-def test_reallocation_g(capture, msg):
- with capture:
- create_and_destroy(5, "hi")
- assert msg(capture) == strip_comments(
- """
- noisy new # preallocation needed before invoking first placement new
- noisy delete # delete before considering new-style constructor
- noisy new # preallocation for second placement new
- noisy placement new # Placement new in the second placement new overload
- NoisyAlloc(int 5) # construction
- ---
- ~NoisyAlloc() # Destructor
- noisy delete # operator delete
- """
- )
-
-
-@pytest.mark.skipif("env.PY2")
-def test_invalid_self():
- """Tests invocation of the pybind-registered base class with an invalid `self` argument. You
- can only actually do this on Python 3: Python 2 raises an exception itself if you try."""
-
- class NotPybindDerived(object):
- pass
-
- # Attempts to initialize with an invalid type passed as `self`:
- class BrokenTF1(m.TestFactory1):
- def __init__(self, bad):
- if bad == 1:
- a = m.TestFactory2(tag.pointer, 1)
- m.TestFactory1.__init__(a, tag.pointer)
- elif bad == 2:
- a = NotPybindDerived()
- m.TestFactory1.__init__(a, tag.pointer)
-
- # Same as above, but for a class with an alias:
- class BrokenTF6(m.TestFactory6):
- def __init__(self, bad):
- if bad == 1:
- a = m.TestFactory2(tag.pointer, 1)
- m.TestFactory6.__init__(a, tag.base, 1)
- elif bad == 2:
- a = m.TestFactory2(tag.pointer, 1)
- m.TestFactory6.__init__(a, tag.alias, 1)
- elif bad == 3:
- m.TestFactory6.__init__(
- NotPybindDerived.__new__(NotPybindDerived), tag.base, 1
- )
- elif bad == 4:
- m.TestFactory6.__init__(
- NotPybindDerived.__new__(NotPybindDerived), tag.alias, 1
- )
-
- for arg in (1, 2):
- with pytest.raises(TypeError) as excinfo:
- BrokenTF1(arg)
- assert (
- str(excinfo.value)
- == "__init__(self, ...) called with invalid `self` argument"
- )
-
- for arg in (1, 2, 3, 4):
- with pytest.raises(TypeError) as excinfo:
- BrokenTF6(arg)
- assert (
- str(excinfo.value)
- == "__init__(self, ...) called with invalid `self` argument"
- )
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_gil_scoped.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_gil_scoped.cpp
deleted file mode 100644
index b6a45a5f038af9f4db11b5c64de0982a9d574f5e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_gil_scoped.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- tests/test_gil_scoped.cpp -- acquire and release gil
-
- Copyright (c) 2017 Borja Zarco (Google LLC) <bzarco@google.com>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include <pybind11/functional.h>
-
-
-class VirtClass {
-public:
- virtual ~VirtClass() = default;
- VirtClass() = default;
- VirtClass(const VirtClass&) = delete;
- virtual void virtual_func() {}
- virtual void pure_virtual_func() = 0;
-};
-
-class PyVirtClass : public VirtClass {
- void virtual_func() override {
- PYBIND11_OVERRIDE(void, VirtClass, virtual_func,);
- }
- void pure_virtual_func() override {
- PYBIND11_OVERRIDE_PURE(void, VirtClass, pure_virtual_func,);
- }
-};
-
-TEST_SUBMODULE(gil_scoped, m) {
- py::class_<VirtClass, PyVirtClass>(m, "VirtClass")
- .def(py::init<>())
- .def("virtual_func", &VirtClass::virtual_func)
- .def("pure_virtual_func", &VirtClass::pure_virtual_func);
-
- m.def("test_callback_py_obj",
- [](py::object func) { func(); });
- m.def("test_callback_std_func",
- [](const std::function<void()> &func) { func(); });
- m.def("test_callback_virtual_func",
- [](VirtClass &virt) { virt.virtual_func(); });
- m.def("test_callback_pure_virtual_func",
- [](VirtClass &virt) { virt.pure_virtual_func(); });
- m.def("test_cross_module_gil",
- []() {
- auto cm = py::module_::import("cross_module_gil_utils");
- auto gil_acquire = reinterpret_cast<void (*)()>(
- PyLong_AsVoidPtr(cm.attr("gil_acquire_funcaddr").ptr()));
- py::gil_scoped_release gil_release;
- gil_acquire();
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_gil_scoped.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_gil_scoped.py
deleted file mode 100644
index 0a1d62747dbedb012c5e05eb66c15b7bef7f90c2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_gil_scoped.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-import multiprocessing
-import threading
-
-from pybind11_tests import gil_scoped as m
-
-
-def _run_in_process(target, *args, **kwargs):
- """Runs target in process and returns its exitcode after 10s (None if still alive)."""
- process = multiprocessing.Process(target=target, args=args, kwargs=kwargs)
- process.daemon = True
- try:
- process.start()
- # Do not need to wait much, 10s should be more than enough.
- process.join(timeout=10)
- return process.exitcode
- finally:
- if process.is_alive():
- process.terminate()
-
-
-def _python_to_cpp_to_python():
- """Calls different C++ functions that come back to Python."""
-
- class ExtendedVirtClass(m.VirtClass):
- def virtual_func(self):
- pass
-
- def pure_virtual_func(self):
- pass
-
- extended = ExtendedVirtClass()
- m.test_callback_py_obj(lambda: None)
- m.test_callback_std_func(lambda: None)
- m.test_callback_virtual_func(extended)
- m.test_callback_pure_virtual_func(extended)
-
-
-def _python_to_cpp_to_python_from_threads(num_threads, parallel=False):
- """Calls different C++ functions that come back to Python, from Python threads."""
- threads = []
- for _ in range(num_threads):
- thread = threading.Thread(target=_python_to_cpp_to_python)
- thread.daemon = True
- thread.start()
- if parallel:
- threads.append(thread)
- else:
- thread.join()
- for thread in threads:
- thread.join()
-
-
-# TODO: FIXME, sometimes returns -11 (segfault) instead of 0 on macOS Python 3.9
-def test_python_to_cpp_to_python_from_thread():
- """Makes sure there is no GIL deadlock when running in a thread.
-
- It runs in a separate process to be able to stop and assert if it deadlocks.
- """
- assert _run_in_process(_python_to_cpp_to_python_from_threads, 1) == 0
-
-
-# TODO: FIXME on macOS Python 3.9
-def test_python_to_cpp_to_python_from_thread_multiple_parallel():
- """Makes sure there is no GIL deadlock when running in a thread multiple times in parallel.
-
- It runs in a separate process to be able to stop and assert if it deadlocks.
- """
- assert _run_in_process(_python_to_cpp_to_python_from_threads, 8, parallel=True) == 0
-
-
-# TODO: FIXME on macOS Python 3.9
-def test_python_to_cpp_to_python_from_thread_multiple_sequential():
- """Makes sure there is no GIL deadlock when running in a thread multiple times sequentially.
-
- It runs in a separate process to be able to stop and assert if it deadlocks.
- """
- assert (
- _run_in_process(_python_to_cpp_to_python_from_threads, 8, parallel=False) == 0
- )
-
-
-# TODO: FIXME on macOS Python 3.9
-def test_python_to_cpp_to_python_from_process():
- """Makes sure there is no GIL deadlock when using processes.
-
- This test is for completion, but it was never an issue.
- """
- assert _run_in_process(_python_to_cpp_to_python) == 0
-
-
-def test_cross_module_gil():
- """Makes sure that the GIL can be acquired by another module from a GIL-released state."""
- m.test_cross_module_gil() # Should not raise a SIGSEGV
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_iostream.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_iostream.cpp
deleted file mode 100644
index e9161505ca455c38dc49127d155561696258a2d5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_iostream.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- tests/test_iostream.cpp -- Usage of scoped_output_redirect
-
- Copyright (c) 2017 Henry F. Schreiner
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-
-#include <pybind11/iostream.h>
-#include "pybind11_tests.h"
-#include <iostream>
-
-
-void noisy_function(std::string msg, bool flush) {
-
- std::cout << msg;
- if (flush)
- std::cout << std::flush;
-}
-
-void noisy_funct_dual(std::string msg, std::string emsg) {
- std::cout << msg;
- std::cerr << emsg;
-}
-
-TEST_SUBMODULE(iostream, m) {
-
- add_ostream_redirect(m);
-
- // test_evals
-
- m.def("captured_output_default", [](std::string msg) {
- py::scoped_ostream_redirect redir;
- std::cout << msg << std::flush;
- });
-
- m.def("captured_output", [](std::string msg) {
- py::scoped_ostream_redirect redir(std::cout, py::module_::import("sys").attr("stdout"));
- std::cout << msg << std::flush;
- });
-
- m.def("guard_output", &noisy_function,
- py::call_guard<py::scoped_ostream_redirect>(),
- py::arg("msg"), py::arg("flush")=true);
-
- m.def("captured_err", [](std::string msg) {
- py::scoped_ostream_redirect redir(std::cerr, py::module_::import("sys").attr("stderr"));
- std::cerr << msg << std::flush;
- });
-
- m.def("noisy_function", &noisy_function, py::arg("msg"), py::arg("flush") = true);
-
- m.def("dual_guard", &noisy_funct_dual,
- py::call_guard<py::scoped_ostream_redirect, py::scoped_estream_redirect>(),
- py::arg("msg"), py::arg("emsg"));
-
- m.def("raw_output", [](std::string msg) {
- std::cout << msg << std::flush;
- });
-
- m.def("raw_err", [](std::string msg) {
- std::cerr << msg << std::flush;
- });
-
- m.def("captured_dual", [](std::string msg, std::string emsg) {
- py::scoped_ostream_redirect redirout(std::cout, py::module_::import("sys").attr("stdout"));
- py::scoped_ostream_redirect redirerr(std::cerr, py::module_::import("sys").attr("stderr"));
- std::cout << msg << std::flush;
- std::cerr << emsg << std::flush;
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_iostream.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_iostream.py
deleted file mode 100644
index 506db42ec12baac5195e3f02bbd29e38d5362535..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_iostream.py
+++ /dev/null
@@ -1,218 +0,0 @@
-# -*- coding: utf-8 -*-
-from pybind11_tests import iostream as m
-import sys
-
-from contextlib import contextmanager
-
-try:
- # Python 3
- from io import StringIO
-except ImportError:
- # Python 2
- try:
- from cStringIO import StringIO
- except ImportError:
- from StringIO import StringIO
-
-try:
- # Python 3.4
- from contextlib import redirect_stdout
-except ImportError:
-
- @contextmanager
- def redirect_stdout(target):
- original = sys.stdout
- sys.stdout = target
- yield
- sys.stdout = original
-
-
-try:
- # Python 3.5
- from contextlib import redirect_stderr
-except ImportError:
-
- @contextmanager
- def redirect_stderr(target):
- original = sys.stderr
- sys.stderr = target
- yield
- sys.stderr = original
-
-
-def test_captured(capsys):
- msg = "I've been redirected to Python, I hope!"
- m.captured_output(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
- m.captured_err(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == ""
- assert stderr == msg
-
-
-def test_captured_large_string(capsys):
- # Make this bigger than the buffer used on the C++ side: 1024 chars
- msg = "I've been redirected to Python, I hope!"
- msg = msg * (1024 // len(msg) + 1)
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_guard_capture(capsys):
- msg = "I've been redirected to Python, I hope!"
- m.guard_output(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_series_captured(capture):
- with capture:
- m.captured_output("a")
- m.captured_output("b")
- assert capture == "ab"
-
-
-def test_flush(capfd):
- msg = "(not flushed)"
- msg2 = "(flushed)"
-
- with m.ostream_redirect():
- m.noisy_function(msg, flush=False)
- stdout, stderr = capfd.readouterr()
- assert stdout == ""
-
- m.noisy_function(msg2, flush=True)
- stdout, stderr = capfd.readouterr()
- assert stdout == msg + msg2
-
- m.noisy_function(msg, flush=False)
-
- stdout, stderr = capfd.readouterr()
- assert stdout == msg
-
-
-def test_not_captured(capfd):
- msg = "Something that should not show up in log"
- stream = StringIO()
- with redirect_stdout(stream):
- m.raw_output(msg)
- stdout, stderr = capfd.readouterr()
- assert stdout == msg
- assert stderr == ""
- assert stream.getvalue() == ""
-
- stream = StringIO()
- with redirect_stdout(stream):
- m.captured_output(msg)
- stdout, stderr = capfd.readouterr()
- assert stdout == ""
- assert stderr == ""
- assert stream.getvalue() == msg
-
-
-def test_err(capfd):
- msg = "Something that should not show up in log"
- stream = StringIO()
- with redirect_stderr(stream):
- m.raw_err(msg)
- stdout, stderr = capfd.readouterr()
- assert stdout == ""
- assert stderr == msg
- assert stream.getvalue() == ""
-
- stream = StringIO()
- with redirect_stderr(stream):
- m.captured_err(msg)
- stdout, stderr = capfd.readouterr()
- assert stdout == ""
- assert stderr == ""
- assert stream.getvalue() == msg
-
-
-def test_multi_captured(capfd):
- stream = StringIO()
- with redirect_stdout(stream):
- m.captured_output("a")
- m.raw_output("b")
- m.captured_output("c")
- m.raw_output("d")
- stdout, stderr = capfd.readouterr()
- assert stdout == "bd"
- assert stream.getvalue() == "ac"
-
-
-def test_dual(capsys):
- m.captured_dual("a", "b")
- stdout, stderr = capsys.readouterr()
- assert stdout == "a"
- assert stderr == "b"
-
-
-def test_redirect(capfd):
- msg = "Should not be in log!"
- stream = StringIO()
- with redirect_stdout(stream):
- m.raw_output(msg)
- stdout, stderr = capfd.readouterr()
- assert stdout == msg
- assert stream.getvalue() == ""
-
- stream = StringIO()
- with redirect_stdout(stream):
- with m.ostream_redirect():
- m.raw_output(msg)
- stdout, stderr = capfd.readouterr()
- assert stdout == ""
- assert stream.getvalue() == msg
-
- stream = StringIO()
- with redirect_stdout(stream):
- m.raw_output(msg)
- stdout, stderr = capfd.readouterr()
- assert stdout == msg
- assert stream.getvalue() == ""
-
-
-def test_redirect_err(capfd):
- msg = "StdOut"
- msg2 = "StdErr"
-
- stream = StringIO()
- with redirect_stderr(stream):
- with m.ostream_redirect(stdout=False):
- m.raw_output(msg)
- m.raw_err(msg2)
- stdout, stderr = capfd.readouterr()
- assert stdout == msg
- assert stderr == ""
- assert stream.getvalue() == msg2
-
-
-def test_redirect_both(capfd):
- msg = "StdOut"
- msg2 = "StdErr"
-
- stream = StringIO()
- stream2 = StringIO()
- with redirect_stdout(stream):
- with redirect_stderr(stream2):
- with m.ostream_redirect():
- m.raw_output(msg)
- m.raw_err(msg2)
- stdout, stderr = capfd.readouterr()
- assert stdout == ""
- assert stderr == ""
- assert stream.getvalue() == msg
- assert stream2.getvalue() == msg2
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_kwargs_and_defaults.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_kwargs_and_defaults.cpp
deleted file mode 100644
index 627a79690ee92fa63f3f1f78e6479b1def18a299..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_kwargs_and_defaults.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- tests/test_kwargs_and_defaults.cpp -- keyword arguments and default values
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <pybind11/stl.h>
-
-TEST_SUBMODULE(kwargs_and_defaults, m) {
- auto kw_func = [](int x, int y) { return "x=" + std::to_string(x) + ", y=" + std::to_string(y); };
-
- // test_named_arguments
- m.def("kw_func0", kw_func);
- m.def("kw_func1", kw_func, py::arg("x"), py::arg("y"));
- m.def("kw_func2", kw_func, py::arg("x") = 100, py::arg("y") = 200);
- m.def("kw_func3", [](const char *) { }, py::arg("data") = std::string("Hello world!"));
-
- /* A fancier default argument */
- std::vector<int> list{{13, 17}};
- m.def("kw_func4", [](const std::vector<int> &entries) {
- std::string ret = "{";
- for (int i : entries)
- ret += std::to_string(i) + " ";
- ret.back() = '}';
- return ret;
- }, py::arg("myList") = list);
-
- m.def("kw_func_udl", kw_func, "x"_a, "y"_a=300);
- m.def("kw_func_udl_z", kw_func, "x"_a, "y"_a=0);
-
- // test_args_and_kwargs
- m.def("args_function", [](py::args args) -> py::tuple {
- return std::move(args);
- });
- m.def("args_kwargs_function", [](py::args args, py::kwargs kwargs) {
- return py::make_tuple(args, kwargs);
- });
-
- // test_mixed_args_and_kwargs
- m.def("mixed_plus_args", [](int i, double j, py::args args) {
- return py::make_tuple(i, j, args);
- });
- m.def("mixed_plus_kwargs", [](int i, double j, py::kwargs kwargs) {
- return py::make_tuple(i, j, kwargs);
- });
- auto mixed_plus_both = [](int i, double j, py::args args, py::kwargs kwargs) {
- return py::make_tuple(i, j, args, kwargs);
- };
- m.def("mixed_plus_args_kwargs", mixed_plus_both);
-
- m.def("mixed_plus_args_kwargs_defaults", mixed_plus_both,
- py::arg("i") = 1, py::arg("j") = 3.14159);
-
- // test_args_refcount
- // PyPy needs a garbage collection to get the reference count values to match CPython's behaviour
- #ifdef PYPY_VERSION
- #define GC_IF_NEEDED ConstructorStats::gc()
- #else
- #define GC_IF_NEEDED
- #endif
- m.def("arg_refcount_h", [](py::handle h) { GC_IF_NEEDED; return h.ref_count(); });
- m.def("arg_refcount_h", [](py::handle h, py::handle, py::handle) { GC_IF_NEEDED; return h.ref_count(); });
- m.def("arg_refcount_o", [](py::object o) { GC_IF_NEEDED; return o.ref_count(); });
- m.def("args_refcount", [](py::args a) {
- GC_IF_NEEDED;
- py::tuple t(a.size());
- for (size_t i = 0; i < a.size(); i++)
- // Use raw Python API here to avoid an extra, intermediate incref on the tuple item:
- t[i] = (int) Py_REFCNT(PyTuple_GET_ITEM(a.ptr(), static_cast<py::ssize_t>(i)));
- return t;
- });
- m.def("mixed_args_refcount", [](py::object o, py::args a) {
- GC_IF_NEEDED;
- py::tuple t(a.size() + 1);
- t[0] = o.ref_count();
- for (size_t i = 0; i < a.size(); i++)
- // Use raw Python API here to avoid an extra, intermediate incref on the tuple item:
- t[i + 1] = (int) Py_REFCNT(PyTuple_GET_ITEM(a.ptr(), static_cast<py::ssize_t>(i)));
- return t;
- });
-
- // pybind11 won't allow these to be bound: args and kwargs, if present, must be at the end.
- // Uncomment these to test that the static_assert is indeed working:
-// m.def("bad_args1", [](py::args, int) {});
-// m.def("bad_args2", [](py::kwargs, int) {});
-// m.def("bad_args3", [](py::kwargs, py::args) {});
-// m.def("bad_args4", [](py::args, int, py::kwargs) {});
-// m.def("bad_args5", [](py::args, py::kwargs, int) {});
-// m.def("bad_args6", [](py::args, py::args) {});
-// m.def("bad_args7", [](py::kwargs, py::kwargs) {});
-
- // test_keyword_only_args
- m.def("kw_only_all", [](int i, int j) { return py::make_tuple(i, j); },
- py::kw_only(), py::arg("i"), py::arg("j"));
- m.def("kw_only_some", [](int i, int j, int k) { return py::make_tuple(i, j, k); },
- py::arg(), py::kw_only(), py::arg("j"), py::arg("k"));
- m.def("kw_only_with_defaults", [](int i, int j, int k, int z) { return py::make_tuple(i, j, k, z); },
- py::arg() = 3, "j"_a = 4, py::kw_only(), "k"_a = 5, "z"_a);
- m.def("kw_only_mixed", [](int i, int j) { return py::make_tuple(i, j); },
- "i"_a, py::kw_only(), "j"_a);
- m.def("kw_only_plus_more", [](int i, int j, int k, py::kwargs kwargs) {
- return py::make_tuple(i, j, k, kwargs); },
- py::arg() /* positional */, py::arg("j") = -1 /* both */, py::kw_only(), py::arg("k") /* kw-only */);
-
- m.def("register_invalid_kw_only", [](py::module_ m) {
- m.def("bad_kw_only", [](int i, int j) { return py::make_tuple(i, j); },
- py::kw_only(), py::arg() /* invalid unnamed argument */, "j"_a);
- });
-
- // test_positional_only_args
- m.def("pos_only_all", [](int i, int j) { return py::make_tuple(i, j); },
- py::arg("i"), py::arg("j"), py::pos_only());
- m.def("pos_only_mix", [](int i, int j) { return py::make_tuple(i, j); },
- py::arg("i"), py::pos_only(), py::arg("j"));
- m.def("pos_kw_only_mix", [](int i, int j, int k) { return py::make_tuple(i, j, k); },
- py::arg("i"), py::pos_only(), py::arg("j"), py::kw_only(), py::arg("k"));
- m.def("pos_only_def_mix", [](int i, int j, int k) { return py::make_tuple(i, j, k); },
- py::arg("i"), py::arg("j") = 2, py::pos_only(), py::arg("k") = 3);
-
-
- // These should fail to compile:
- // argument annotations are required when using kw_only
-// m.def("bad_kw_only1", [](int) {}, py::kw_only());
- // can't specify both `py::kw_only` and a `py::args` argument
-// m.def("bad_kw_only2", [](int i, py::args) {}, py::kw_only(), "i"_a);
-
- // test_function_signatures (along with most of the above)
- struct KWClass { void foo(int, float) {} };
- py::class_<KWClass>(m, "KWClass")
- .def("foo0", &KWClass::foo)
- .def("foo1", &KWClass::foo, "x"_a, "y"_a);
-
- // Make sure a class (not an instance) can be used as a default argument.
- // The return value doesn't matter, only that the module is importable.
- m.def("class_default_argument", [](py::object a) { return py::repr(a); },
- "a"_a = py::module_::import("decimal").attr("Decimal"));
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_kwargs_and_defaults.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_kwargs_and_defaults.py
deleted file mode 100644
index 12fe705b4db6f2cb3a91599dca21489ff3ece3f5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_kwargs_and_defaults.py
+++ /dev/null
@@ -1,285 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import kwargs_and_defaults as m
-
-
-def test_function_signatures(doc):
- assert doc(m.kw_func0) == "kw_func0(arg0: int, arg1: int) -> str"
- assert doc(m.kw_func1) == "kw_func1(x: int, y: int) -> str"
- assert doc(m.kw_func2) == "kw_func2(x: int = 100, y: int = 200) -> str"
- assert doc(m.kw_func3) == "kw_func3(data: str = 'Hello world!') -> None"
- assert doc(m.kw_func4) == "kw_func4(myList: List[int] = [13, 17]) -> str"
- assert doc(m.kw_func_udl) == "kw_func_udl(x: int, y: int = 300) -> str"
- assert doc(m.kw_func_udl_z) == "kw_func_udl_z(x: int, y: int = 0) -> str"
- assert doc(m.args_function) == "args_function(*args) -> tuple"
- assert (
- doc(m.args_kwargs_function) == "args_kwargs_function(*args, **kwargs) -> tuple"
- )
- assert (
- doc(m.KWClass.foo0)
- == "foo0(self: m.kwargs_and_defaults.KWClass, arg0: int, arg1: float) -> None"
- )
- assert (
- doc(m.KWClass.foo1)
- == "foo1(self: m.kwargs_and_defaults.KWClass, x: int, y: float) -> None"
- )
-
-
-def test_named_arguments(msg):
- assert m.kw_func0(5, 10) == "x=5, y=10"
-
- assert m.kw_func1(5, 10) == "x=5, y=10"
- assert m.kw_func1(5, y=10) == "x=5, y=10"
- assert m.kw_func1(y=10, x=5) == "x=5, y=10"
-
- assert m.kw_func2() == "x=100, y=200"
- assert m.kw_func2(5) == "x=5, y=200"
- assert m.kw_func2(x=5) == "x=5, y=200"
- assert m.kw_func2(y=10) == "x=100, y=10"
- assert m.kw_func2(5, 10) == "x=5, y=10"
- assert m.kw_func2(x=5, y=10) == "x=5, y=10"
-
- with pytest.raises(TypeError) as excinfo:
- # noinspection PyArgumentList
- m.kw_func2(x=5, y=10, z=12)
- assert excinfo.match(
- r"(?s)^kw_func2\(\): incompatible.*Invoked with: kwargs: ((x=5|y=10|z=12)(, |$))"
- + "{3}$"
- )
-
- assert m.kw_func4() == "{13 17}"
- assert m.kw_func4(myList=[1, 2, 3]) == "{1 2 3}"
-
- assert m.kw_func_udl(x=5, y=10) == "x=5, y=10"
- assert m.kw_func_udl_z(x=5) == "x=5, y=0"
-
-
-def test_arg_and_kwargs():
- args = "arg1_value", "arg2_value", 3
- assert m.args_function(*args) == args
-
- args = "a1", "a2"
- kwargs = dict(arg3="a3", arg4=4)
- assert m.args_kwargs_function(*args, **kwargs) == (args, kwargs)
-
-
-def test_mixed_args_and_kwargs(msg):
- mpa = m.mixed_plus_args
- mpk = m.mixed_plus_kwargs
- mpak = m.mixed_plus_args_kwargs
- mpakd = m.mixed_plus_args_kwargs_defaults
-
- assert mpa(1, 2.5, 4, 99.5, None) == (1, 2.5, (4, 99.5, None))
- assert mpa(1, 2.5) == (1, 2.5, ())
- with pytest.raises(TypeError) as excinfo:
- assert mpa(1)
- assert (
- msg(excinfo.value)
- == """
- mixed_plus_args(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: int, arg1: float, *args) -> tuple
-
- Invoked with: 1
- """ # noqa: E501 line too long
- )
- with pytest.raises(TypeError) as excinfo:
- assert mpa()
- assert (
- msg(excinfo.value)
- == """
- mixed_plus_args(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: int, arg1: float, *args) -> tuple
-
- Invoked with:
- """ # noqa: E501 line too long
- )
-
- assert mpk(-2, 3.5, pi=3.14159, e=2.71828) == (
- -2,
- 3.5,
- {"e": 2.71828, "pi": 3.14159},
- )
- assert mpak(7, 7.7, 7.77, 7.777, 7.7777, minusseven=-7) == (
- 7,
- 7.7,
- (7.77, 7.777, 7.7777),
- {"minusseven": -7},
- )
- assert mpakd() == (1, 3.14159, (), {})
- assert mpakd(3) == (3, 3.14159, (), {})
- assert mpakd(j=2.71828) == (1, 2.71828, (), {})
- assert mpakd(k=42) == (1, 3.14159, (), {"k": 42})
- assert mpakd(1, 1, 2, 3, 5, 8, then=13, followedby=21) == (
- 1,
- 1,
- (2, 3, 5, 8),
- {"then": 13, "followedby": 21},
- )
- # Arguments specified both positionally and via kwargs should fail:
- with pytest.raises(TypeError) as excinfo:
- assert mpakd(1, i=1)
- assert (
- msg(excinfo.value)
- == """
- mixed_plus_args_kwargs_defaults(): incompatible function arguments. The following argument types are supported:
- 1. (i: int = 1, j: float = 3.14159, *args, **kwargs) -> tuple
-
- Invoked with: 1; kwargs: i=1
- """ # noqa: E501 line too long
- )
- with pytest.raises(TypeError) as excinfo:
- assert mpakd(1, 2, j=1)
- assert (
- msg(excinfo.value)
- == """
- mixed_plus_args_kwargs_defaults(): incompatible function arguments. The following argument types are supported:
- 1. (i: int = 1, j: float = 3.14159, *args, **kwargs) -> tuple
-
- Invoked with: 1, 2; kwargs: j=1
- """ # noqa: E501 line too long
- )
-
-
-def test_keyword_only_args(msg):
- assert m.kw_only_all(i=1, j=2) == (1, 2)
- assert m.kw_only_all(j=1, i=2) == (2, 1)
-
- with pytest.raises(TypeError) as excinfo:
- assert m.kw_only_all(i=1) == (1,)
- assert "incompatible function arguments" in str(excinfo.value)
-
- with pytest.raises(TypeError) as excinfo:
- assert m.kw_only_all(1, 2) == (1, 2)
- assert "incompatible function arguments" in str(excinfo.value)
-
- assert m.kw_only_some(1, k=3, j=2) == (1, 2, 3)
-
- assert m.kw_only_with_defaults(z=8) == (3, 4, 5, 8)
- assert m.kw_only_with_defaults(2, z=8) == (2, 4, 5, 8)
- assert m.kw_only_with_defaults(2, j=7, k=8, z=9) == (2, 7, 8, 9)
- assert m.kw_only_with_defaults(2, 7, z=9, k=8) == (2, 7, 8, 9)
-
- assert m.kw_only_mixed(1, j=2) == (1, 2)
- assert m.kw_only_mixed(j=2, i=3) == (3, 2)
- assert m.kw_only_mixed(i=2, j=3) == (2, 3)
-
- assert m.kw_only_plus_more(4, 5, k=6, extra=7) == (4, 5, 6, {"extra": 7})
- assert m.kw_only_plus_more(3, k=5, j=4, extra=6) == (3, 4, 5, {"extra": 6})
- assert m.kw_only_plus_more(2, k=3, extra=4) == (2, -1, 3, {"extra": 4})
-
- with pytest.raises(TypeError) as excinfo:
- assert m.kw_only_mixed(i=1) == (1,)
- assert "incompatible function arguments" in str(excinfo.value)
-
- with pytest.raises(RuntimeError) as excinfo:
- m.register_invalid_kw_only(m)
- assert (
- msg(excinfo.value)
- == """
- arg(): cannot specify an unnamed argument after an kw_only() annotation
- """
- )
-
-
-def test_positional_only_args(msg):
- assert m.pos_only_all(1, 2) == (1, 2)
- assert m.pos_only_all(2, 1) == (2, 1)
-
- with pytest.raises(TypeError) as excinfo:
- m.pos_only_all(i=1, j=2)
- assert "incompatible function arguments" in str(excinfo.value)
-
- assert m.pos_only_mix(1, 2) == (1, 2)
- assert m.pos_only_mix(2, j=1) == (2, 1)
-
- with pytest.raises(TypeError) as excinfo:
- m.pos_only_mix(i=1, j=2)
- assert "incompatible function arguments" in str(excinfo.value)
-
- assert m.pos_kw_only_mix(1, 2, k=3) == (1, 2, 3)
- assert m.pos_kw_only_mix(1, j=2, k=3) == (1, 2, 3)
-
- with pytest.raises(TypeError) as excinfo:
- m.pos_kw_only_mix(i=1, j=2, k=3)
- assert "incompatible function arguments" in str(excinfo.value)
-
- with pytest.raises(TypeError) as excinfo:
- m.pos_kw_only_mix(1, 2, 3)
- assert "incompatible function arguments" in str(excinfo.value)
-
- with pytest.raises(TypeError) as excinfo:
- m.pos_only_def_mix()
- assert "incompatible function arguments" in str(excinfo.value)
-
- assert m.pos_only_def_mix(1) == (1, 2, 3)
- assert m.pos_only_def_mix(1, 4) == (1, 4, 3)
- assert m.pos_only_def_mix(1, 4, 7) == (1, 4, 7)
- assert m.pos_only_def_mix(1, 4, k=7) == (1, 4, 7)
-
- with pytest.raises(TypeError) as excinfo:
- m.pos_only_def_mix(1, j=4)
- assert "incompatible function arguments" in str(excinfo.value)
-
-
-def test_signatures():
- assert "kw_only_all(*, i: int, j: int) -> tuple\n" == m.kw_only_all.__doc__
- assert "kw_only_mixed(i: int, *, j: int) -> tuple\n" == m.kw_only_mixed.__doc__
- assert "pos_only_all(i: int, j: int, /) -> tuple\n" == m.pos_only_all.__doc__
- assert "pos_only_mix(i: int, /, j: int) -> tuple\n" == m.pos_only_mix.__doc__
- assert (
- "pos_kw_only_mix(i: int, /, j: int, *, k: int) -> tuple\n"
- == m.pos_kw_only_mix.__doc__
- )
-
-
-@pytest.mark.xfail("env.PYPY and env.PY2", reason="PyPy2 doesn't double count")
-def test_args_refcount():
- """Issue/PR #1216 - py::args elements get double-inc_ref()ed when combined with regular
- arguments"""
- refcount = m.arg_refcount_h
-
- myval = 54321
- expected = refcount(myval)
- assert m.arg_refcount_h(myval) == expected
- assert m.arg_refcount_o(myval) == expected + 1
- assert m.arg_refcount_h(myval) == expected
- assert refcount(myval) == expected
-
- assert m.mixed_plus_args(1, 2.0, "a", myval) == (1, 2.0, ("a", myval))
- assert refcount(myval) == expected
-
- assert m.mixed_plus_kwargs(3, 4.0, a=1, b=myval) == (3, 4.0, {"a": 1, "b": myval})
- assert refcount(myval) == expected
-
- assert m.args_function(-1, myval) == (-1, myval)
- assert refcount(myval) == expected
-
- assert m.mixed_plus_args_kwargs(5, 6.0, myval, a=myval) == (
- 5,
- 6.0,
- (myval,),
- {"a": myval},
- )
- assert refcount(myval) == expected
-
- assert m.args_kwargs_function(7, 8, myval, a=1, b=myval) == (
- (7, 8, myval),
- {"a": 1, "b": myval},
- )
- assert refcount(myval) == expected
-
- exp3 = refcount(myval, myval, myval)
- assert m.args_refcount(myval, myval, myval) == (exp3, exp3, exp3)
- assert refcount(myval) == expected
-
- # This function takes the first arg as a `py::object` and the rest as a `py::args`. Unlike the
- # previous case, when we have both positional and `py::args` we need to construct a new tuple
- # for the `py::args`; in the previous case, we could simply inc_ref and pass on Python's input
- # tuple without having to inc_ref the individual elements, but here we can't, hence the extra
- # refs.
- assert m.mixed_args_refcount(myval, myval, myval) == (exp3 + 3, exp3 + 3, exp3 + 3)
-
- assert m.class_default_argument() == "<class 'decimal.Decimal'>"
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_local_bindings.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_local_bindings.cpp
deleted file mode 100644
index c61e388833d1702fc8c470cf7196622213467dc3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_local_bindings.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- tests/test_local_bindings.cpp -- tests the py::module_local class feature which makes a class
- binding local to the module in which it is defined.
-
- Copyright (c) 2017 Jason Rhinelander <jason@imaginary.ca>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "local_bindings.h"
-#include <pybind11/stl.h>
-#include <pybind11/stl_bind.h>
-#include <numeric>
-
-TEST_SUBMODULE(local_bindings, m) {
- // test_load_external
- m.def("load_external1", [](ExternalType1 &e) { return e.i; });
- m.def("load_external2", [](ExternalType2 &e) { return e.i; });
-
- // test_local_bindings
- // Register a class with py::module_local:
- bind_local<LocalType, -1>(m, "LocalType", py::module_local())
- .def("get3", [](LocalType &t) { return t.i + 3; })
- ;
-
- m.def("local_value", [](LocalType &l) { return l.i; });
-
- // test_nonlocal_failure
- // The main pybind11 test module is loaded first, so this registration will succeed (the second
- // one, in pybind11_cross_module_tests.cpp, is designed to fail):
- bind_local<NonLocalType, 0>(m, "NonLocalType")
- .def(py::init<int>())
- .def("get", [](LocalType &i) { return i.i; })
- ;
-
- // test_duplicate_local
- // py::module_local declarations should be visible across compilation units that get linked together;
- // this tries to register a duplicate local. It depends on a definition in test_class.cpp and
- // should raise a runtime error from the duplicate definition attempt. If test_class isn't
- // available it *also* throws a runtime error (with "test_class not enabled" as value).
- m.def("register_local_external", [m]() {
- auto main = py::module_::import("pybind11_tests");
- if (py::hasattr(main, "class_")) {
- bind_local<LocalExternal, 7>(m, "LocalExternal", py::module_local());
- }
- else throw std::runtime_error("test_class not enabled");
- });
-
- // test_stl_bind_local
- // stl_bind.h binders defaults to py::module_local if the types are local or converting:
- py::bind_vector<LocalVec>(m, "LocalVec");
- py::bind_map<LocalMap>(m, "LocalMap");
- // and global if the type (or one of the types, for the map) is global:
- py::bind_vector<NonLocalVec>(m, "NonLocalVec");
- py::bind_map<NonLocalMap>(m, "NonLocalMap");
-
- // test_stl_bind_global
- // They can, however, be overridden to global using `py::module_local(false)`:
- bind_local<NonLocal2, 10>(m, "NonLocal2");
- py::bind_vector<LocalVec2>(m, "LocalVec2", py::module_local());
- py::bind_map<NonLocalMap2>(m, "NonLocalMap2", py::module_local(false));
-
- // test_mixed_local_global
- // We try this both with the global type registered first and vice versa (the order shouldn't
- // matter).
- m.def("register_mixed_global", [m]() {
- bind_local<MixedGlobalLocal, 100>(m, "MixedGlobalLocal", py::module_local(false));
- });
- m.def("register_mixed_local", [m]() {
- bind_local<MixedLocalGlobal, 1000>(m, "MixedLocalGlobal", py::module_local());
- });
- m.def("get_mixed_gl", [](int i) { return MixedGlobalLocal(i); });
- m.def("get_mixed_lg", [](int i) { return MixedLocalGlobal(i); });
-
- // test_internal_locals_differ
- m.def("local_cpp_types_addr", []() { return (uintptr_t) &py::detail::registered_local_types_cpp(); });
-
- // test_stl_caster_vs_stl_bind
- m.def("load_vector_via_caster", [](std::vector<int> v) {
- return std::accumulate(v.begin(), v.end(), 0);
- });
-
- // test_cross_module_calls
- m.def("return_self", [](LocalVec *v) { return v; });
- m.def("return_copy", [](const LocalVec &v) { return LocalVec(v); });
-
- class Cat : public pets::Pet { public: Cat(std::string name) : Pet(name) {}; };
- py::class_<pets::Pet>(m, "Pet", py::module_local())
- .def("get_name", &pets::Pet::name);
- // Binding for local extending class:
- py::class_<Cat, pets::Pet>(m, "Cat")
- .def(py::init<std::string>());
- m.def("pet_name", [](pets::Pet &p) { return p.name(); });
-
- py::class_<MixGL>(m, "MixGL").def(py::init<int>());
- m.def("get_gl_value", [](MixGL &o) { return o.i + 10; });
-
- py::class_<MixGL2>(m, "MixGL2").def(py::init<int>());
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_local_bindings.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_local_bindings.py
deleted file mode 100644
index d23c467528104158bb38474aa9f04fbb1b1cf59a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_local_bindings.py
+++ /dev/null
@@ -1,258 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import local_bindings as m
-
-
-def test_load_external():
- """Load a `py::module_local` type that's only registered in an external module"""
- import pybind11_cross_module_tests as cm
-
- assert m.load_external1(cm.ExternalType1(11)) == 11
- assert m.load_external2(cm.ExternalType2(22)) == 22
-
- with pytest.raises(TypeError) as excinfo:
- assert m.load_external2(cm.ExternalType1(21)) == 21
- assert "incompatible function arguments" in str(excinfo.value)
-
- with pytest.raises(TypeError) as excinfo:
- assert m.load_external1(cm.ExternalType2(12)) == 12
- assert "incompatible function arguments" in str(excinfo.value)
-
-
-def test_local_bindings():
- """Tests that duplicate `py::module_local` class bindings work across modules"""
-
- # Make sure we can load the second module with the conflicting (but local) definition:
- import pybind11_cross_module_tests as cm
-
- i1 = m.LocalType(5)
- assert i1.get() == 4
- assert i1.get3() == 8
-
- i2 = cm.LocalType(10)
- assert i2.get() == 11
- assert i2.get2() == 12
-
- assert not hasattr(i1, "get2")
- assert not hasattr(i2, "get3")
-
- # Loading within the local module
- assert m.local_value(i1) == 5
- assert cm.local_value(i2) == 10
-
- # Cross-module loading works as well (on failure, the type loader looks for
- # external module-local converters):
- assert m.local_value(i2) == 10
- assert cm.local_value(i1) == 5
-
-
-def test_nonlocal_failure():
- """Tests that attempting to register a non-local type in multiple modules fails"""
- import pybind11_cross_module_tests as cm
-
- with pytest.raises(RuntimeError) as excinfo:
- cm.register_nonlocal()
- assert (
- str(excinfo.value) == 'generic_type: type "NonLocalType" is already registered!'
- )
-
-
-def test_duplicate_local():
- """Tests expected failure when registering a class twice with py::local in the same module"""
- with pytest.raises(RuntimeError) as excinfo:
- m.register_local_external()
- import pybind11_tests
-
- assert str(excinfo.value) == (
- 'generic_type: type "LocalExternal" is already registered!'
- if hasattr(pybind11_tests, "class_")
- else "test_class not enabled"
- )
-
-
-def test_stl_bind_local():
- import pybind11_cross_module_tests as cm
-
- v1, v2 = m.LocalVec(), cm.LocalVec()
- v1.append(m.LocalType(1))
- v1.append(m.LocalType(2))
- v2.append(cm.LocalType(1))
- v2.append(cm.LocalType(2))
-
- # Cross module value loading:
- v1.append(cm.LocalType(3))
- v2.append(m.LocalType(3))
-
- assert [i.get() for i in v1] == [0, 1, 2]
- assert [i.get() for i in v2] == [2, 3, 4]
-
- v3, v4 = m.NonLocalVec(), cm.NonLocalVec2()
- v3.append(m.NonLocalType(1))
- v3.append(m.NonLocalType(2))
- v4.append(m.NonLocal2(3))
- v4.append(m.NonLocal2(4))
-
- assert [i.get() for i in v3] == [1, 2]
- assert [i.get() for i in v4] == [13, 14]
-
- d1, d2 = m.LocalMap(), cm.LocalMap()
- d1["a"] = v1[0]
- d1["b"] = v1[1]
- d2["c"] = v2[0]
- d2["d"] = v2[1]
- assert {i: d1[i].get() for i in d1} == {"a": 0, "b": 1}
- assert {i: d2[i].get() for i in d2} == {"c": 2, "d": 3}
-
-
-def test_stl_bind_global():
- import pybind11_cross_module_tests as cm
-
- with pytest.raises(RuntimeError) as excinfo:
- cm.register_nonlocal_map()
- assert (
- str(excinfo.value) == 'generic_type: type "NonLocalMap" is already registered!'
- )
-
- with pytest.raises(RuntimeError) as excinfo:
- cm.register_nonlocal_vec()
- assert (
- str(excinfo.value) == 'generic_type: type "NonLocalVec" is already registered!'
- )
-
- with pytest.raises(RuntimeError) as excinfo:
- cm.register_nonlocal_map2()
- assert (
- str(excinfo.value) == 'generic_type: type "NonLocalMap2" is already registered!'
- )
-
-
-def test_mixed_local_global():
- """Local types take precedence over globally registered types: a module with a `module_local`
- type can be registered even if the type is already registered globally. With the module,
- casting will go to the local type; outside the module casting goes to the global type."""
- import pybind11_cross_module_tests as cm
-
- m.register_mixed_global()
- m.register_mixed_local()
-
- a = []
- a.append(m.MixedGlobalLocal(1))
- a.append(m.MixedLocalGlobal(2))
- a.append(m.get_mixed_gl(3))
- a.append(m.get_mixed_lg(4))
-
- assert [x.get() for x in a] == [101, 1002, 103, 1004]
-
- cm.register_mixed_global_local()
- cm.register_mixed_local_global()
- a.append(m.MixedGlobalLocal(5))
- a.append(m.MixedLocalGlobal(6))
- a.append(cm.MixedGlobalLocal(7))
- a.append(cm.MixedLocalGlobal(8))
- a.append(m.get_mixed_gl(9))
- a.append(m.get_mixed_lg(10))
- a.append(cm.get_mixed_gl(11))
- a.append(cm.get_mixed_lg(12))
-
- assert [x.get() for x in a] == [
- 101,
- 1002,
- 103,
- 1004,
- 105,
- 1006,
- 207,
- 2008,
- 109,
- 1010,
- 211,
- 2012,
- ]
-
-
-def test_internal_locals_differ():
- """Makes sure the internal local type map differs across the two modules"""
- import pybind11_cross_module_tests as cm
-
- assert m.local_cpp_types_addr() != cm.local_cpp_types_addr()
-
-
-@pytest.mark.xfail("env.PYPY and sys.pypy_version_info < (7, 3, 2)")
-def test_stl_caster_vs_stl_bind(msg):
- """One module uses a generic vector caster from `<pybind11/stl.h>` while the other
- exports `std::vector<int>` via `py:bind_vector` and `py::module_local`"""
- import pybind11_cross_module_tests as cm
-
- v1 = cm.VectorInt([1, 2, 3])
- assert m.load_vector_via_caster(v1) == 6
- assert cm.load_vector_via_binding(v1) == 6
-
- v2 = [1, 2, 3]
- assert m.load_vector_via_caster(v2) == 6
- with pytest.raises(TypeError) as excinfo:
- cm.load_vector_via_binding(v2) == 6
- assert (
- msg(excinfo.value)
- == """
- load_vector_via_binding(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: pybind11_cross_module_tests.VectorInt) -> int
-
- Invoked with: [1, 2, 3]
- """ # noqa: E501 line too long
- )
-
-
-def test_cross_module_calls():
- import pybind11_cross_module_tests as cm
-
- v1 = m.LocalVec()
- v1.append(m.LocalType(1))
- v2 = cm.LocalVec()
- v2.append(cm.LocalType(2))
-
- # Returning the self pointer should get picked up as returning an existing
- # instance (even when that instance is of a foreign, non-local type).
- assert m.return_self(v1) is v1
- assert cm.return_self(v2) is v2
- assert m.return_self(v2) is v2
- assert cm.return_self(v1) is v1
-
- assert m.LocalVec is not cm.LocalVec
- # Returning a copy, on the other hand, always goes to the local type,
- # regardless of where the source type came from.
- assert type(m.return_copy(v1)) is m.LocalVec
- assert type(m.return_copy(v2)) is m.LocalVec
- assert type(cm.return_copy(v1)) is cm.LocalVec
- assert type(cm.return_copy(v2)) is cm.LocalVec
-
- # Test the example given in the documentation (which also tests inheritance casting):
- mycat = m.Cat("Fluffy")
- mydog = cm.Dog("Rover")
- assert mycat.get_name() == "Fluffy"
- assert mydog.name() == "Rover"
- assert m.Cat.__base__.__name__ == "Pet"
- assert cm.Dog.__base__.__name__ == "Pet"
- assert m.Cat.__base__ is not cm.Dog.__base__
- assert m.pet_name(mycat) == "Fluffy"
- assert m.pet_name(mydog) == "Rover"
- assert cm.pet_name(mycat) == "Fluffy"
- assert cm.pet_name(mydog) == "Rover"
-
- assert m.MixGL is not cm.MixGL
- a = m.MixGL(1)
- b = cm.MixGL(2)
- assert m.get_gl_value(a) == 11
- assert m.get_gl_value(b) == 12
- assert cm.get_gl_value(a) == 101
- assert cm.get_gl_value(b) == 102
-
- c, d = m.MixGL2(3), cm.MixGL2(4)
- with pytest.raises(TypeError) as excinfo:
- m.get_gl_value(c)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.get_gl_value(d)
- assert "incompatible function arguments" in str(excinfo.value)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_methods_and_attributes.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_methods_and_attributes.cpp
deleted file mode 100644
index 6a2cfb6f7a3fd7bb6bc74c1d370d98ad338ddc46..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_methods_and_attributes.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- tests/test_methods_and_attributes.cpp -- constructors, deconstructors, attribute access,
- __str__, argument and return value conventions
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-
-#if !defined(PYBIND11_OVERLOAD_CAST)
-template <typename... Args>
-using overload_cast_ = pybind11::detail::overload_cast_impl<Args...>;
-#endif
-
-class ExampleMandA {
-public:
- ExampleMandA() { print_default_created(this); }
- ExampleMandA(int value) : value(value) { print_created(this, value); }
- ExampleMandA(const ExampleMandA &e) : value(e.value) { print_copy_created(this); }
- ExampleMandA(std::string&&) {}
- ExampleMandA(ExampleMandA &&e) : value(e.value) { print_move_created(this); }
- ~ExampleMandA() { print_destroyed(this); }
-
- std::string toString() {
- return "ExampleMandA[value=" + std::to_string(value) + "]";
- }
-
- void operator=(const ExampleMandA &e) { print_copy_assigned(this); value = e.value; }
- void operator=(ExampleMandA &&e) { print_move_assigned(this); value = e.value; }
-
- void add1(ExampleMandA other) { value += other.value; } // passing by value
- void add2(ExampleMandA &other) { value += other.value; } // passing by reference
- void add3(const ExampleMandA &other) { value += other.value; } // passing by const reference
- void add4(ExampleMandA *other) { value += other->value; } // passing by pointer
- void add5(const ExampleMandA *other) { value += other->value; } // passing by const pointer
-
- void add6(int other) { value += other; } // passing by value
- void add7(int &other) { value += other; } // passing by reference
- void add8(const int &other) { value += other; } // passing by const reference
- void add9(int *other) { value += *other; } // passing by pointer
- void add10(const int *other) { value += *other; } // passing by const pointer
-
- void consume_str(std::string&&) {}
-
- ExampleMandA self1() { return *this; } // return by value
- ExampleMandA &self2() { return *this; } // return by reference
- const ExampleMandA &self3() { return *this; } // return by const reference
- ExampleMandA *self4() { return this; } // return by pointer
- const ExampleMandA *self5() { return this; } // return by const pointer
-
- int internal1() { return value; } // return by value
- int &internal2() { return value; } // return by reference
- const int &internal3() { return value; } // return by const reference
- int *internal4() { return &value; } // return by pointer
- const int *internal5() { return &value; } // return by const pointer
-
- py::str overloaded() { return "()"; }
- py::str overloaded(int) { return "(int)"; }
- py::str overloaded(int, float) { return "(int, float)"; }
- py::str overloaded(float, int) { return "(float, int)"; }
- py::str overloaded(int, int) { return "(int, int)"; }
- py::str overloaded(float, float) { return "(float, float)"; }
- py::str overloaded(int) const { return "(int) const"; }
- py::str overloaded(int, float) const { return "(int, float) const"; }
- py::str overloaded(float, int) const { return "(float, int) const"; }
- py::str overloaded(int, int) const { return "(int, int) const"; }
- py::str overloaded(float, float) const { return "(float, float) const"; }
-
- static py::str overloaded(float) { return "static float"; }
-
- int value = 0;
-};
-
-struct TestProperties {
- int value = 1;
- static int static_value;
-
- int get() const { return value; }
- void set(int v) { value = v; }
-
- static int static_get() { return static_value; }
- static void static_set(int v) { static_value = v; }
-};
-int TestProperties::static_value = 1;
-
-struct TestPropertiesOverride : TestProperties {
- int value = 99;
- static int static_value;
-};
-int TestPropertiesOverride::static_value = 99;
-
-struct TestPropRVP {
- UserType v1{1};
- UserType v2{1};
- static UserType sv1;
- static UserType sv2;
-
- const UserType &get1() const { return v1; }
- const UserType &get2() const { return v2; }
- UserType get_rvalue() const { return v2; }
- void set1(int v) { v1.set(v); }
- void set2(int v) { v2.set(v); }
-};
-UserType TestPropRVP::sv1(1);
-UserType TestPropRVP::sv2(1);
-
-// Test None-allowed py::arg argument policy
-class NoneTester { public: int answer = 42; };
-int none1(const NoneTester &obj) { return obj.answer; }
-int none2(NoneTester *obj) { return obj ? obj->answer : -1; }
-int none3(std::shared_ptr<NoneTester> &obj) { return obj ? obj->answer : -1; }
-int none4(std::shared_ptr<NoneTester> *obj) { return obj && *obj ? (*obj)->answer : -1; }
-int none5(std::shared_ptr<NoneTester> obj) { return obj ? obj->answer : -1; }
-
-struct StrIssue {
- int val = -1;
-
- StrIssue() = default;
- StrIssue(int i) : val{i} {}
-};
-
-// Issues #854, #910: incompatible function args when member function/pointer is in unregistered base class
-class UnregisteredBase {
-public:
- void do_nothing() const {}
- void increase_value() { rw_value++; ro_value += 0.25; }
- void set_int(int v) { rw_value = v; }
- int get_int() const { return rw_value; }
- double get_double() const { return ro_value; }
- int rw_value = 42;
- double ro_value = 1.25;
-};
-class RegisteredDerived : public UnregisteredBase {
-public:
- using UnregisteredBase::UnregisteredBase;
- double sum() const { return rw_value + ro_value; }
-};
-
-// Test explicit lvalue ref-qualification
-struct RefQualified {
- int value = 0;
-
- void refQualified(int other) & { value += other; }
- int constRefQualified(int other) const & { return value + other; }
-};
-
-TEST_SUBMODULE(methods_and_attributes, m) {
- // test_methods_and_attributes
- py::class_<ExampleMandA> emna(m, "ExampleMandA");
- emna.def(py::init<>())
- .def(py::init<int>())
- .def(py::init<std::string&&>())
- .def(py::init<const ExampleMandA&>())
- .def("add1", &ExampleMandA::add1)
- .def("add2", &ExampleMandA::add2)
- .def("add3", &ExampleMandA::add3)
- .def("add4", &ExampleMandA::add4)
- .def("add5", &ExampleMandA::add5)
- .def("add6", &ExampleMandA::add6)
- .def("add7", &ExampleMandA::add7)
- .def("add8", &ExampleMandA::add8)
- .def("add9", &ExampleMandA::add9)
- .def("add10", &ExampleMandA::add10)
- .def("consume_str", &ExampleMandA::consume_str)
- .def("self1", &ExampleMandA::self1)
- .def("self2", &ExampleMandA::self2)
- .def("self3", &ExampleMandA::self3)
- .def("self4", &ExampleMandA::self4)
- .def("self5", &ExampleMandA::self5)
- .def("internal1", &ExampleMandA::internal1)
- .def("internal2", &ExampleMandA::internal2)
- .def("internal3", &ExampleMandA::internal3)
- .def("internal4", &ExampleMandA::internal4)
- .def("internal5", &ExampleMandA::internal5)
-#if defined(PYBIND11_OVERLOAD_CAST)
- .def("overloaded", py::overload_cast<>(&ExampleMandA::overloaded))
- .def("overloaded", py::overload_cast<int>(&ExampleMandA::overloaded))
- .def("overloaded", py::overload_cast<int, float>(&ExampleMandA::overloaded))
- .def("overloaded", py::overload_cast<float, int>(&ExampleMandA::overloaded))
- .def("overloaded", py::overload_cast<int, int>(&ExampleMandA::overloaded))
- .def("overloaded", py::overload_cast<float, float>(&ExampleMandA::overloaded))
- .def("overloaded_float", py::overload_cast<float, float>(&ExampleMandA::overloaded))
- .def("overloaded_const", py::overload_cast<int >(&ExampleMandA::overloaded, py::const_))
- .def("overloaded_const", py::overload_cast<int, float>(&ExampleMandA::overloaded, py::const_))
- .def("overloaded_const", py::overload_cast<float, int>(&ExampleMandA::overloaded, py::const_))
- .def("overloaded_const", py::overload_cast<int, int>(&ExampleMandA::overloaded, py::const_))
- .def("overloaded_const", py::overload_cast<float, float>(&ExampleMandA::overloaded, py::const_))
-#else
- // Use both the traditional static_cast method and the C++11 compatible overload_cast_
- .def("overloaded", overload_cast_<>()(&ExampleMandA::overloaded))
- .def("overloaded", overload_cast_<int>()(&ExampleMandA::overloaded))
- .def("overloaded", overload_cast_<int, float>()(&ExampleMandA::overloaded))
- .def("overloaded", static_cast<py::str (ExampleMandA::*)(float, int)>(&ExampleMandA::overloaded))
- .def("overloaded", static_cast<py::str (ExampleMandA::*)(int, int)>(&ExampleMandA::overloaded))
- .def("overloaded", static_cast<py::str (ExampleMandA::*)(float, float)>(&ExampleMandA::overloaded))
- .def("overloaded_float", overload_cast_<float, float>()(&ExampleMandA::overloaded))
- .def("overloaded_const", overload_cast_<int >()(&ExampleMandA::overloaded, py::const_))
- .def("overloaded_const", overload_cast_<int, float>()(&ExampleMandA::overloaded, py::const_))
- .def("overloaded_const", static_cast<py::str (ExampleMandA::*)(float, int) const>(&ExampleMandA::overloaded))
- .def("overloaded_const", static_cast<py::str (ExampleMandA::*)(int, int) const>(&ExampleMandA::overloaded))
- .def("overloaded_const", static_cast<py::str (ExampleMandA::*)(float, float) const>(&ExampleMandA::overloaded))
-#endif
- // test_no_mixed_overloads
- // Raise error if trying to mix static/non-static overloads on the same name:
- .def_static("add_mixed_overloads1", []() {
- auto emna = py::reinterpret_borrow<py::class_<ExampleMandA>>(py::module_::import("pybind11_tests.methods_and_attributes").attr("ExampleMandA"));
- emna.def ("overload_mixed1", static_cast<py::str (ExampleMandA::*)(int, int)>(&ExampleMandA::overloaded))
- .def_static("overload_mixed1", static_cast<py::str ( *)(float )>(&ExampleMandA::overloaded));
- })
- .def_static("add_mixed_overloads2", []() {
- auto emna = py::reinterpret_borrow<py::class_<ExampleMandA>>(py::module_::import("pybind11_tests.methods_and_attributes").attr("ExampleMandA"));
- emna.def_static("overload_mixed2", static_cast<py::str ( *)(float )>(&ExampleMandA::overloaded))
- .def ("overload_mixed2", static_cast<py::str (ExampleMandA::*)(int, int)>(&ExampleMandA::overloaded));
- })
- .def("__str__", &ExampleMandA::toString)
- .def_readwrite("value", &ExampleMandA::value);
-
- // test_copy_method
- // Issue #443: can't call copied methods in Python 3
- emna.attr("add2b") = emna.attr("add2");
-
- // test_properties, test_static_properties, test_static_cls
- py::class_<TestProperties>(m, "TestProperties")
- .def(py::init<>())
- .def_readonly("def_readonly", &TestProperties::value)
- .def_readwrite("def_readwrite", &TestProperties::value)
- .def_property("def_writeonly", nullptr,
- [](TestProperties& s,int v) { s.value = v; } )
- .def_property("def_property_writeonly", nullptr, &TestProperties::set)
- .def_property_readonly("def_property_readonly", &TestProperties::get)
- .def_property("def_property", &TestProperties::get, &TestProperties::set)
- .def_property("def_property_impossible", nullptr, nullptr)
- .def_readonly_static("def_readonly_static", &TestProperties::static_value)
- .def_readwrite_static("def_readwrite_static", &TestProperties::static_value)
- .def_property_static("def_writeonly_static", nullptr,
- [](py::object, int v) { TestProperties::static_value = v; })
- .def_property_readonly_static("def_property_readonly_static",
- [](py::object) { return TestProperties::static_get(); })
- .def_property_static("def_property_writeonly_static", nullptr,
- [](py::object, int v) { return TestProperties::static_set(v); })
- .def_property_static("def_property_static",
- [](py::object) { return TestProperties::static_get(); },
- [](py::object, int v) { TestProperties::static_set(v); })
- .def_property_static("static_cls",
- [](py::object cls) { return cls; },
- [](py::object cls, py::function f) { f(cls); });
-
- py::class_<TestPropertiesOverride, TestProperties>(m, "TestPropertiesOverride")
- .def(py::init<>())
- .def_readonly("def_readonly", &TestPropertiesOverride::value)
- .def_readonly_static("def_readonly_static", &TestPropertiesOverride::static_value);
-
- auto static_get1 = [](py::object) -> const UserType & { return TestPropRVP::sv1; };
- auto static_get2 = [](py::object) -> const UserType & { return TestPropRVP::sv2; };
- auto static_set1 = [](py::object, int v) { TestPropRVP::sv1.set(v); };
- auto static_set2 = [](py::object, int v) { TestPropRVP::sv2.set(v); };
- auto rvp_copy = py::return_value_policy::copy;
-
- // test_property_return_value_policies
- py::class_<TestPropRVP>(m, "TestPropRVP")
- .def(py::init<>())
- .def_property_readonly("ro_ref", &TestPropRVP::get1)
- .def_property_readonly("ro_copy", &TestPropRVP::get2, rvp_copy)
- .def_property_readonly("ro_func", py::cpp_function(&TestPropRVP::get2, rvp_copy))
- .def_property("rw_ref", &TestPropRVP::get1, &TestPropRVP::set1)
- .def_property("rw_copy", &TestPropRVP::get2, &TestPropRVP::set2, rvp_copy)
- .def_property("rw_func", py::cpp_function(&TestPropRVP::get2, rvp_copy), &TestPropRVP::set2)
- .def_property_readonly_static("static_ro_ref", static_get1)
- .def_property_readonly_static("static_ro_copy", static_get2, rvp_copy)
- .def_property_readonly_static("static_ro_func", py::cpp_function(static_get2, rvp_copy))
- .def_property_static("static_rw_ref", static_get1, static_set1)
- .def_property_static("static_rw_copy", static_get2, static_set2, rvp_copy)
- .def_property_static("static_rw_func", py::cpp_function(static_get2, rvp_copy), static_set2)
- // test_property_rvalue_policy
- .def_property_readonly("rvalue", &TestPropRVP::get_rvalue)
- .def_property_readonly_static("static_rvalue", [](py::object) { return UserType(1); });
-
- // test_metaclass_override
- struct MetaclassOverride { };
- py::class_<MetaclassOverride>(m, "MetaclassOverride", py::metaclass((PyObject *) &PyType_Type))
- .def_property_readonly_static("readonly", [](py::object) { return 1; });
-
- // test_overload_ordering
- m.def("overload_order", [](std::string) { return 1; });
- m.def("overload_order", [](std::string) { return 2; });
- m.def("overload_order", [](int) { return 3; });
- m.def("overload_order", [](int) { return 4; }, py::prepend{});
-
-#if !defined(PYPY_VERSION)
- // test_dynamic_attributes
- class DynamicClass {
- public:
- DynamicClass() { print_default_created(this); }
- DynamicClass(const DynamicClass&) = delete;
- ~DynamicClass() { print_destroyed(this); }
- };
- py::class_<DynamicClass>(m, "DynamicClass", py::dynamic_attr())
- .def(py::init());
-
- class CppDerivedDynamicClass : public DynamicClass { };
- py::class_<CppDerivedDynamicClass, DynamicClass>(m, "CppDerivedDynamicClass")
- .def(py::init());
-#endif
-
- // test_bad_arg_default
- // Issue/PR #648: bad arg default debugging output
-#if !defined(NDEBUG)
- m.attr("debug_enabled") = true;
-#else
- m.attr("debug_enabled") = false;
-#endif
- m.def("bad_arg_def_named", []{
- auto m = py::module_::import("pybind11_tests");
- m.def("should_fail", [](int, UnregisteredType) {}, py::arg(), py::arg("a") = UnregisteredType());
- });
- m.def("bad_arg_def_unnamed", []{
- auto m = py::module_::import("pybind11_tests");
- m.def("should_fail", [](int, UnregisteredType) {}, py::arg(), py::arg() = UnregisteredType());
- });
-
- // test_accepts_none
- py::class_<NoneTester, std::shared_ptr<NoneTester>>(m, "NoneTester")
- .def(py::init<>());
- m.def("no_none1", &none1, py::arg().none(false));
- m.def("no_none2", &none2, py::arg().none(false));
- m.def("no_none3", &none3, py::arg().none(false));
- m.def("no_none4", &none4, py::arg().none(false));
- m.def("no_none5", &none5, py::arg().none(false));
- m.def("ok_none1", &none1);
- m.def("ok_none2", &none2, py::arg().none(true));
- m.def("ok_none3", &none3);
- m.def("ok_none4", &none4, py::arg().none(true));
- m.def("ok_none5", &none5);
-
- m.def("no_none_kwarg", &none2, py::arg("a").none(false));
- m.def("no_none_kwarg_kw_only", &none2, py::kw_only(), py::arg("a").none(false));
-
- // test_str_issue
- // Issue #283: __str__ called on uninitialized instance when constructor arguments invalid
- py::class_<StrIssue>(m, "StrIssue")
- .def(py::init<int>())
- .def(py::init<>())
- .def("__str__", [](const StrIssue &si) {
- return "StrIssue[" + std::to_string(si.val) + "]"; }
- );
-
- // test_unregistered_base_implementations
- //
- // Issues #854/910: incompatible function args when member function/pointer is in unregistered
- // base class The methods and member pointers below actually resolve to members/pointers in
- // UnregisteredBase; before this test/fix they would be registered via lambda with a first
- // argument of an unregistered type, and thus uncallable.
- py::class_<RegisteredDerived>(m, "RegisteredDerived")
- .def(py::init<>())
- .def("do_nothing", &RegisteredDerived::do_nothing)
- .def("increase_value", &RegisteredDerived::increase_value)
- .def_readwrite("rw_value", &RegisteredDerived::rw_value)
- .def_readonly("ro_value", &RegisteredDerived::ro_value)
- // These should trigger a static_assert if uncommented
- //.def_readwrite("fails", &UserType::value) // should trigger a static_assert if uncommented
- //.def_readonly("fails", &UserType::value) // should trigger a static_assert if uncommented
- .def_property("rw_value_prop", &RegisteredDerived::get_int, &RegisteredDerived::set_int)
- .def_property_readonly("ro_value_prop", &RegisteredDerived::get_double)
- // This one is in the registered class:
- .def("sum", &RegisteredDerived::sum)
- ;
-
- using Adapted = decltype(py::method_adaptor<RegisteredDerived>(&RegisteredDerived::do_nothing));
- static_assert(std::is_same<Adapted, void (RegisteredDerived::*)() const>::value, "");
-
- // test_methods_and_attributes
- py::class_<RefQualified>(m, "RefQualified")
- .def(py::init<>())
- .def_readonly("value", &RefQualified::value)
- .def("refQualified", &RefQualified::refQualified)
- .def("constRefQualified", &RefQualified::constRefQualified);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_methods_and_attributes.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_methods_and_attributes.py
deleted file mode 100644
index db135ccec051e3e1bbf4a07a54126ea04f98c8dd..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_methods_and_attributes.py
+++ /dev/null
@@ -1,494 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import methods_and_attributes as m
-from pybind11_tests import ConstructorStats
-
-
-def test_methods_and_attributes():
- instance1 = m.ExampleMandA()
- instance2 = m.ExampleMandA(32)
-
- instance1.add1(instance2)
- instance1.add2(instance2)
- instance1.add3(instance2)
- instance1.add4(instance2)
- instance1.add5(instance2)
- instance1.add6(32)
- instance1.add7(32)
- instance1.add8(32)
- instance1.add9(32)
- instance1.add10(32)
-
- assert str(instance1) == "ExampleMandA[value=320]"
- assert str(instance2) == "ExampleMandA[value=32]"
- assert str(instance1.self1()) == "ExampleMandA[value=320]"
- assert str(instance1.self2()) == "ExampleMandA[value=320]"
- assert str(instance1.self3()) == "ExampleMandA[value=320]"
- assert str(instance1.self4()) == "ExampleMandA[value=320]"
- assert str(instance1.self5()) == "ExampleMandA[value=320]"
-
- assert instance1.internal1() == 320
- assert instance1.internal2() == 320
- assert instance1.internal3() == 320
- assert instance1.internal4() == 320
- assert instance1.internal5() == 320
-
- assert instance1.overloaded() == "()"
- assert instance1.overloaded(0) == "(int)"
- assert instance1.overloaded(1, 1.0) == "(int, float)"
- assert instance1.overloaded(2.0, 2) == "(float, int)"
- assert instance1.overloaded(3, 3) == "(int, int)"
- assert instance1.overloaded(4.0, 4.0) == "(float, float)"
- assert instance1.overloaded_const(-3) == "(int) const"
- assert instance1.overloaded_const(5, 5.0) == "(int, float) const"
- assert instance1.overloaded_const(6.0, 6) == "(float, int) const"
- assert instance1.overloaded_const(7, 7) == "(int, int) const"
- assert instance1.overloaded_const(8.0, 8.0) == "(float, float) const"
- assert instance1.overloaded_float(1, 1) == "(float, float)"
- assert instance1.overloaded_float(1, 1.0) == "(float, float)"
- assert instance1.overloaded_float(1.0, 1) == "(float, float)"
- assert instance1.overloaded_float(1.0, 1.0) == "(float, float)"
-
- assert instance1.value == 320
- instance1.value = 100
- assert str(instance1) == "ExampleMandA[value=100]"
-
- cstats = ConstructorStats.get(m.ExampleMandA)
- assert cstats.alive() == 2
- del instance1, instance2
- assert cstats.alive() == 0
- assert cstats.values() == ["32"]
- assert cstats.default_constructions == 1
- assert cstats.copy_constructions == 2
- assert cstats.move_constructions >= 2
- assert cstats.copy_assignments == 0
- assert cstats.move_assignments == 0
-
-
-def test_copy_method():
- """Issue #443: calling copied methods fails in Python 3"""
-
- m.ExampleMandA.add2c = m.ExampleMandA.add2
- m.ExampleMandA.add2d = m.ExampleMandA.add2b
- a = m.ExampleMandA(123)
- assert a.value == 123
- a.add2(m.ExampleMandA(-100))
- assert a.value == 23
- a.add2b(m.ExampleMandA(20))
- assert a.value == 43
- a.add2c(m.ExampleMandA(6))
- assert a.value == 49
- a.add2d(m.ExampleMandA(-7))
- assert a.value == 42
-
-
-def test_properties():
- instance = m.TestProperties()
-
- assert instance.def_readonly == 1
- with pytest.raises(AttributeError):
- instance.def_readonly = 2
-
- instance.def_readwrite = 2
- assert instance.def_readwrite == 2
-
- assert instance.def_property_readonly == 2
- with pytest.raises(AttributeError):
- instance.def_property_readonly = 3
-
- instance.def_property = 3
- assert instance.def_property == 3
-
- with pytest.raises(AttributeError) as excinfo:
- dummy = instance.def_property_writeonly # noqa: F841 unused var
- assert "unreadable attribute" in str(excinfo.value)
-
- instance.def_property_writeonly = 4
- assert instance.def_property_readonly == 4
-
- with pytest.raises(AttributeError) as excinfo:
- dummy = instance.def_property_impossible # noqa: F841 unused var
- assert "unreadable attribute" in str(excinfo.value)
-
- with pytest.raises(AttributeError) as excinfo:
- instance.def_property_impossible = 5
- assert "can't set attribute" in str(excinfo.value)
-
-
-def test_static_properties():
- assert m.TestProperties.def_readonly_static == 1
- with pytest.raises(AttributeError) as excinfo:
- m.TestProperties.def_readonly_static = 2
- assert "can't set attribute" in str(excinfo.value)
-
- m.TestProperties.def_readwrite_static = 2
- assert m.TestProperties.def_readwrite_static == 2
-
- with pytest.raises(AttributeError) as excinfo:
- dummy = m.TestProperties.def_writeonly_static # noqa: F841 unused var
- assert "unreadable attribute" in str(excinfo.value)
-
- m.TestProperties.def_writeonly_static = 3
- assert m.TestProperties.def_readonly_static == 3
-
- assert m.TestProperties.def_property_readonly_static == 3
- with pytest.raises(AttributeError) as excinfo:
- m.TestProperties.def_property_readonly_static = 99
- assert "can't set attribute" in str(excinfo.value)
-
- m.TestProperties.def_property_static = 4
- assert m.TestProperties.def_property_static == 4
-
- with pytest.raises(AttributeError) as excinfo:
- dummy = m.TestProperties.def_property_writeonly_static
- assert "unreadable attribute" in str(excinfo.value)
-
- m.TestProperties.def_property_writeonly_static = 5
- assert m.TestProperties.def_property_static == 5
-
- # Static property read and write via instance
- instance = m.TestProperties()
-
- m.TestProperties.def_readwrite_static = 0
- assert m.TestProperties.def_readwrite_static == 0
- assert instance.def_readwrite_static == 0
-
- instance.def_readwrite_static = 2
- assert m.TestProperties.def_readwrite_static == 2
- assert instance.def_readwrite_static == 2
-
- with pytest.raises(AttributeError) as excinfo:
- dummy = instance.def_property_writeonly_static # noqa: F841 unused var
- assert "unreadable attribute" in str(excinfo.value)
-
- instance.def_property_writeonly_static = 4
- assert instance.def_property_static == 4
-
- # It should be possible to override properties in derived classes
- assert m.TestPropertiesOverride().def_readonly == 99
- assert m.TestPropertiesOverride.def_readonly_static == 99
-
-
-def test_static_cls():
- """Static property getter and setters expect the type object as the their only argument"""
-
- instance = m.TestProperties()
- assert m.TestProperties.static_cls is m.TestProperties
- assert instance.static_cls is m.TestProperties
-
- def check_self(self):
- assert self is m.TestProperties
-
- m.TestProperties.static_cls = check_self
- instance.static_cls = check_self
-
-
-def test_metaclass_override():
- """Overriding pybind11's default metaclass changes the behavior of `static_property`"""
-
- assert type(m.ExampleMandA).__name__ == "pybind11_type"
- assert type(m.MetaclassOverride).__name__ == "type"
-
- assert m.MetaclassOverride.readonly == 1
- assert (
- type(m.MetaclassOverride.__dict__["readonly"]).__name__
- == "pybind11_static_property"
- )
-
- # Regular `type` replaces the property instead of calling `__set__()`
- m.MetaclassOverride.readonly = 2
- assert m.MetaclassOverride.readonly == 2
- assert isinstance(m.MetaclassOverride.__dict__["readonly"], int)
-
-
-def test_no_mixed_overloads():
- from pybind11_tests import debug_enabled
-
- with pytest.raises(RuntimeError) as excinfo:
- m.ExampleMandA.add_mixed_overloads1()
- assert str(
- excinfo.value
- ) == "overloading a method with both static and instance methods is not supported; " + (
- "compile in debug mode for more details"
- if not debug_enabled
- else "error while attempting to bind static method ExampleMandA.overload_mixed1"
- "(arg0: float) -> str"
- )
-
- with pytest.raises(RuntimeError) as excinfo:
- m.ExampleMandA.add_mixed_overloads2()
- assert str(
- excinfo.value
- ) == "overloading a method with both static and instance methods is not supported; " + (
- "compile in debug mode for more details"
- if not debug_enabled
- else "error while attempting to bind instance method ExampleMandA.overload_mixed2"
- "(self: pybind11_tests.methods_and_attributes.ExampleMandA, arg0: int, arg1: int)"
- " -> str"
- )
-
-
-@pytest.mark.parametrize("access", ["ro", "rw", "static_ro", "static_rw"])
-def test_property_return_value_policies(access):
- if not access.startswith("static"):
- obj = m.TestPropRVP()
- else:
- obj = m.TestPropRVP
-
- ref = getattr(obj, access + "_ref")
- assert ref.value == 1
- ref.value = 2
- assert getattr(obj, access + "_ref").value == 2
- ref.value = 1 # restore original value for static properties
-
- copy = getattr(obj, access + "_copy")
- assert copy.value == 1
- copy.value = 2
- assert getattr(obj, access + "_copy").value == 1
-
- copy = getattr(obj, access + "_func")
- assert copy.value == 1
- copy.value = 2
- assert getattr(obj, access + "_func").value == 1
-
-
-def test_property_rvalue_policy():
- """When returning an rvalue, the return value policy is automatically changed from
- `reference(_internal)` to `move`. The following would not work otherwise."""
-
- instance = m.TestPropRVP()
- o = instance.rvalue
- assert o.value == 1
-
- os = m.TestPropRVP.static_rvalue
- assert os.value == 1
-
-
-# https://foss.heptapod.net/pypy/pypy/-/issues/2447
-@pytest.mark.xfail("env.PYPY")
-def test_dynamic_attributes():
- instance = m.DynamicClass()
- assert not hasattr(instance, "foo")
- assert "foo" not in dir(instance)
-
- # Dynamically add attribute
- instance.foo = 42
- assert hasattr(instance, "foo")
- assert instance.foo == 42
- assert "foo" in dir(instance)
-
- # __dict__ should be accessible and replaceable
- assert "foo" in instance.__dict__
- instance.__dict__ = {"bar": True}
- assert not hasattr(instance, "foo")
- assert hasattr(instance, "bar")
-
- with pytest.raises(TypeError) as excinfo:
- instance.__dict__ = []
- assert str(excinfo.value) == "__dict__ must be set to a dictionary, not a 'list'"
-
- cstats = ConstructorStats.get(m.DynamicClass)
- assert cstats.alive() == 1
- del instance
- assert cstats.alive() == 0
-
- # Derived classes should work as well
- class PythonDerivedDynamicClass(m.DynamicClass):
- pass
-
- for cls in m.CppDerivedDynamicClass, PythonDerivedDynamicClass:
- derived = cls()
- derived.foobar = 100
- assert derived.foobar == 100
-
- assert cstats.alive() == 1
- del derived
- assert cstats.alive() == 0
-
-
-# https://foss.heptapod.net/pypy/pypy/-/issues/2447
-@pytest.mark.xfail("env.PYPY")
-def test_cyclic_gc():
- # One object references itself
- instance = m.DynamicClass()
- instance.circular_reference = instance
-
- cstats = ConstructorStats.get(m.DynamicClass)
- assert cstats.alive() == 1
- del instance
- assert cstats.alive() == 0
-
- # Two object reference each other
- i1 = m.DynamicClass()
- i2 = m.DynamicClass()
- i1.cycle = i2
- i2.cycle = i1
-
- assert cstats.alive() == 2
- del i1, i2
- assert cstats.alive() == 0
-
-
-def test_bad_arg_default(msg):
- from pybind11_tests import debug_enabled
-
- with pytest.raises(RuntimeError) as excinfo:
- m.bad_arg_def_named()
- assert msg(excinfo.value) == (
- "arg(): could not convert default argument 'a: UnregisteredType' in function "
- "'should_fail' into a Python object (type not registered yet?)"
- if debug_enabled
- else "arg(): could not convert default argument into a Python object (type not registered "
- "yet?). Compile in debug mode for more information."
- )
-
- with pytest.raises(RuntimeError) as excinfo:
- m.bad_arg_def_unnamed()
- assert msg(excinfo.value) == (
- "arg(): could not convert default argument 'UnregisteredType' in function "
- "'should_fail' into a Python object (type not registered yet?)"
- if debug_enabled
- else "arg(): could not convert default argument into a Python object (type not registered "
- "yet?). Compile in debug mode for more information."
- )
-
-
-def test_accepts_none(msg):
- a = m.NoneTester()
- assert m.no_none1(a) == 42
- assert m.no_none2(a) == 42
- assert m.no_none3(a) == 42
- assert m.no_none4(a) == 42
- assert m.no_none5(a) == 42
- assert m.ok_none1(a) == 42
- assert m.ok_none2(a) == 42
- assert m.ok_none3(a) == 42
- assert m.ok_none4(a) == 42
- assert m.ok_none5(a) == 42
-
- with pytest.raises(TypeError) as excinfo:
- m.no_none1(None)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.no_none2(None)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.no_none3(None)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.no_none4(None)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.no_none5(None)
- assert "incompatible function arguments" in str(excinfo.value)
-
- # The first one still raises because you can't pass None as a lvalue reference arg:
- with pytest.raises(TypeError) as excinfo:
- assert m.ok_none1(None) == -1
- assert (
- msg(excinfo.value)
- == """
- ok_none1(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: m.methods_and_attributes.NoneTester) -> int
-
- Invoked with: None
- """
- )
-
- # The rest take the argument as pointer or holder, and accept None:
- assert m.ok_none2(None) == -1
- assert m.ok_none3(None) == -1
- assert m.ok_none4(None) == -1
- assert m.ok_none5(None) == -1
-
- with pytest.raises(TypeError) as excinfo:
- m.no_none_kwarg(None)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.no_none_kwarg(a=None)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.no_none_kwarg_kw_only(None)
- assert "incompatible function arguments" in str(excinfo.value)
- with pytest.raises(TypeError) as excinfo:
- m.no_none_kwarg_kw_only(a=None)
- assert "incompatible function arguments" in str(excinfo.value)
-
-
-def test_str_issue(msg):
- """#283: __str__ called on uninitialized instance when constructor arguments invalid"""
-
- assert str(m.StrIssue(3)) == "StrIssue[3]"
-
- with pytest.raises(TypeError) as excinfo:
- str(m.StrIssue("no", "such", "constructor"))
- assert (
- msg(excinfo.value)
- == """
- __init__(): incompatible constructor arguments. The following argument types are supported:
- 1. m.methods_and_attributes.StrIssue(arg0: int)
- 2. m.methods_and_attributes.StrIssue()
-
- Invoked with: 'no', 'such', 'constructor'
- """
- )
-
-
-def test_unregistered_base_implementations():
- a = m.RegisteredDerived()
- a.do_nothing()
- assert a.rw_value == 42
- assert a.ro_value == 1.25
- a.rw_value += 5
- assert a.sum() == 48.25
- a.increase_value()
- assert a.rw_value == 48
- assert a.ro_value == 1.5
- assert a.sum() == 49.5
- assert a.rw_value_prop == 48
- a.rw_value_prop += 1
- assert a.rw_value_prop == 49
- a.increase_value()
- assert a.ro_value_prop == 1.75
-
-
-def test_ref_qualified():
- """Tests that explicit lvalue ref-qualified methods can be called just like their
- non ref-qualified counterparts."""
-
- r = m.RefQualified()
- assert r.value == 0
- r.refQualified(17)
- assert r.value == 17
- assert r.constRefQualified(23) == 40
-
-
-def test_overload_ordering():
- "Check to see if the normal overload order (first defined) and prepend overload order works"
- assert m.overload_order("string") == 1
- assert m.overload_order(0) == 4
-
- # Different for Python 2 vs. 3
- uni_name = type(u"").__name__
-
- assert "1. overload_order(arg0: int) -> int" in m.overload_order.__doc__
- assert (
- "2. overload_order(arg0: {}) -> int".format(uni_name)
- in m.overload_order.__doc__
- )
- assert (
- "3. overload_order(arg0: {}) -> int".format(uni_name)
- in m.overload_order.__doc__
- )
- assert "4. overload_order(arg0: int) -> int" in m.overload_order.__doc__
-
- with pytest.raises(TypeError) as err:
- m.overload_order(1.1)
-
- assert "1. (arg0: int) -> int" in str(err.value)
- assert "2. (arg0: {}) -> int".format(uni_name) in str(err.value)
- assert "3. (arg0: {}) -> int".format(uni_name) in str(err.value)
- assert "4. (arg0: int) -> int" in str(err.value)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_modules.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_modules.cpp
deleted file mode 100644
index 67387e809b4a727776c62cb27567ef0bf90994a9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_modules.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- tests/test_modules.cpp -- nested modules, importing modules, and
- internal references
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-
-TEST_SUBMODULE(modules, m) {
- // test_nested_modules
- // This is intentionally "py::module" to verify it still can be used in place of "py::module_"
- py::module m_sub = m.def_submodule("subsubmodule");
- m_sub.def("submodule_func", []() { return "submodule_func()"; });
-
- // test_reference_internal
- class A {
- public:
- A(int v) : v(v) { print_created(this, v); }
- ~A() { print_destroyed(this); }
- A(const A&) { print_copy_created(this); }
- A& operator=(const A ©) { print_copy_assigned(this); v = copy.v; return *this; }
- std::string toString() { return "A[" + std::to_string(v) + "]"; }
- private:
- int v;
- };
- py::class_<A>(m_sub, "A")
- .def(py::init<int>())
- .def("__repr__", &A::toString);
-
- class B {
- public:
- B() { print_default_created(this); }
- ~B() { print_destroyed(this); }
- B(const B&) { print_copy_created(this); }
- B& operator=(const B ©) { print_copy_assigned(this); a1 = copy.a1; a2 = copy.a2; return *this; }
- A &get_a1() { return a1; }
- A &get_a2() { return a2; }
-
- A a1{1};
- A a2{2};
- };
- py::class_<B>(m_sub, "B")
- .def(py::init<>())
- .def("get_a1", &B::get_a1, "Return the internal A 1", py::return_value_policy::reference_internal)
- .def("get_a2", &B::get_a2, "Return the internal A 2", py::return_value_policy::reference_internal)
- .def_readwrite("a1", &B::a1) // def_readonly uses an internal reference return policy by default
- .def_readwrite("a2", &B::a2);
-
- // This is intentionally "py::module" to verify it still can be used in place of "py::module_"
- m.attr("OD") = py::module::import("collections").attr("OrderedDict");
-
- // test_duplicate_registration
- // Registering two things with the same name
- m.def("duplicate_registration", []() {
- class Dupe1 { };
- class Dupe2 { };
- class Dupe3 { };
- class DupeException { };
-
- // Go ahead and leak, until we have a non-leaking py::module_ constructor
- auto dm = py::module_::create_extension_module("dummy", nullptr, new py::module_::module_def);
- auto failures = py::list();
-
- py::class_<Dupe1>(dm, "Dupe1");
- py::class_<Dupe2>(dm, "Dupe2");
- dm.def("dupe1_factory", []() { return Dupe1(); });
- py::exception<DupeException>(dm, "DupeException");
-
- try {
- py::class_<Dupe1>(dm, "Dupe1");
- failures.append("Dupe1 class");
- } catch (std::runtime_error &) {}
- try {
- dm.def("Dupe1", []() { return Dupe1(); });
- failures.append("Dupe1 function");
- } catch (std::runtime_error &) {}
- try {
- py::class_<Dupe3>(dm, "dupe1_factory");
- failures.append("dupe1_factory");
- } catch (std::runtime_error &) {}
- try {
- py::exception<Dupe3>(dm, "Dupe2");
- failures.append("Dupe2");
- } catch (std::runtime_error &) {}
- try {
- dm.def("DupeException", []() { return 30; });
- failures.append("DupeException1");
- } catch (std::runtime_error &) {}
- try {
- py::class_<DupeException>(dm, "DupeException");
- failures.append("DupeException2");
- } catch (std::runtime_error &) {}
-
- return failures;
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_modules.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_modules.py
deleted file mode 100644
index 5630ccf9b371a9a9ff5d3312cae936c1a3521588..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_modules.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-from pybind11_tests import modules as m
-from pybind11_tests.modules import subsubmodule as ms
-from pybind11_tests import ConstructorStats
-
-
-def test_nested_modules():
- import pybind11_tests
-
- assert pybind11_tests.__name__ == "pybind11_tests"
- assert pybind11_tests.modules.__name__ == "pybind11_tests.modules"
- assert (
- pybind11_tests.modules.subsubmodule.__name__
- == "pybind11_tests.modules.subsubmodule"
- )
- assert m.__name__ == "pybind11_tests.modules"
- assert ms.__name__ == "pybind11_tests.modules.subsubmodule"
-
- assert ms.submodule_func() == "submodule_func()"
-
-
-def test_reference_internal():
- b = ms.B()
- assert str(b.get_a1()) == "A[1]"
- assert str(b.a1) == "A[1]"
- assert str(b.get_a2()) == "A[2]"
- assert str(b.a2) == "A[2]"
-
- b.a1 = ms.A(42)
- b.a2 = ms.A(43)
- assert str(b.get_a1()) == "A[42]"
- assert str(b.a1) == "A[42]"
- assert str(b.get_a2()) == "A[43]"
- assert str(b.a2) == "A[43]"
-
- astats, bstats = ConstructorStats.get(ms.A), ConstructorStats.get(ms.B)
- assert astats.alive() == 2
- assert bstats.alive() == 1
- del b
- assert astats.alive() == 0
- assert bstats.alive() == 0
- assert astats.values() == ["1", "2", "42", "43"]
- assert bstats.values() == []
- assert astats.default_constructions == 0
- assert bstats.default_constructions == 1
- assert astats.copy_constructions == 0
- assert bstats.copy_constructions == 0
- # assert astats.move_constructions >= 0 # Don't invoke any
- # assert bstats.move_constructions >= 0 # Don't invoke any
- assert astats.copy_assignments == 2
- assert bstats.copy_assignments == 0
- assert astats.move_assignments == 0
- assert bstats.move_assignments == 0
-
-
-def test_importing():
- from pybind11_tests.modules import OD
- from collections import OrderedDict
-
- assert OD is OrderedDict
- assert str(OD([(1, "a"), (2, "b")])) == "OrderedDict([(1, 'a'), (2, 'b')])"
-
-
-def test_pydoc():
- """Pydoc needs to be able to provide help() for everything inside a pybind11 module"""
- import pybind11_tests
- import pydoc
-
- assert pybind11_tests.__name__ == "pybind11_tests"
- assert pybind11_tests.__doc__ == "pybind11 test module"
- assert pydoc.text.docmodule(pybind11_tests)
-
-
-def test_duplicate_registration():
- """Registering two things with the same name"""
-
- assert m.duplicate_registration() == []
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_multiple_inheritance.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_multiple_inheritance.cpp
deleted file mode 100644
index e67200809dd61fb7e260b80e6b427e471564381c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_multiple_inheritance.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- tests/test_multiple_inheritance.cpp -- multiple inheritance,
- implicit MI casts
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-
-// Many bases for testing that multiple inheritance from many classes (i.e. requiring extra
-// space for holder constructed flags) works.
-template <int N> struct BaseN {
- BaseN(int i) : i(i) { }
- int i;
-};
-
-// test_mi_static_properties
-struct Vanilla {
- std::string vanilla() { return "Vanilla"; };
-};
-struct WithStatic1 {
- static std::string static_func1() { return "WithStatic1"; };
- static int static_value1;
-};
-struct WithStatic2 {
- static std::string static_func2() { return "WithStatic2"; };
- static int static_value2;
-};
-struct VanillaStaticMix1 : Vanilla, WithStatic1, WithStatic2 {
- static std::string static_func() { return "VanillaStaticMix1"; }
- static int static_value;
-};
-struct VanillaStaticMix2 : WithStatic1, Vanilla, WithStatic2 {
- static std::string static_func() { return "VanillaStaticMix2"; }
- static int static_value;
-};
-int WithStatic1::static_value1 = 1;
-int WithStatic2::static_value2 = 2;
-int VanillaStaticMix1::static_value = 12;
-int VanillaStaticMix2::static_value = 12;
-
-TEST_SUBMODULE(multiple_inheritance, m) {
-
- // test_multiple_inheritance_mix1
- // test_multiple_inheritance_mix2
- struct Base1 {
- Base1(int i) : i(i) { }
- int foo() { return i; }
- int i;
- };
- py::class_<Base1> b1(m, "Base1");
- b1.def(py::init<int>())
- .def("foo", &Base1::foo);
-
- struct Base2 {
- Base2(int i) : i(i) { }
- int bar() { return i; }
- int i;
- };
- py::class_<Base2> b2(m, "Base2");
- b2.def(py::init<int>())
- .def("bar", &Base2::bar);
-
-
- // test_multiple_inheritance_cpp
- struct Base12 : Base1, Base2 {
- Base12(int i, int j) : Base1(i), Base2(j) { }
- };
- struct MIType : Base12 {
- MIType(int i, int j) : Base12(i, j) { }
- };
- py::class_<Base12, Base1, Base2>(m, "Base12");
- py::class_<MIType, Base12>(m, "MIType")
- .def(py::init<int, int>());
-
-
- // test_multiple_inheritance_python_many_bases
- #define PYBIND11_BASEN(N) py::class_<BaseN<N>>(m, "BaseN" #N).def(py::init<int>()).def("f" #N, [](BaseN<N> &b) { return b.i + N; })
- PYBIND11_BASEN( 1); PYBIND11_BASEN( 2); PYBIND11_BASEN( 3); PYBIND11_BASEN( 4);
- PYBIND11_BASEN( 5); PYBIND11_BASEN( 6); PYBIND11_BASEN( 7); PYBIND11_BASEN( 8);
- PYBIND11_BASEN( 9); PYBIND11_BASEN(10); PYBIND11_BASEN(11); PYBIND11_BASEN(12);
- PYBIND11_BASEN(13); PYBIND11_BASEN(14); PYBIND11_BASEN(15); PYBIND11_BASEN(16);
- PYBIND11_BASEN(17);
-
- // Uncommenting this should result in a compile time failure (MI can only be specified via
- // template parameters because pybind has to know the types involved; see discussion in #742 for
- // details).
-// struct Base12v2 : Base1, Base2 {
-// Base12v2(int i, int j) : Base1(i), Base2(j) { }
-// };
-// py::class_<Base12v2>(m, "Base12v2", b1, b2)
-// .def(py::init<int, int>());
-
-
- // test_multiple_inheritance_virtbase
- // Test the case where not all base classes are specified, and where pybind11 requires the
- // py::multiple_inheritance flag to perform proper casting between types.
- struct Base1a {
- Base1a(int i) : i(i) { }
- int foo() { return i; }
- int i;
- };
- py::class_<Base1a, std::shared_ptr<Base1a>>(m, "Base1a")
- .def(py::init<int>())
- .def("foo", &Base1a::foo);
-
- struct Base2a {
- Base2a(int i) : i(i) { }
- int bar() { return i; }
- int i;
- };
- py::class_<Base2a, std::shared_ptr<Base2a>>(m, "Base2a")
- .def(py::init<int>())
- .def("bar", &Base2a::bar);
-
- struct Base12a : Base1a, Base2a {
- Base12a(int i, int j) : Base1a(i), Base2a(j) { }
- };
- py::class_<Base12a, /* Base1 missing */ Base2a,
- std::shared_ptr<Base12a>>(m, "Base12a", py::multiple_inheritance())
- .def(py::init<int, int>());
-
- m.def("bar_base2a", [](Base2a *b) { return b->bar(); });
- m.def("bar_base2a_sharedptr", [](std::shared_ptr<Base2a> b) { return b->bar(); });
-
- // test_mi_unaligned_base
- // test_mi_base_return
- // Issue #801: invalid casting to derived type with MI bases
- struct I801B1 { int a = 1; I801B1() = default; I801B1(const I801B1 &) = default; virtual ~I801B1() = default; };
- struct I801B2 { int b = 2; I801B2() = default; I801B2(const I801B2 &) = default; virtual ~I801B2() = default; };
- struct I801C : I801B1, I801B2 {};
- struct I801D : I801C {}; // Indirect MI
- // Unregistered classes:
- struct I801B3 { int c = 3; virtual ~I801B3() = default; };
- struct I801E : I801B3, I801D {};
-
- py::class_<I801B1, std::shared_ptr<I801B1>>(m, "I801B1").def(py::init<>()).def_readonly("a", &I801B1::a);
- py::class_<I801B2, std::shared_ptr<I801B2>>(m, "I801B2").def(py::init<>()).def_readonly("b", &I801B2::b);
- py::class_<I801C, I801B1, I801B2, std::shared_ptr<I801C>>(m, "I801C").def(py::init<>());
- py::class_<I801D, I801C, std::shared_ptr<I801D>>(m, "I801D").def(py::init<>());
-
- // Two separate issues here: first, we want to recognize a pointer to a base type as being a
- // known instance even when the pointer value is unequal (i.e. due to a non-first
- // multiple-inheritance base class):
- m.def("i801b1_c", [](I801C *c) { return static_cast<I801B1 *>(c); });
- m.def("i801b2_c", [](I801C *c) { return static_cast<I801B2 *>(c); });
- m.def("i801b1_d", [](I801D *d) { return static_cast<I801B1 *>(d); });
- m.def("i801b2_d", [](I801D *d) { return static_cast<I801B2 *>(d); });
-
- // Second, when returned a base class pointer to a derived instance, we cannot assume that the
- // pointer is `reinterpret_cast`able to the derived pointer because, like above, the base class
- // pointer could be offset.
- m.def("i801c_b1", []() -> I801B1 * { return new I801C(); });
- m.def("i801c_b2", []() -> I801B2 * { return new I801C(); });
- m.def("i801d_b1", []() -> I801B1 * { return new I801D(); });
- m.def("i801d_b2", []() -> I801B2 * { return new I801D(); });
-
- // Return a base class pointer to a pybind-registered type when the actual derived type
- // isn't pybind-registered (and uses multiple-inheritance to offset the pybind base)
- m.def("i801e_c", []() -> I801C * { return new I801E(); });
- m.def("i801e_b2", []() -> I801B2 * { return new I801E(); });
-
-
- // test_mi_static_properties
- py::class_<Vanilla>(m, "Vanilla")
- .def(py::init<>())
- .def("vanilla", &Vanilla::vanilla);
-
- py::class_<WithStatic1>(m, "WithStatic1")
- .def(py::init<>())
- .def_static("static_func1", &WithStatic1::static_func1)
- .def_readwrite_static("static_value1", &WithStatic1::static_value1);
-
- py::class_<WithStatic2>(m, "WithStatic2")
- .def(py::init<>())
- .def_static("static_func2", &WithStatic2::static_func2)
- .def_readwrite_static("static_value2", &WithStatic2::static_value2);
-
- py::class_<VanillaStaticMix1, Vanilla, WithStatic1, WithStatic2>(
- m, "VanillaStaticMix1")
- .def(py::init<>())
- .def_static("static_func", &VanillaStaticMix1::static_func)
- .def_readwrite_static("static_value", &VanillaStaticMix1::static_value);
-
- py::class_<VanillaStaticMix2, WithStatic1, Vanilla, WithStatic2>(
- m, "VanillaStaticMix2")
- .def(py::init<>())
- .def_static("static_func", &VanillaStaticMix2::static_func)
- .def_readwrite_static("static_value", &VanillaStaticMix2::static_value);
-
-
- struct WithDict { };
- struct VanillaDictMix1 : Vanilla, WithDict { };
- struct VanillaDictMix2 : WithDict, Vanilla { };
- py::class_<WithDict>(m, "WithDict", py::dynamic_attr()).def(py::init<>());
- py::class_<VanillaDictMix1, Vanilla, WithDict>(m, "VanillaDictMix1").def(py::init<>());
- py::class_<VanillaDictMix2, WithDict, Vanilla>(m, "VanillaDictMix2").def(py::init<>());
-
- // test_diamond_inheritance
- // Issue #959: segfault when constructing diamond inheritance instance
- // All of these have int members so that there will be various unequal pointers involved.
- struct B { int b; B() = default; B(const B&) = default; virtual ~B() = default; };
- struct C0 : public virtual B { int c0; };
- struct C1 : public virtual B { int c1; };
- struct D : public C0, public C1 { int d; };
- py::class_<B>(m, "B")
- .def("b", [](B *self) { return self; });
- py::class_<C0, B>(m, "C0")
- .def("c0", [](C0 *self) { return self; });
- py::class_<C1, B>(m, "C1")
- .def("c1", [](C1 *self) { return self; });
- py::class_<D, C0, C1>(m, "D")
- .def(py::init<>());
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_multiple_inheritance.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_multiple_inheritance.py
deleted file mode 100644
index e6a7f9762be3d273f00f9ceecfffb434fa0b8737..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_multiple_inheritance.py
+++ /dev/null
@@ -1,361 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import ConstructorStats
-from pybind11_tests import multiple_inheritance as m
-
-
-def test_multiple_inheritance_cpp():
- mt = m.MIType(3, 4)
-
- assert mt.foo() == 3
- assert mt.bar() == 4
-
-
-@pytest.mark.skipif("env.PYPY and env.PY2")
-@pytest.mark.xfail("env.PYPY and not env.PY2")
-def test_multiple_inheritance_mix1():
- class Base1:
- def __init__(self, i):
- self.i = i
-
- def foo(self):
- return self.i
-
- class MITypePy(Base1, m.Base2):
- def __init__(self, i, j):
- Base1.__init__(self, i)
- m.Base2.__init__(self, j)
-
- mt = MITypePy(3, 4)
-
- assert mt.foo() == 3
- assert mt.bar() == 4
-
-
-def test_multiple_inheritance_mix2():
- class Base2:
- def __init__(self, i):
- self.i = i
-
- def bar(self):
- return self.i
-
- class MITypePy(m.Base1, Base2):
- def __init__(self, i, j):
- m.Base1.__init__(self, i)
- Base2.__init__(self, j)
-
- mt = MITypePy(3, 4)
-
- assert mt.foo() == 3
- assert mt.bar() == 4
-
-
-@pytest.mark.skipif("env.PYPY and env.PY2")
-@pytest.mark.xfail("env.PYPY and not env.PY2")
-def test_multiple_inheritance_python():
- class MI1(m.Base1, m.Base2):
- def __init__(self, i, j):
- m.Base1.__init__(self, i)
- m.Base2.__init__(self, j)
-
- class B1(object):
- def v(self):
- return 1
-
- class MI2(B1, m.Base1, m.Base2):
- def __init__(self, i, j):
- B1.__init__(self)
- m.Base1.__init__(self, i)
- m.Base2.__init__(self, j)
-
- class MI3(MI2):
- def __init__(self, i, j):
- MI2.__init__(self, i, j)
-
- class MI4(MI3, m.Base2):
- def __init__(self, i, j):
- MI3.__init__(self, i, j)
- # This should be ignored (Base2 is already initialized via MI2):
- m.Base2.__init__(self, i + 100)
-
- class MI5(m.Base2, B1, m.Base1):
- def __init__(self, i, j):
- B1.__init__(self)
- m.Base1.__init__(self, i)
- m.Base2.__init__(self, j)
-
- class MI6(m.Base2, B1):
- def __init__(self, i):
- m.Base2.__init__(self, i)
- B1.__init__(self)
-
- class B2(B1):
- def v(self):
- return 2
-
- class B3(object):
- def v(self):
- return 3
-
- class B4(B3, B2):
- def v(self):
- return 4
-
- class MI7(B4, MI6):
- def __init__(self, i):
- B4.__init__(self)
- MI6.__init__(self, i)
-
- class MI8(MI6, B3):
- def __init__(self, i):
- MI6.__init__(self, i)
- B3.__init__(self)
-
- class MI8b(B3, MI6):
- def __init__(self, i):
- B3.__init__(self)
- MI6.__init__(self, i)
-
- mi1 = MI1(1, 2)
- assert mi1.foo() == 1
- assert mi1.bar() == 2
-
- mi2 = MI2(3, 4)
- assert mi2.v() == 1
- assert mi2.foo() == 3
- assert mi2.bar() == 4
-
- mi3 = MI3(5, 6)
- assert mi3.v() == 1
- assert mi3.foo() == 5
- assert mi3.bar() == 6
-
- mi4 = MI4(7, 8)
- assert mi4.v() == 1
- assert mi4.foo() == 7
- assert mi4.bar() == 8
-
- mi5 = MI5(10, 11)
- assert mi5.v() == 1
- assert mi5.foo() == 10
- assert mi5.bar() == 11
-
- mi6 = MI6(12)
- assert mi6.v() == 1
- assert mi6.bar() == 12
-
- mi7 = MI7(13)
- assert mi7.v() == 4
- assert mi7.bar() == 13
-
- mi8 = MI8(14)
- assert mi8.v() == 1
- assert mi8.bar() == 14
-
- mi8b = MI8b(15)
- assert mi8b.v() == 3
- assert mi8b.bar() == 15
-
-
-def test_multiple_inheritance_python_many_bases():
- class MIMany14(m.BaseN1, m.BaseN2, m.BaseN3, m.BaseN4):
- def __init__(self):
- m.BaseN1.__init__(self, 1)
- m.BaseN2.__init__(self, 2)
- m.BaseN3.__init__(self, 3)
- m.BaseN4.__init__(self, 4)
-
- class MIMany58(m.BaseN5, m.BaseN6, m.BaseN7, m.BaseN8):
- def __init__(self):
- m.BaseN5.__init__(self, 5)
- m.BaseN6.__init__(self, 6)
- m.BaseN7.__init__(self, 7)
- m.BaseN8.__init__(self, 8)
-
- class MIMany916(
- m.BaseN9,
- m.BaseN10,
- m.BaseN11,
- m.BaseN12,
- m.BaseN13,
- m.BaseN14,
- m.BaseN15,
- m.BaseN16,
- ):
- def __init__(self):
- m.BaseN9.__init__(self, 9)
- m.BaseN10.__init__(self, 10)
- m.BaseN11.__init__(self, 11)
- m.BaseN12.__init__(self, 12)
- m.BaseN13.__init__(self, 13)
- m.BaseN14.__init__(self, 14)
- m.BaseN15.__init__(self, 15)
- m.BaseN16.__init__(self, 16)
-
- class MIMany19(MIMany14, MIMany58, m.BaseN9):
- def __init__(self):
- MIMany14.__init__(self)
- MIMany58.__init__(self)
- m.BaseN9.__init__(self, 9)
-
- class MIMany117(MIMany14, MIMany58, MIMany916, m.BaseN17):
- def __init__(self):
- MIMany14.__init__(self)
- MIMany58.__init__(self)
- MIMany916.__init__(self)
- m.BaseN17.__init__(self, 17)
-
- # Inherits from 4 registered C++ classes: can fit in one pointer on any modern arch:
- a = MIMany14()
- for i in range(1, 4):
- assert getattr(a, "f" + str(i))() == 2 * i
-
- # Inherits from 8: requires 1/2 pointers worth of holder flags on 32/64-bit arch:
- b = MIMany916()
- for i in range(9, 16):
- assert getattr(b, "f" + str(i))() == 2 * i
-
- # Inherits from 9: requires >= 2 pointers worth of holder flags
- c = MIMany19()
- for i in range(1, 9):
- assert getattr(c, "f" + str(i))() == 2 * i
-
- # Inherits from 17: requires >= 3 pointers worth of holder flags
- d = MIMany117()
- for i in range(1, 17):
- assert getattr(d, "f" + str(i))() == 2 * i
-
-
-def test_multiple_inheritance_virtbase():
- class MITypePy(m.Base12a):
- def __init__(self, i, j):
- m.Base12a.__init__(self, i, j)
-
- mt = MITypePy(3, 4)
- assert mt.bar() == 4
- assert m.bar_base2a(mt) == 4
- assert m.bar_base2a_sharedptr(mt) == 4
-
-
-def test_mi_static_properties():
- """Mixing bases with and without static properties should be possible
- and the result should be independent of base definition order"""
-
- for d in (m.VanillaStaticMix1(), m.VanillaStaticMix2()):
- assert d.vanilla() == "Vanilla"
- assert d.static_func1() == "WithStatic1"
- assert d.static_func2() == "WithStatic2"
- assert d.static_func() == d.__class__.__name__
-
- m.WithStatic1.static_value1 = 1
- m.WithStatic2.static_value2 = 2
- assert d.static_value1 == 1
- assert d.static_value2 == 2
- assert d.static_value == 12
-
- d.static_value1 = 0
- assert d.static_value1 == 0
- d.static_value2 = 0
- assert d.static_value2 == 0
- d.static_value = 0
- assert d.static_value == 0
-
-
-# Requires PyPy 6+
-def test_mi_dynamic_attributes():
- """Mixing bases with and without dynamic attribute support"""
-
- for d in (m.VanillaDictMix1(), m.VanillaDictMix2()):
- d.dynamic = 1
- assert d.dynamic == 1
-
-
-def test_mi_unaligned_base():
- """Returning an offset (non-first MI) base class pointer should recognize the instance"""
-
- n_inst = ConstructorStats.detail_reg_inst()
-
- c = m.I801C()
- d = m.I801D()
- # + 4 below because we have the two instances, and each instance has offset base I801B2
- assert ConstructorStats.detail_reg_inst() == n_inst + 4
- b1c = m.i801b1_c(c)
- assert b1c is c
- b2c = m.i801b2_c(c)
- assert b2c is c
- b1d = m.i801b1_d(d)
- assert b1d is d
- b2d = m.i801b2_d(d)
- assert b2d is d
-
- assert ConstructorStats.detail_reg_inst() == n_inst + 4 # no extra instances
- del c, b1c, b2c
- assert ConstructorStats.detail_reg_inst() == n_inst + 2
- del d, b1d, b2d
- assert ConstructorStats.detail_reg_inst() == n_inst
-
-
-def test_mi_base_return():
- """Tests returning an offset (non-first MI) base class pointer to a derived instance"""
-
- n_inst = ConstructorStats.detail_reg_inst()
-
- c1 = m.i801c_b1()
- assert type(c1) is m.I801C
- assert c1.a == 1
- assert c1.b == 2
-
- d1 = m.i801d_b1()
- assert type(d1) is m.I801D
- assert d1.a == 1
- assert d1.b == 2
-
- assert ConstructorStats.detail_reg_inst() == n_inst + 4
-
- c2 = m.i801c_b2()
- assert type(c2) is m.I801C
- assert c2.a == 1
- assert c2.b == 2
-
- d2 = m.i801d_b2()
- assert type(d2) is m.I801D
- assert d2.a == 1
- assert d2.b == 2
-
- assert ConstructorStats.detail_reg_inst() == n_inst + 8
-
- del c2
- assert ConstructorStats.detail_reg_inst() == n_inst + 6
- del c1, d1, d2
- assert ConstructorStats.detail_reg_inst() == n_inst
-
- # Returning an unregistered derived type with a registered base; we won't
- # pick up the derived type, obviously, but should still work (as an object
- # of whatever type was returned).
- e1 = m.i801e_c()
- assert type(e1) is m.I801C
- assert e1.a == 1
- assert e1.b == 2
-
- e2 = m.i801e_b2()
- assert type(e2) is m.I801B2
- assert e2.b == 2
-
-
-def test_diamond_inheritance():
- """Tests that diamond inheritance works as expected (issue #959)"""
-
- # Issue #959: this shouldn't segfault:
- d = m.D()
-
- # Make sure all the various distinct pointers are all recognized as registered instances:
- assert d is d.c0()
- assert d is d.c1()
- assert d is d.b()
- assert d is d.c0().b()
- assert d is d.c1().b()
- assert d is d.c0().c1().b().c0().b()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_array.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_array.cpp
deleted file mode 100644
index a84de77f8e8324a95ab9d33e2131cd3f45de80ea..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_array.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- tests/test_numpy_array.cpp -- test core array functionality
-
- Copyright (c) 2016 Ivan Smirnov <i.s.smirnov@gmail.com>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-#include <pybind11/numpy.h>
-#include <pybind11/stl.h>
-
-#include <cstdint>
-
-// Size / dtype checks.
-struct DtypeCheck {
- py::dtype numpy{};
- py::dtype pybind11{};
-};
-
-template <typename T>
-DtypeCheck get_dtype_check(const char* name) {
- py::module_ np = py::module_::import("numpy");
- DtypeCheck check{};
- check.numpy = np.attr("dtype")(np.attr(name));
- check.pybind11 = py::dtype::of<T>();
- return check;
-}
-
-std::vector<DtypeCheck> get_concrete_dtype_checks() {
- return {
- // Normalization
- get_dtype_check<std::int8_t>("int8"),
- get_dtype_check<std::uint8_t>("uint8"),
- get_dtype_check<std::int16_t>("int16"),
- get_dtype_check<std::uint16_t>("uint16"),
- get_dtype_check<std::int32_t>("int32"),
- get_dtype_check<std::uint32_t>("uint32"),
- get_dtype_check<std::int64_t>("int64"),
- get_dtype_check<std::uint64_t>("uint64")
- };
-}
-
-struct DtypeSizeCheck {
- std::string name{};
- int size_cpp{};
- int size_numpy{};
- // For debugging.
- py::dtype dtype{};
-};
-
-template <typename T>
-DtypeSizeCheck get_dtype_size_check() {
- DtypeSizeCheck check{};
- check.name = py::type_id<T>();
- check.size_cpp = sizeof(T);
- check.dtype = py::dtype::of<T>();
- check.size_numpy = check.dtype.attr("itemsize").template cast<int>();
- return check;
-}
-
-std::vector<DtypeSizeCheck> get_platform_dtype_size_checks() {
- return {
- get_dtype_size_check<short>(),
- get_dtype_size_check<unsigned short>(),
- get_dtype_size_check<int>(),
- get_dtype_size_check<unsigned int>(),
- get_dtype_size_check<long>(),
- get_dtype_size_check<unsigned long>(),
- get_dtype_size_check<long long>(),
- get_dtype_size_check<unsigned long long>(),
- };
-}
-
-// Arrays.
-using arr = py::array;
-using arr_t = py::array_t<uint16_t, 0>;
-static_assert(std::is_same<arr_t::value_type, uint16_t>::value, "");
-
-template<typename... Ix> arr data(const arr& a, Ix... index) {
- return arr(a.nbytes() - a.offset_at(index...), (const uint8_t *) a.data(index...));
-}
-
-template<typename... Ix> arr data_t(const arr_t& a, Ix... index) {
- return arr(a.size() - a.index_at(index...), a.data(index...));
-}
-
-template<typename... Ix> arr& mutate_data(arr& a, Ix... index) {
- auto ptr = (uint8_t *) a.mutable_data(index...);
- for (py::ssize_t i = 0; i < a.nbytes() - a.offset_at(index...); i++)
- ptr[i] = (uint8_t) (ptr[i] * 2);
- return a;
-}
-
-template<typename... Ix> arr_t& mutate_data_t(arr_t& a, Ix... index) {
- auto ptr = a.mutable_data(index...);
- for (py::ssize_t i = 0; i < a.size() - a.index_at(index...); i++)
- ptr[i]++;
- return a;
-}
-
-template<typename... Ix> py::ssize_t index_at(const arr& a, Ix... idx) { return a.index_at(idx...); }
-template<typename... Ix> py::ssize_t index_at_t(const arr_t& a, Ix... idx) { return a.index_at(idx...); }
-template<typename... Ix> py::ssize_t offset_at(const arr& a, Ix... idx) { return a.offset_at(idx...); }
-template<typename... Ix> py::ssize_t offset_at_t(const arr_t& a, Ix... idx) { return a.offset_at(idx...); }
-template<typename... Ix> py::ssize_t at_t(const arr_t& a, Ix... idx) { return a.at(idx...); }
-template<typename... Ix> arr_t& mutate_at_t(arr_t& a, Ix... idx) { a.mutable_at(idx...)++; return a; }
-
-#define def_index_fn(name, type) \
- sm.def(#name, [](type a) { return name(a); }); \
- sm.def(#name, [](type a, int i) { return name(a, i); }); \
- sm.def(#name, [](type a, int i, int j) { return name(a, i, j); }); \
- sm.def(#name, [](type a, int i, int j, int k) { return name(a, i, j, k); });
-
-template <typename T, typename T2> py::handle auxiliaries(T &&r, T2 &&r2) {
- if (r.ndim() != 2) throw std::domain_error("error: ndim != 2");
- py::list l;
- l.append(*r.data(0, 0));
- l.append(*r2.mutable_data(0, 0));
- l.append(r.data(0, 1) == r2.mutable_data(0, 1));
- l.append(r.ndim());
- l.append(r.itemsize());
- l.append(r.shape(0));
- l.append(r.shape(1));
- l.append(r.size());
- l.append(r.nbytes());
- return l.release();
-}
-
-// note: declaration at local scope would create a dangling reference!
-static int data_i = 42;
-
-TEST_SUBMODULE(numpy_array, sm) {
- try { py::module_::import("numpy"); }
- catch (...) { return; }
-
- // test_dtypes
- py::class_<DtypeCheck>(sm, "DtypeCheck")
- .def_readonly("numpy", &DtypeCheck::numpy)
- .def_readonly("pybind11", &DtypeCheck::pybind11)
- .def("__repr__", [](const DtypeCheck& self) {
- return py::str("<DtypeCheck numpy={} pybind11={}>").format(
- self.numpy, self.pybind11);
- });
- sm.def("get_concrete_dtype_checks", &get_concrete_dtype_checks);
-
- py::class_<DtypeSizeCheck>(sm, "DtypeSizeCheck")
- .def_readonly("name", &DtypeSizeCheck::name)
- .def_readonly("size_cpp", &DtypeSizeCheck::size_cpp)
- .def_readonly("size_numpy", &DtypeSizeCheck::size_numpy)
- .def("__repr__", [](const DtypeSizeCheck& self) {
- return py::str("<DtypeSizeCheck name='{}' size_cpp={} size_numpy={} dtype={}>").format(
- self.name, self.size_cpp, self.size_numpy, self.dtype);
- });
- sm.def("get_platform_dtype_size_checks", &get_platform_dtype_size_checks);
-
- // test_array_attributes
- sm.def("ndim", [](const arr& a) { return a.ndim(); });
- sm.def("shape", [](const arr& a) { return arr(a.ndim(), a.shape()); });
- sm.def("shape", [](const arr& a, py::ssize_t dim) { return a.shape(dim); });
- sm.def("strides", [](const arr& a) { return arr(a.ndim(), a.strides()); });
- sm.def("strides", [](const arr& a, py::ssize_t dim) { return a.strides(dim); });
- sm.def("writeable", [](const arr& a) { return a.writeable(); });
- sm.def("size", [](const arr& a) { return a.size(); });
- sm.def("itemsize", [](const arr& a) { return a.itemsize(); });
- sm.def("nbytes", [](const arr& a) { return a.nbytes(); });
- sm.def("owndata", [](const arr& a) { return a.owndata(); });
-
- // test_index_offset
- def_index_fn(index_at, const arr&);
- def_index_fn(index_at_t, const arr_t&);
- def_index_fn(offset_at, const arr&);
- def_index_fn(offset_at_t, const arr_t&);
- // test_data
- def_index_fn(data, const arr&);
- def_index_fn(data_t, const arr_t&);
- // test_mutate_data, test_mutate_readonly
- def_index_fn(mutate_data, arr&);
- def_index_fn(mutate_data_t, arr_t&);
- def_index_fn(at_t, const arr_t&);
- def_index_fn(mutate_at_t, arr_t&);
-
- // test_make_c_f_array
- sm.def("make_f_array", [] { return py::array_t<float>({ 2, 2 }, { 4, 8 }); });
- sm.def("make_c_array", [] { return py::array_t<float>({ 2, 2 }, { 8, 4 }); });
-
- // test_empty_shaped_array
- sm.def("make_empty_shaped_array", [] { return py::array(py::dtype("f"), {}, {}); });
- // test numpy scalars (empty shape, ndim==0)
- sm.def("scalar_int", []() { return py::array(py::dtype("i"), {}, {}, &data_i); });
-
- // test_wrap
- sm.def("wrap", [](py::array a) {
- return py::array(
- a.dtype(),
- {a.shape(), a.shape() + a.ndim()},
- {a.strides(), a.strides() + a.ndim()},
- a.data(),
- a
- );
- });
-
- // test_numpy_view
- struct ArrayClass {
- int data[2] = { 1, 2 };
- ArrayClass() { py::print("ArrayClass()"); }
- ~ArrayClass() { py::print("~ArrayClass()"); }
- };
- py::class_<ArrayClass>(sm, "ArrayClass")
- .def(py::init<>())
- .def("numpy_view", [](py::object &obj) {
- py::print("ArrayClass::numpy_view()");
- auto &a = obj.cast<ArrayClass&>();
- return py::array_t<int>({2}, {4}, a.data, obj);
- }
- );
-
- // test_cast_numpy_int64_to_uint64
- sm.def("function_taking_uint64", [](uint64_t) { });
-
- // test_isinstance
- sm.def("isinstance_untyped", [](py::object yes, py::object no) {
- return py::isinstance<py::array>(yes) && !py::isinstance<py::array>(no);
- });
- sm.def("isinstance_typed", [](py::object o) {
- return py::isinstance<py::array_t<double>>(o) && !py::isinstance<py::array_t<int>>(o);
- });
-
- // test_constructors
- sm.def("default_constructors", []() {
- return py::dict(
- "array"_a=py::array(),
- "array_t<int32>"_a=py::array_t<std::int32_t>(),
- "array_t<double>"_a=py::array_t<double>()
- );
- });
- sm.def("converting_constructors", [](py::object o) {
- return py::dict(
- "array"_a=py::array(o),
- "array_t<int32>"_a=py::array_t<std::int32_t>(o),
- "array_t<double>"_a=py::array_t<double>(o)
- );
- });
-
- // test_overload_resolution
- sm.def("overloaded", [](py::array_t<double>) { return "double"; });
- sm.def("overloaded", [](py::array_t<float>) { return "float"; });
- sm.def("overloaded", [](py::array_t<int>) { return "int"; });
- sm.def("overloaded", [](py::array_t<unsigned short>) { return "unsigned short"; });
- sm.def("overloaded", [](py::array_t<long long>) { return "long long"; });
- sm.def("overloaded", [](py::array_t<std::complex<double>>) { return "double complex"; });
- sm.def("overloaded", [](py::array_t<std::complex<float>>) { return "float complex"; });
-
- sm.def("overloaded2", [](py::array_t<std::complex<double>>) { return "double complex"; });
- sm.def("overloaded2", [](py::array_t<double>) { return "double"; });
- sm.def("overloaded2", [](py::array_t<std::complex<float>>) { return "float complex"; });
- sm.def("overloaded2", [](py::array_t<float>) { return "float"; });
-
- // Only accept the exact types:
- sm.def("overloaded3", [](py::array_t<int>) { return "int"; }, py::arg().noconvert());
- sm.def("overloaded3", [](py::array_t<double>) { return "double"; }, py::arg().noconvert());
-
- // Make sure we don't do unsafe coercion (e.g. float to int) when not using forcecast, but
- // rather that float gets converted via the safe (conversion to double) overload:
- sm.def("overloaded4", [](py::array_t<long long, 0>) { return "long long"; });
- sm.def("overloaded4", [](py::array_t<double, 0>) { return "double"; });
-
- // But we do allow conversion to int if forcecast is enabled (but only if no overload matches
- // without conversion)
- sm.def("overloaded5", [](py::array_t<unsigned int>) { return "unsigned int"; });
- sm.def("overloaded5", [](py::array_t<double>) { return "double"; });
-
- // test_greedy_string_overload
- // Issue 685: ndarray shouldn't go to std::string overload
- sm.def("issue685", [](std::string) { return "string"; });
- sm.def("issue685", [](py::array) { return "array"; });
- sm.def("issue685", [](py::object) { return "other"; });
-
- // test_array_unchecked_fixed_dims
- sm.def("proxy_add2", [](py::array_t<double> a, double v) {
- auto r = a.mutable_unchecked<2>();
- for (py::ssize_t i = 0; i < r.shape(0); i++)
- for (py::ssize_t j = 0; j < r.shape(1); j++)
- r(i, j) += v;
- }, py::arg().noconvert(), py::arg());
-
- sm.def("proxy_init3", [](double start) {
- py::array_t<double, py::array::c_style> a({ 3, 3, 3 });
- auto r = a.mutable_unchecked<3>();
- for (py::ssize_t i = 0; i < r.shape(0); i++)
- for (py::ssize_t j = 0; j < r.shape(1); j++)
- for (py::ssize_t k = 0; k < r.shape(2); k++)
- r(i, j, k) = start++;
- return a;
- });
- sm.def("proxy_init3F", [](double start) {
- py::array_t<double, py::array::f_style> a({ 3, 3, 3 });
- auto r = a.mutable_unchecked<3>();
- for (py::ssize_t k = 0; k < r.shape(2); k++)
- for (py::ssize_t j = 0; j < r.shape(1); j++)
- for (py::ssize_t i = 0; i < r.shape(0); i++)
- r(i, j, k) = start++;
- return a;
- });
- sm.def("proxy_squared_L2_norm", [](py::array_t<double> a) {
- auto r = a.unchecked<1>();
- double sumsq = 0;
- for (py::ssize_t i = 0; i < r.shape(0); i++)
- sumsq += r[i] * r(i); // Either notation works for a 1D array
- return sumsq;
- });
-
- sm.def("proxy_auxiliaries2", [](py::array_t<double> a) {
- auto r = a.unchecked<2>();
- auto r2 = a.mutable_unchecked<2>();
- return auxiliaries(r, r2);
- });
-
- sm.def("proxy_auxiliaries1_const_ref", [](py::array_t<double> a) {
- const auto &r = a.unchecked<1>();
- const auto &r2 = a.mutable_unchecked<1>();
- return r(0) == r2(0) && r[0] == r2[0];
- });
-
- sm.def("proxy_auxiliaries2_const_ref", [](py::array_t<double> a) {
- const auto &r = a.unchecked<2>();
- const auto &r2 = a.mutable_unchecked<2>();
- return r(0, 0) == r2(0, 0);
- });
-
- // test_array_unchecked_dyn_dims
- // Same as the above, but without a compile-time dimensions specification:
- sm.def("proxy_add2_dyn", [](py::array_t<double> a, double v) {
- auto r = a.mutable_unchecked();
- if (r.ndim() != 2) throw std::domain_error("error: ndim != 2");
- for (py::ssize_t i = 0; i < r.shape(0); i++)
- for (py::ssize_t j = 0; j < r.shape(1); j++)
- r(i, j) += v;
- }, py::arg().noconvert(), py::arg());
- sm.def("proxy_init3_dyn", [](double start) {
- py::array_t<double, py::array::c_style> a({ 3, 3, 3 });
- auto r = a.mutable_unchecked();
- if (r.ndim() != 3) throw std::domain_error("error: ndim != 3");
- for (py::ssize_t i = 0; i < r.shape(0); i++)
- for (py::ssize_t j = 0; j < r.shape(1); j++)
- for (py::ssize_t k = 0; k < r.shape(2); k++)
- r(i, j, k) = start++;
- return a;
- });
- sm.def("proxy_auxiliaries2_dyn", [](py::array_t<double> a) {
- return auxiliaries(a.unchecked(), a.mutable_unchecked());
- });
-
- sm.def("array_auxiliaries2", [](py::array_t<double> a) {
- return auxiliaries(a, a);
- });
-
- // test_array_failures
- // Issue #785: Uninformative "Unknown internal error" exception when constructing array from empty object:
- sm.def("array_fail_test", []() { return py::array(py::object()); });
- sm.def("array_t_fail_test", []() { return py::array_t<double>(py::object()); });
- // Make sure the error from numpy is being passed through:
- sm.def("array_fail_test_negative_size", []() { int c = 0; return py::array(-1, &c); });
-
- // test_initializer_list
- // Issue (unnumbered; reported in #788): regression: initializer lists can be ambiguous
- sm.def("array_initializer_list1", []() { return py::array_t<float>(1); }); // { 1 } also works, but clang warns about it
- sm.def("array_initializer_list2", []() { return py::array_t<float>({ 1, 2 }); });
- sm.def("array_initializer_list3", []() { return py::array_t<float>({ 1, 2, 3 }); });
- sm.def("array_initializer_list4", []() { return py::array_t<float>({ 1, 2, 3, 4 }); });
-
- // test_array_resize
- // reshape array to 2D without changing size
- sm.def("array_reshape2", [](py::array_t<double> a) {
- const auto dim_sz = (py::ssize_t)std::sqrt(a.size());
- if (dim_sz * dim_sz != a.size())
- throw std::domain_error("array_reshape2: input array total size is not a squared integer");
- a.resize({dim_sz, dim_sz});
- });
-
- // resize to 3D array with each dimension = N
- sm.def("array_resize3", [](py::array_t<double> a, size_t N, bool refcheck) {
- a.resize({N, N, N}, refcheck);
- });
-
- // test_array_create_and_resize
- // return 2D array with Nrows = Ncols = N
- sm.def("create_and_resize", [](size_t N) {
- py::array_t<double> a;
- a.resize({N, N});
- std::fill(a.mutable_data(), a.mutable_data() + a.size(), 42.);
- return a;
- });
-
- sm.def("index_using_ellipsis", [](py::array a) {
- return a[py::make_tuple(0, py::ellipsis(), 0)];
- });
-
- // test_argument_conversions
- sm.def("accept_double",
- [](py::array_t<double, 0>) {},
- py::arg("a"));
- sm.def("accept_double_forcecast",
- [](py::array_t<double, py::array::forcecast>) {},
- py::arg("a"));
- sm.def("accept_double_c_style",
- [](py::array_t<double, py::array::c_style>) {},
- py::arg("a"));
- sm.def("accept_double_c_style_forcecast",
- [](py::array_t<double, py::array::forcecast | py::array::c_style>) {},
- py::arg("a"));
- sm.def("accept_double_f_style",
- [](py::array_t<double, py::array::f_style>) {},
- py::arg("a"));
- sm.def("accept_double_f_style_forcecast",
- [](py::array_t<double, py::array::forcecast | py::array::f_style>) {},
- py::arg("a"));
- sm.def("accept_double_noconvert",
- [](py::array_t<double, 0>) {},
- py::arg("a").noconvert());
- sm.def("accept_double_forcecast_noconvert",
- [](py::array_t<double, py::array::forcecast>) {},
- py::arg("a").noconvert());
- sm.def("accept_double_c_style_noconvert",
- [](py::array_t<double, py::array::c_style>) {},
- py::arg("a").noconvert());
- sm.def("accept_double_c_style_forcecast_noconvert",
- [](py::array_t<double, py::array::forcecast | py::array::c_style>) {},
- py::arg("a").noconvert());
- sm.def("accept_double_f_style_noconvert",
- [](py::array_t<double, py::array::f_style>) {},
- py::arg("a").noconvert());
- sm.def("accept_double_f_style_forcecast_noconvert",
- [](py::array_t<double, py::array::forcecast | py::array::f_style>) {},
- py::arg("a").noconvert());
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_array.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_array.py
deleted file mode 100644
index 02f3ecfc0ef292242f9d4ab82db8f67b70fb2938..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_array.py
+++ /dev/null
@@ -1,541 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import numpy_array as m
-
-np = pytest.importorskip("numpy")
-
-
-def test_dtypes():
- # See issue #1328.
- # - Platform-dependent sizes.
- for size_check in m.get_platform_dtype_size_checks():
- print(size_check)
- assert size_check.size_cpp == size_check.size_numpy, size_check
- # - Concrete sizes.
- for check in m.get_concrete_dtype_checks():
- print(check)
- assert check.numpy == check.pybind11, check
- if check.numpy.num != check.pybind11.num:
- print(
- "NOTE: typenum mismatch for {}: {} != {}".format(
- check, check.numpy.num, check.pybind11.num
- )
- )
-
-
-@pytest.fixture(scope="function")
-def arr():
- return np.array([[1, 2, 3], [4, 5, 6]], "=u2")
-
-
-def test_array_attributes():
- a = np.array(0, "f8")
- assert m.ndim(a) == 0
- assert all(m.shape(a) == [])
- assert all(m.strides(a) == [])
- with pytest.raises(IndexError) as excinfo:
- m.shape(a, 0)
- assert str(excinfo.value) == "invalid axis: 0 (ndim = 0)"
- with pytest.raises(IndexError) as excinfo:
- m.strides(a, 0)
- assert str(excinfo.value) == "invalid axis: 0 (ndim = 0)"
- assert m.writeable(a)
- assert m.size(a) == 1
- assert m.itemsize(a) == 8
- assert m.nbytes(a) == 8
- assert m.owndata(a)
-
- a = np.array([[1, 2, 3], [4, 5, 6]], "u2").view()
- a.flags.writeable = False
- assert m.ndim(a) == 2
- assert all(m.shape(a) == [2, 3])
- assert m.shape(a, 0) == 2
- assert m.shape(a, 1) == 3
- assert all(m.strides(a) == [6, 2])
- assert m.strides(a, 0) == 6
- assert m.strides(a, 1) == 2
- with pytest.raises(IndexError) as excinfo:
- m.shape(a, 2)
- assert str(excinfo.value) == "invalid axis: 2 (ndim = 2)"
- with pytest.raises(IndexError) as excinfo:
- m.strides(a, 2)
- assert str(excinfo.value) == "invalid axis: 2 (ndim = 2)"
- assert not m.writeable(a)
- assert m.size(a) == 6
- assert m.itemsize(a) == 2
- assert m.nbytes(a) == 12
- assert not m.owndata(a)
-
-
-@pytest.mark.parametrize(
- "args, ret", [([], 0), ([0], 0), ([1], 3), ([0, 1], 1), ([1, 2], 5)]
-)
-def test_index_offset(arr, args, ret):
- assert m.index_at(arr, *args) == ret
- assert m.index_at_t(arr, *args) == ret
- assert m.offset_at(arr, *args) == ret * arr.dtype.itemsize
- assert m.offset_at_t(arr, *args) == ret * arr.dtype.itemsize
-
-
-def test_dim_check_fail(arr):
- for func in (
- m.index_at,
- m.index_at_t,
- m.offset_at,
- m.offset_at_t,
- m.data,
- m.data_t,
- m.mutate_data,
- m.mutate_data_t,
- ):
- with pytest.raises(IndexError) as excinfo:
- func(arr, 1, 2, 3)
- assert str(excinfo.value) == "too many indices for an array: 3 (ndim = 2)"
-
-
-@pytest.mark.parametrize(
- "args, ret",
- [
- ([], [1, 2, 3, 4, 5, 6]),
- ([1], [4, 5, 6]),
- ([0, 1], [2, 3, 4, 5, 6]),
- ([1, 2], [6]),
- ],
-)
-def test_data(arr, args, ret):
- from sys import byteorder
-
- assert all(m.data_t(arr, *args) == ret)
- assert all(m.data(arr, *args)[(0 if byteorder == "little" else 1) :: 2] == ret)
- assert all(m.data(arr, *args)[(1 if byteorder == "little" else 0) :: 2] == 0)
-
-
-@pytest.mark.parametrize("dim", [0, 1, 3])
-def test_at_fail(arr, dim):
- for func in m.at_t, m.mutate_at_t:
- with pytest.raises(IndexError) as excinfo:
- func(arr, *([0] * dim))
- assert str(excinfo.value) == "index dimension mismatch: {} (ndim = 2)".format(
- dim
- )
-
-
-def test_at(arr):
- assert m.at_t(arr, 0, 2) == 3
- assert m.at_t(arr, 1, 0) == 4
-
- assert all(m.mutate_at_t(arr, 0, 2).ravel() == [1, 2, 4, 4, 5, 6])
- assert all(m.mutate_at_t(arr, 1, 0).ravel() == [1, 2, 4, 5, 5, 6])
-
-
-def test_mutate_readonly(arr):
- arr.flags.writeable = False
- for func, args in (
- (m.mutate_data, ()),
- (m.mutate_data_t, ()),
- (m.mutate_at_t, (0, 0)),
- ):
- with pytest.raises(ValueError) as excinfo:
- func(arr, *args)
- assert str(excinfo.value) == "array is not writeable"
-
-
-def test_mutate_data(arr):
- assert all(m.mutate_data(arr).ravel() == [2, 4, 6, 8, 10, 12])
- assert all(m.mutate_data(arr).ravel() == [4, 8, 12, 16, 20, 24])
- assert all(m.mutate_data(arr, 1).ravel() == [4, 8, 12, 32, 40, 48])
- assert all(m.mutate_data(arr, 0, 1).ravel() == [4, 16, 24, 64, 80, 96])
- assert all(m.mutate_data(arr, 1, 2).ravel() == [4, 16, 24, 64, 80, 192])
-
- assert all(m.mutate_data_t(arr).ravel() == [5, 17, 25, 65, 81, 193])
- assert all(m.mutate_data_t(arr).ravel() == [6, 18, 26, 66, 82, 194])
- assert all(m.mutate_data_t(arr, 1).ravel() == [6, 18, 26, 67, 83, 195])
- assert all(m.mutate_data_t(arr, 0, 1).ravel() == [6, 19, 27, 68, 84, 196])
- assert all(m.mutate_data_t(arr, 1, 2).ravel() == [6, 19, 27, 68, 84, 197])
-
-
-def test_bounds_check(arr):
- for func in (
- m.index_at,
- m.index_at_t,
- m.data,
- m.data_t,
- m.mutate_data,
- m.mutate_data_t,
- m.at_t,
- m.mutate_at_t,
- ):
- with pytest.raises(IndexError) as excinfo:
- func(arr, 2, 0)
- assert str(excinfo.value) == "index 2 is out of bounds for axis 0 with size 2"
- with pytest.raises(IndexError) as excinfo:
- func(arr, 0, 4)
- assert str(excinfo.value) == "index 4 is out of bounds for axis 1 with size 3"
-
-
-def test_make_c_f_array():
- assert m.make_c_array().flags.c_contiguous
- assert not m.make_c_array().flags.f_contiguous
- assert m.make_f_array().flags.f_contiguous
- assert not m.make_f_array().flags.c_contiguous
-
-
-def test_make_empty_shaped_array():
- m.make_empty_shaped_array()
-
- # empty shape means numpy scalar, PEP 3118
- assert m.scalar_int().ndim == 0
- assert m.scalar_int().shape == ()
- assert m.scalar_int() == 42
-
-
-def test_wrap():
- def assert_references(a, b, base=None):
- from distutils.version import LooseVersion
-
- if base is None:
- base = a
- assert a is not b
- assert a.__array_interface__["data"][0] == b.__array_interface__["data"][0]
- assert a.shape == b.shape
- assert a.strides == b.strides
- assert a.flags.c_contiguous == b.flags.c_contiguous
- assert a.flags.f_contiguous == b.flags.f_contiguous
- assert a.flags.writeable == b.flags.writeable
- assert a.flags.aligned == b.flags.aligned
- if LooseVersion(np.__version__) >= LooseVersion("1.14.0"):
- assert a.flags.writebackifcopy == b.flags.writebackifcopy
- else:
- assert a.flags.updateifcopy == b.flags.updateifcopy
- assert np.all(a == b)
- assert not b.flags.owndata
- assert b.base is base
- if a.flags.writeable and a.ndim == 2:
- a[0, 0] = 1234
- assert b[0, 0] == 1234
-
- a1 = np.array([1, 2], dtype=np.int16)
- assert a1.flags.owndata and a1.base is None
- a2 = m.wrap(a1)
- assert_references(a1, a2)
-
- a1 = np.array([[1, 2], [3, 4]], dtype=np.float32, order="F")
- assert a1.flags.owndata and a1.base is None
- a2 = m.wrap(a1)
- assert_references(a1, a2)
-
- a1 = np.array([[1, 2], [3, 4]], dtype=np.float32, order="C")
- a1.flags.writeable = False
- a2 = m.wrap(a1)
- assert_references(a1, a2)
-
- a1 = np.random.random((4, 4, 4))
- a2 = m.wrap(a1)
- assert_references(a1, a2)
-
- a1t = a1.transpose()
- a2 = m.wrap(a1t)
- assert_references(a1t, a2, a1)
-
- a1d = a1.diagonal()
- a2 = m.wrap(a1d)
- assert_references(a1d, a2, a1)
-
- a1m = a1[::-1, ::-1, ::-1]
- a2 = m.wrap(a1m)
- assert_references(a1m, a2, a1)
-
-
-def test_numpy_view(capture):
- with capture:
- ac = m.ArrayClass()
- ac_view_1 = ac.numpy_view()
- ac_view_2 = ac.numpy_view()
- assert np.all(ac_view_1 == np.array([1, 2], dtype=np.int32))
- del ac
- pytest.gc_collect()
- assert (
- capture
- == """
- ArrayClass()
- ArrayClass::numpy_view()
- ArrayClass::numpy_view()
- """
- )
- ac_view_1[0] = 4
- ac_view_1[1] = 3
- assert ac_view_2[0] == 4
- assert ac_view_2[1] == 3
- with capture:
- del ac_view_1
- del ac_view_2
- pytest.gc_collect()
- pytest.gc_collect()
- assert (
- capture
- == """
- ~ArrayClass()
- """
- )
-
-
-def test_cast_numpy_int64_to_uint64():
- m.function_taking_uint64(123)
- m.function_taking_uint64(np.uint64(123))
-
-
-def test_isinstance():
- assert m.isinstance_untyped(np.array([1, 2, 3]), "not an array")
- assert m.isinstance_typed(np.array([1.0, 2.0, 3.0]))
-
-
-def test_constructors():
- defaults = m.default_constructors()
- for a in defaults.values():
- assert a.size == 0
- assert defaults["array"].dtype == np.array([]).dtype
- assert defaults["array_t<int32>"].dtype == np.int32
- assert defaults["array_t<double>"].dtype == np.float64
-
- results = m.converting_constructors([1, 2, 3])
- for a in results.values():
- np.testing.assert_array_equal(a, [1, 2, 3])
- assert results["array"].dtype == np.int_
- assert results["array_t<int32>"].dtype == np.int32
- assert results["array_t<double>"].dtype == np.float64
-
-
-def test_overload_resolution(msg):
- # Exact overload matches:
- assert m.overloaded(np.array([1], dtype="float64")) == "double"
- assert m.overloaded(np.array([1], dtype="float32")) == "float"
- assert m.overloaded(np.array([1], dtype="ushort")) == "unsigned short"
- assert m.overloaded(np.array([1], dtype="intc")) == "int"
- assert m.overloaded(np.array([1], dtype="longlong")) == "long long"
- assert m.overloaded(np.array([1], dtype="complex")) == "double complex"
- assert m.overloaded(np.array([1], dtype="csingle")) == "float complex"
-
- # No exact match, should call first convertible version:
- assert m.overloaded(np.array([1], dtype="uint8")) == "double"
-
- with pytest.raises(TypeError) as excinfo:
- m.overloaded("not an array")
- assert (
- msg(excinfo.value)
- == """
- overloaded(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: numpy.ndarray[numpy.float64]) -> str
- 2. (arg0: numpy.ndarray[numpy.float32]) -> str
- 3. (arg0: numpy.ndarray[numpy.int32]) -> str
- 4. (arg0: numpy.ndarray[numpy.uint16]) -> str
- 5. (arg0: numpy.ndarray[numpy.int64]) -> str
- 6. (arg0: numpy.ndarray[numpy.complex128]) -> str
- 7. (arg0: numpy.ndarray[numpy.complex64]) -> str
-
- Invoked with: 'not an array'
- """
- )
-
- assert m.overloaded2(np.array([1], dtype="float64")) == "double"
- assert m.overloaded2(np.array([1], dtype="float32")) == "float"
- assert m.overloaded2(np.array([1], dtype="complex64")) == "float complex"
- assert m.overloaded2(np.array([1], dtype="complex128")) == "double complex"
- assert m.overloaded2(np.array([1], dtype="float32")) == "float"
-
- assert m.overloaded3(np.array([1], dtype="float64")) == "double"
- assert m.overloaded3(np.array([1], dtype="intc")) == "int"
- expected_exc = """
- overloaded3(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: numpy.ndarray[numpy.int32]) -> str
- 2. (arg0: numpy.ndarray[numpy.float64]) -> str
-
- Invoked with: """
-
- with pytest.raises(TypeError) as excinfo:
- m.overloaded3(np.array([1], dtype="uintc"))
- assert msg(excinfo.value) == expected_exc + repr(np.array([1], dtype="uint32"))
- with pytest.raises(TypeError) as excinfo:
- m.overloaded3(np.array([1], dtype="float32"))
- assert msg(excinfo.value) == expected_exc + repr(np.array([1.0], dtype="float32"))
- with pytest.raises(TypeError) as excinfo:
- m.overloaded3(np.array([1], dtype="complex"))
- assert msg(excinfo.value) == expected_exc + repr(np.array([1.0 + 0.0j]))
-
- # Exact matches:
- assert m.overloaded4(np.array([1], dtype="double")) == "double"
- assert m.overloaded4(np.array([1], dtype="longlong")) == "long long"
- # Non-exact matches requiring conversion. Since float to integer isn't a
- # save conversion, it should go to the double overload, but short can go to
- # either (and so should end up on the first-registered, the long long).
- assert m.overloaded4(np.array([1], dtype="float32")) == "double"
- assert m.overloaded4(np.array([1], dtype="short")) == "long long"
-
- assert m.overloaded5(np.array([1], dtype="double")) == "double"
- assert m.overloaded5(np.array([1], dtype="uintc")) == "unsigned int"
- assert m.overloaded5(np.array([1], dtype="float32")) == "unsigned int"
-
-
-def test_greedy_string_overload():
- """Tests fix for #685 - ndarray shouldn't go to std::string overload"""
-
- assert m.issue685("abc") == "string"
- assert m.issue685(np.array([97, 98, 99], dtype="b")) == "array"
- assert m.issue685(123) == "other"
-
-
-def test_array_unchecked_fixed_dims(msg):
- z1 = np.array([[1, 2], [3, 4]], dtype="float64")
- m.proxy_add2(z1, 10)
- assert np.all(z1 == [[11, 12], [13, 14]])
-
- with pytest.raises(ValueError) as excinfo:
- m.proxy_add2(np.array([1.0, 2, 3]), 5.0)
- assert (
- msg(excinfo.value) == "array has incorrect number of dimensions: 1; expected 2"
- )
-
- expect_c = np.ndarray(shape=(3, 3, 3), buffer=np.array(range(3, 30)), dtype="int")
- assert np.all(m.proxy_init3(3.0) == expect_c)
- expect_f = np.transpose(expect_c)
- assert np.all(m.proxy_init3F(3.0) == expect_f)
-
- assert m.proxy_squared_L2_norm(np.array(range(6))) == 55
- assert m.proxy_squared_L2_norm(np.array(range(6), dtype="float64")) == 55
-
- assert m.proxy_auxiliaries2(z1) == [11, 11, True, 2, 8, 2, 2, 4, 32]
- assert m.proxy_auxiliaries2(z1) == m.array_auxiliaries2(z1)
-
- assert m.proxy_auxiliaries1_const_ref(z1[0, :])
- assert m.proxy_auxiliaries2_const_ref(z1)
-
-
-def test_array_unchecked_dyn_dims(msg):
- z1 = np.array([[1, 2], [3, 4]], dtype="float64")
- m.proxy_add2_dyn(z1, 10)
- assert np.all(z1 == [[11, 12], [13, 14]])
-
- expect_c = np.ndarray(shape=(3, 3, 3), buffer=np.array(range(3, 30)), dtype="int")
- assert np.all(m.proxy_init3_dyn(3.0) == expect_c)
-
- assert m.proxy_auxiliaries2_dyn(z1) == [11, 11, True, 2, 8, 2, 2, 4, 32]
- assert m.proxy_auxiliaries2_dyn(z1) == m.array_auxiliaries2(z1)
-
-
-def test_array_failure():
- with pytest.raises(ValueError) as excinfo:
- m.array_fail_test()
- assert str(excinfo.value) == "cannot create a pybind11::array from a nullptr"
-
- with pytest.raises(ValueError) as excinfo:
- m.array_t_fail_test()
- assert str(excinfo.value) == "cannot create a pybind11::array_t from a nullptr"
-
- with pytest.raises(ValueError) as excinfo:
- m.array_fail_test_negative_size()
- assert str(excinfo.value) == "negative dimensions are not allowed"
-
-
-def test_initializer_list():
- assert m.array_initializer_list1().shape == (1,)
- assert m.array_initializer_list2().shape == (1, 2)
- assert m.array_initializer_list3().shape == (1, 2, 3)
- assert m.array_initializer_list4().shape == (1, 2, 3, 4)
-
-
-def test_array_resize(msg):
- a = np.array([1, 2, 3, 4, 5, 6, 7, 8, 9], dtype="float64")
- m.array_reshape2(a)
- assert a.size == 9
- assert np.all(a == [[1, 2, 3], [4, 5, 6], [7, 8, 9]])
-
- # total size change should succced with refcheck off
- m.array_resize3(a, 4, False)
- assert a.size == 64
- # ... and fail with refcheck on
- try:
- m.array_resize3(a, 3, True)
- except ValueError as e:
- assert str(e).startswith("cannot resize an array")
- # transposed array doesn't own data
- b = a.transpose()
- try:
- m.array_resize3(b, 3, False)
- except ValueError as e:
- assert str(e).startswith("cannot resize this array: it does not own its data")
- # ... but reshape should be fine
- m.array_reshape2(b)
- assert b.shape == (8, 8)
-
-
-@pytest.mark.xfail("env.PYPY")
-def test_array_create_and_resize(msg):
- a = m.create_and_resize(2)
- assert a.size == 4
- assert np.all(a == 42.0)
-
-
-def test_index_using_ellipsis():
- a = m.index_using_ellipsis(np.zeros((5, 6, 7)))
- assert a.shape == (6,)
-
-
-@pytest.mark.parametrize("forcecast", [False, True])
-@pytest.mark.parametrize("contiguity", [None, "C", "F"])
-@pytest.mark.parametrize("noconvert", [False, True])
-@pytest.mark.filterwarnings(
- "ignore:Casting complex values to real discards the imaginary part:numpy.ComplexWarning"
-)
-def test_argument_conversions(forcecast, contiguity, noconvert):
- function_name = "accept_double"
- if contiguity == "C":
- function_name += "_c_style"
- elif contiguity == "F":
- function_name += "_f_style"
- if forcecast:
- function_name += "_forcecast"
- if noconvert:
- function_name += "_noconvert"
- function = getattr(m, function_name)
-
- for dtype in [np.dtype("float32"), np.dtype("float64"), np.dtype("complex128")]:
- for order in ["C", "F"]:
- for shape in [(2, 2), (1, 3, 1, 1), (1, 1, 1), (0,)]:
- if not noconvert:
- # If noconvert is not passed, only complex128 needs to be truncated and
- # "cannot be safely obtained". So without `forcecast`, the argument shouldn't
- # be accepted.
- should_raise = dtype.name == "complex128" and not forcecast
- else:
- # If noconvert is passed, only float64 and the matching order is accepted.
- # If at most one dimension has a size greater than 1, the array is also
- # trivially contiguous.
- trivially_contiguous = sum(1 for d in shape if d > 1) <= 1
- should_raise = dtype.name != "float64" or (
- contiguity is not None
- and contiguity != order
- and not trivially_contiguous
- )
-
- array = np.zeros(shape, dtype=dtype, order=order)
- if not should_raise:
- function(array)
- else:
- with pytest.raises(
- TypeError, match="incompatible function arguments"
- ):
- function(array)
-
-
-@pytest.mark.xfail("env.PYPY")
-def test_dtype_refcount_leak():
- from sys import getrefcount
-
- dtype = np.dtype(np.float_)
- a = np.array([1], dtype=dtype)
- before = getrefcount(dtype)
- m.ndim(a)
- after = getrefcount(dtype)
- assert after == before
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_dtypes.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_dtypes.cpp
deleted file mode 100644
index b2e5e6075665866b04acf5c5f4153e8f93ce8773..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_dtypes.cpp
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- tests/test_numpy_dtypes.cpp -- Structured and compound NumPy dtypes
-
- Copyright (c) 2016 Ivan Smirnov
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include <pybind11/numpy.h>
-
-#ifdef __GNUC__
-#define PYBIND11_PACKED(cls) cls __attribute__((__packed__))
-#else
-#define PYBIND11_PACKED(cls) __pragma(pack(push, 1)) cls __pragma(pack(pop))
-#endif
-
-namespace py = pybind11;
-
-struct SimpleStruct {
- bool bool_;
- uint32_t uint_;
- float float_;
- long double ldbl_;
-};
-
-std::ostream& operator<<(std::ostream& os, const SimpleStruct& v) {
- return os << "s:" << v.bool_ << "," << v.uint_ << "," << v.float_ << "," << v.ldbl_;
-}
-
-struct SimpleStructReordered {
- bool bool_;
- float float_;
- uint32_t uint_;
- long double ldbl_;
-};
-
-PYBIND11_PACKED(struct PackedStruct {
- bool bool_;
- uint32_t uint_;
- float float_;
- long double ldbl_;
-});
-
-std::ostream& operator<<(std::ostream& os, const PackedStruct& v) {
- return os << "p:" << v.bool_ << "," << v.uint_ << "," << v.float_ << "," << v.ldbl_;
-}
-
-PYBIND11_PACKED(struct NestedStruct {
- SimpleStruct a;
- PackedStruct b;
-});
-
-std::ostream& operator<<(std::ostream& os, const NestedStruct& v) {
- return os << "n:a=" << v.a << ";b=" << v.b;
-}
-
-struct PartialStruct {
- bool bool_;
- uint32_t uint_;
- float float_;
- uint64_t dummy2;
- long double ldbl_;
-};
-
-struct PartialNestedStruct {
- uint64_t dummy1;
- PartialStruct a;
- uint64_t dummy2;
-};
-
-struct UnboundStruct { };
-
-struct StringStruct {
- char a[3];
- std::array<char, 3> b;
-};
-
-struct ComplexStruct {
- std::complex<float> cflt;
- std::complex<double> cdbl;
-};
-
-std::ostream& operator<<(std::ostream& os, const ComplexStruct& v) {
- return os << "c:" << v.cflt << "," << v.cdbl;
-}
-
-struct ArrayStruct {
- char a[3][4];
- int32_t b[2];
- std::array<uint8_t, 3> c;
- std::array<float, 2> d[4];
-};
-
-PYBIND11_PACKED(struct StructWithUglyNames {
- int8_t __x__;
- uint64_t __y__;
-});
-
-enum class E1 : int64_t { A = -1, B = 1 };
-enum E2 : uint8_t { X = 1, Y = 2 };
-
-PYBIND11_PACKED(struct EnumStruct {
- E1 e1;
- E2 e2;
-});
-
-std::ostream& operator<<(std::ostream& os, const StringStruct& v) {
- os << "a='";
- for (size_t i = 0; i < 3 && v.a[i]; i++) os << v.a[i];
- os << "',b='";
- for (size_t i = 0; i < 3 && v.b[i]; i++) os << v.b[i];
- return os << "'";
-}
-
-std::ostream& operator<<(std::ostream& os, const ArrayStruct& v) {
- os << "a={";
- for (int i = 0; i < 3; i++) {
- if (i > 0)
- os << ',';
- os << '{';
- for (int j = 0; j < 3; j++)
- os << v.a[i][j] << ',';
- os << v.a[i][3] << '}';
- }
- os << "},b={" << v.b[0] << ',' << v.b[1];
- os << "},c={" << int(v.c[0]) << ',' << int(v.c[1]) << ',' << int(v.c[2]);
- os << "},d={";
- for (int i = 0; i < 4; i++) {
- if (i > 0)
- os << ',';
- os << '{' << v.d[i][0] << ',' << v.d[i][1] << '}';
- }
- return os << '}';
-}
-
-std::ostream& operator<<(std::ostream& os, const EnumStruct& v) {
- return os << "e1=" << (v.e1 == E1::A ? "A" : "B") << ",e2=" << (v.e2 == E2::X ? "X" : "Y");
-}
-
-template <typename T>
-py::array mkarray_via_buffer(size_t n) {
- return py::array(py::buffer_info(nullptr, sizeof(T),
- py::format_descriptor<T>::format(),
- 1, { n }, { sizeof(T) }));
-}
-
-#define SET_TEST_VALS(s, i) do { \
- s.bool_ = (i) % 2 != 0; \
- s.uint_ = (uint32_t) (i); \
- s.float_ = (float) (i) * 1.5f; \
- s.ldbl_ = (long double) (i) * -2.5L; } while (0)
-
-template <typename S>
-py::array_t<S, 0> create_recarray(size_t n) {
- auto arr = mkarray_via_buffer<S>(n);
- auto req = arr.request();
- auto ptr = static_cast<S*>(req.ptr);
- for (size_t i = 0; i < n; i++) {
- SET_TEST_VALS(ptr[i], i);
- }
- return arr;
-}
-
-template <typename S>
-py::list print_recarray(py::array_t<S, 0> arr) {
- const auto req = arr.request();
- const auto ptr = static_cast<S*>(req.ptr);
- auto l = py::list();
- for (py::ssize_t i = 0; i < req.size; i++) {
- std::stringstream ss;
- ss << ptr[i];
- l.append(py::str(ss.str()));
- }
- return l;
-}
-
-py::array_t<int32_t, 0> test_array_ctors(int i) {
- using arr_t = py::array_t<int32_t, 0>;
-
- std::vector<int32_t> data { 1, 2, 3, 4, 5, 6 };
- std::vector<py::ssize_t> shape { 3, 2 };
- std::vector<py::ssize_t> strides { 8, 4 };
-
- auto ptr = data.data();
- auto vptr = (void *) ptr;
- auto dtype = py::dtype("int32");
-
- py::buffer_info buf_ndim1(vptr, 4, "i", 6);
- py::buffer_info buf_ndim1_null(nullptr, 4, "i", 6);
- py::buffer_info buf_ndim2(vptr, 4, "i", 2, shape, strides);
- py::buffer_info buf_ndim2_null(nullptr, 4, "i", 2, shape, strides);
-
- auto fill = [](py::array arr) {
- auto req = arr.request();
- for (int i = 0; i < 6; i++) ((int32_t *) req.ptr)[i] = i + 1;
- return arr;
- };
-
- switch (i) {
- // shape: (3, 2)
- case 10: return arr_t(shape, strides, ptr);
- case 11: return py::array(shape, strides, ptr);
- case 12: return py::array(dtype, shape, strides, vptr);
- case 13: return arr_t(shape, ptr);
- case 14: return py::array(shape, ptr);
- case 15: return py::array(dtype, shape, vptr);
- case 16: return arr_t(buf_ndim2);
- case 17: return py::array(buf_ndim2);
- // shape: (3, 2) - post-fill
- case 20: return fill(arr_t(shape, strides));
- case 21: return py::array(shape, strides, ptr); // can't have nullptr due to templated ctor
- case 22: return fill(py::array(dtype, shape, strides));
- case 23: return fill(arr_t(shape));
- case 24: return py::array(shape, ptr); // can't have nullptr due to templated ctor
- case 25: return fill(py::array(dtype, shape));
- case 26: return fill(arr_t(buf_ndim2_null));
- case 27: return fill(py::array(buf_ndim2_null));
- // shape: (6, )
- case 30: return arr_t(6, ptr);
- case 31: return py::array(6, ptr);
- case 32: return py::array(dtype, 6, vptr);
- case 33: return arr_t(buf_ndim1);
- case 34: return py::array(buf_ndim1);
- // shape: (6, )
- case 40: return fill(arr_t(6));
- case 41: return py::array(6, ptr); // can't have nullptr due to templated ctor
- case 42: return fill(py::array(dtype, 6));
- case 43: return fill(arr_t(buf_ndim1_null));
- case 44: return fill(py::array(buf_ndim1_null));
- }
- return arr_t();
-}
-
-py::list test_dtype_ctors() {
- py::list list;
- list.append(py::dtype("int32"));
- list.append(py::dtype(std::string("float64")));
- list.append(py::dtype::from_args(py::str("bool")));
- py::list names, offsets, formats;
- py::dict dict;
- names.append(py::str("a")); names.append(py::str("b")); dict["names"] = names;
- offsets.append(py::int_(1)); offsets.append(py::int_(10)); dict["offsets"] = offsets;
- formats.append(py::dtype("int32")); formats.append(py::dtype("float64")); dict["formats"] = formats;
- dict["itemsize"] = py::int_(20);
- list.append(py::dtype::from_args(dict));
- list.append(py::dtype(names, formats, offsets, 20));
- list.append(py::dtype(py::buffer_info((void *) 0, sizeof(unsigned int), "I", 1)));
- list.append(py::dtype(py::buffer_info((void *) 0, 0, "T{i:a:f:b:}", 1)));
- return list;
-}
-
-struct A {};
-struct B {};
-
-TEST_SUBMODULE(numpy_dtypes, m) {
- try { py::module_::import("numpy"); }
- catch (...) { return; }
-
- // typeinfo may be registered before the dtype descriptor for scalar casts to work...
- py::class_<SimpleStruct>(m, "SimpleStruct")
- // Explicit construct to ensure zero-valued initialization.
- .def(py::init([]() { return SimpleStruct(); }))
- .def_readwrite("bool_", &SimpleStruct::bool_)
- .def_readwrite("uint_", &SimpleStruct::uint_)
- .def_readwrite("float_", &SimpleStruct::float_)
- .def_readwrite("ldbl_", &SimpleStruct::ldbl_)
- .def("astuple", [](const SimpleStruct& self) {
- return py::make_tuple(self.bool_, self.uint_, self.float_, self.ldbl_);
- })
- .def_static("fromtuple", [](const py::tuple tup) {
- if (py::len(tup) != 4) {
- throw py::cast_error("Invalid size");
- }
- return SimpleStruct{
- tup[0].cast<bool>(),
- tup[1].cast<uint32_t>(),
- tup[2].cast<float>(),
- tup[3].cast<long double>()};
- });
-
- PYBIND11_NUMPY_DTYPE(SimpleStruct, bool_, uint_, float_, ldbl_);
- PYBIND11_NUMPY_DTYPE(SimpleStructReordered, bool_, uint_, float_, ldbl_);
- PYBIND11_NUMPY_DTYPE(PackedStruct, bool_, uint_, float_, ldbl_);
- PYBIND11_NUMPY_DTYPE(NestedStruct, a, b);
- PYBIND11_NUMPY_DTYPE(PartialStruct, bool_, uint_, float_, ldbl_);
- PYBIND11_NUMPY_DTYPE(PartialNestedStruct, a);
- PYBIND11_NUMPY_DTYPE(StringStruct, a, b);
- PYBIND11_NUMPY_DTYPE(ArrayStruct, a, b, c, d);
- PYBIND11_NUMPY_DTYPE(EnumStruct, e1, e2);
- PYBIND11_NUMPY_DTYPE(ComplexStruct, cflt, cdbl);
-
- // ... or after
- py::class_<PackedStruct>(m, "PackedStruct");
-
- PYBIND11_NUMPY_DTYPE_EX(StructWithUglyNames, __x__, "x", __y__, "y");
-
- // If uncommented, this should produce a static_assert failure telling the user that the struct
- // is not a POD type
-// struct NotPOD { std::string v; NotPOD() : v("hi") {}; };
-// PYBIND11_NUMPY_DTYPE(NotPOD, v);
-
- // Check that dtypes can be registered programmatically, both from
- // initializer lists of field descriptors and from other containers.
- py::detail::npy_format_descriptor<A>::register_dtype(
- {}
- );
- py::detail::npy_format_descriptor<B>::register_dtype(
- std::vector<py::detail::field_descriptor>{}
- );
-
- // test_recarray, test_scalar_conversion
- m.def("create_rec_simple", &create_recarray<SimpleStruct>);
- m.def("create_rec_packed", &create_recarray<PackedStruct>);
- m.def("create_rec_nested", [](size_t n) { // test_signature
- py::array_t<NestedStruct, 0> arr = mkarray_via_buffer<NestedStruct>(n);
- auto req = arr.request();
- auto ptr = static_cast<NestedStruct*>(req.ptr);
- for (size_t i = 0; i < n; i++) {
- SET_TEST_VALS(ptr[i].a, i);
- SET_TEST_VALS(ptr[i].b, i + 1);
- }
- return arr;
- });
- m.def("create_rec_partial", &create_recarray<PartialStruct>);
- m.def("create_rec_partial_nested", [](size_t n) {
- py::array_t<PartialNestedStruct, 0> arr = mkarray_via_buffer<PartialNestedStruct>(n);
- auto req = arr.request();
- auto ptr = static_cast<PartialNestedStruct*>(req.ptr);
- for (size_t i = 0; i < n; i++) {
- SET_TEST_VALS(ptr[i].a, i);
- }
- return arr;
- });
- m.def("print_rec_simple", &print_recarray<SimpleStruct>);
- m.def("print_rec_packed", &print_recarray<PackedStruct>);
- m.def("print_rec_nested", &print_recarray<NestedStruct>);
-
- // test_format_descriptors
- m.def("get_format_unbound", []() { return py::format_descriptor<UnboundStruct>::format(); });
- m.def("print_format_descriptors", []() {
- py::list l;
- for (const auto &fmt : {
- py::format_descriptor<SimpleStruct>::format(),
- py::format_descriptor<PackedStruct>::format(),
- py::format_descriptor<NestedStruct>::format(),
- py::format_descriptor<PartialStruct>::format(),
- py::format_descriptor<PartialNestedStruct>::format(),
- py::format_descriptor<StringStruct>::format(),
- py::format_descriptor<ArrayStruct>::format(),
- py::format_descriptor<EnumStruct>::format(),
- py::format_descriptor<ComplexStruct>::format()
- }) {
- l.append(py::cast(fmt));
- }
- return l;
- });
-
- // test_dtype
- m.def("print_dtypes", []() {
- py::list l;
- for (const py::handle &d : {
- py::dtype::of<SimpleStruct>(),
- py::dtype::of<PackedStruct>(),
- py::dtype::of<NestedStruct>(),
- py::dtype::of<PartialStruct>(),
- py::dtype::of<PartialNestedStruct>(),
- py::dtype::of<StringStruct>(),
- py::dtype::of<ArrayStruct>(),
- py::dtype::of<EnumStruct>(),
- py::dtype::of<StructWithUglyNames>(),
- py::dtype::of<ComplexStruct>()
- })
- l.append(py::str(d));
- return l;
- });
- m.def("test_dtype_ctors", &test_dtype_ctors);
- m.def("test_dtype_methods", []() {
- py::list list;
- auto dt1 = py::dtype::of<int32_t>();
- auto dt2 = py::dtype::of<SimpleStruct>();
- list.append(dt1); list.append(dt2);
- list.append(py::bool_(dt1.has_fields())); list.append(py::bool_(dt2.has_fields()));
- list.append(py::int_(dt1.itemsize())); list.append(py::int_(dt2.itemsize()));
- return list;
- });
- struct TrailingPaddingStruct {
- int32_t a;
- char b;
- };
- PYBIND11_NUMPY_DTYPE(TrailingPaddingStruct, a, b);
- m.def("trailing_padding_dtype", []() { return py::dtype::of<TrailingPaddingStruct>(); });
-
- // test_string_array
- m.def("create_string_array", [](bool non_empty) {
- py::array_t<StringStruct, 0> arr = mkarray_via_buffer<StringStruct>(non_empty ? 4 : 0);
- if (non_empty) {
- auto req = arr.request();
- auto ptr = static_cast<StringStruct*>(req.ptr);
- for (py::ssize_t i = 0; i < req.size * req.itemsize; i++)
- static_cast<char*>(req.ptr)[i] = 0;
- ptr[1].a[0] = 'a'; ptr[1].b[0] = 'a';
- ptr[2].a[0] = 'a'; ptr[2].b[0] = 'a';
- ptr[3].a[0] = 'a'; ptr[3].b[0] = 'a';
-
- ptr[2].a[1] = 'b'; ptr[2].b[1] = 'b';
- ptr[3].a[1] = 'b'; ptr[3].b[1] = 'b';
-
- ptr[3].a[2] = 'c'; ptr[3].b[2] = 'c';
- }
- return arr;
- });
- m.def("print_string_array", &print_recarray<StringStruct>);
-
- // test_array_array
- m.def("create_array_array", [](size_t n) {
- py::array_t<ArrayStruct, 0> arr = mkarray_via_buffer<ArrayStruct>(n);
- auto ptr = (ArrayStruct *) arr.mutable_data();
- for (size_t i = 0; i < n; i++) {
- for (size_t j = 0; j < 3; j++)
- for (size_t k = 0; k < 4; k++)
- ptr[i].a[j][k] = char('A' + (i * 100 + j * 10 + k) % 26);
- for (size_t j = 0; j < 2; j++)
- ptr[i].b[j] = int32_t(i * 1000 + j);
- for (size_t j = 0; j < 3; j++)
- ptr[i].c[j] = uint8_t(i * 10 + j);
- for (size_t j = 0; j < 4; j++)
- for (size_t k = 0; k < 2; k++)
- ptr[i].d[j][k] = float(i) * 100.0f + float(j) * 10.0f + float(k);
- }
- return arr;
- });
- m.def("print_array_array", &print_recarray<ArrayStruct>);
-
- // test_enum_array
- m.def("create_enum_array", [](size_t n) {
- py::array_t<EnumStruct, 0> arr = mkarray_via_buffer<EnumStruct>(n);
- auto ptr = (EnumStruct *) arr.mutable_data();
- for (size_t i = 0; i < n; i++) {
- ptr[i].e1 = static_cast<E1>(-1 + ((int) i % 2) * 2);
- ptr[i].e2 = static_cast<E2>(1 + (i % 2));
- }
- return arr;
- });
- m.def("print_enum_array", &print_recarray<EnumStruct>);
-
- // test_complex_array
- m.def("create_complex_array", [](size_t n) {
- py::array_t<ComplexStruct, 0> arr = mkarray_via_buffer<ComplexStruct>(n);
- auto ptr = (ComplexStruct *) arr.mutable_data();
- for (size_t i = 0; i < n; i++) {
- ptr[i].cflt.real(float(i));
- ptr[i].cflt.imag(float(i) + 0.25f);
- ptr[i].cdbl.real(double(i) + 0.5);
- ptr[i].cdbl.imag(double(i) + 0.75);
- }
- return arr;
- });
- m.def("print_complex_array", &print_recarray<ComplexStruct>);
-
- // test_array_constructors
- m.def("test_array_ctors", &test_array_ctors);
-
- // test_compare_buffer_info
- struct CompareStruct {
- bool x;
- uint32_t y;
- float z;
- };
- PYBIND11_NUMPY_DTYPE(CompareStruct, x, y, z);
- m.def("compare_buffer_info", []() {
- py::list list;
- list.append(py::bool_(py::detail::compare_buffer_info<float>::compare(py::buffer_info(nullptr, sizeof(float), "f", 1))));
- list.append(py::bool_(py::detail::compare_buffer_info<unsigned>::compare(py::buffer_info(nullptr, sizeof(int), "I", 1))));
- list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), "l", 1))));
- list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), sizeof(long) == sizeof(int) ? "i" : "q", 1))));
- list.append(py::bool_(py::detail::compare_buffer_info<CompareStruct>::compare(py::buffer_info(nullptr, sizeof(CompareStruct), "T{?:x:3xI:y:f:z:}", 1))));
- return list;
- });
- m.def("buffer_to_dtype", [](py::buffer& buf) { return py::dtype(buf.request()); });
-
- // test_scalar_conversion
- auto f_simple = [](SimpleStruct s) { return s.uint_ * 10; };
- m.def("f_simple", f_simple);
- m.def("f_packed", [](PackedStruct s) { return s.uint_ * 10; });
- m.def("f_nested", [](NestedStruct s) { return s.a.uint_ * 10; });
-
- // test_vectorize
- m.def("f_simple_vectorized", py::vectorize(f_simple));
- auto f_simple_pass_thru = [](SimpleStruct s) { return s; };
- m.def("f_simple_pass_thru_vectorized", py::vectorize(f_simple_pass_thru));
-
- // test_register_dtype
- m.def("register_dtype", []() { PYBIND11_NUMPY_DTYPE(SimpleStruct, bool_, uint_, float_, ldbl_); });
-
- // test_str_leak
- m.def("dtype_wrapper", [](py::object d) { return py::dtype::from_args(std::move(d)); });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_dtypes.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_dtypes.py
deleted file mode 100644
index f56b776a402bc4da29ac853e0bf8313b630ee74b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_dtypes.py
+++ /dev/null
@@ -1,431 +0,0 @@
-# -*- coding: utf-8 -*-
-import re
-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import numpy_dtypes as m
-
-np = pytest.importorskip("numpy")
-
-
-@pytest.fixture(scope="module")
-def simple_dtype():
- ld = np.dtype("longdouble")
- return np.dtype(
- {
- "names": ["bool_", "uint_", "float_", "ldbl_"],
- "formats": ["?", "u4", "f4", "f{}".format(ld.itemsize)],
- "offsets": [0, 4, 8, (16 if ld.alignment > 4 else 12)],
- }
- )
-
-
-@pytest.fixture(scope="module")
-def packed_dtype():
- return np.dtype([("bool_", "?"), ("uint_", "u4"), ("float_", "f4"), ("ldbl_", "g")])
-
-
-def dt_fmt():
- from sys import byteorder
-
- e = "<" if byteorder == "little" else ">"
- return (
- "{{'names':['bool_','uint_','float_','ldbl_'],"
- " 'formats':['?','" + e + "u4','" + e + "f4','" + e + "f{}'],"
- " 'offsets':[0,4,8,{}], 'itemsize':{}}}"
- )
-
-
-def simple_dtype_fmt():
- ld = np.dtype("longdouble")
- simple_ld_off = 12 + 4 * (ld.alignment > 4)
- return dt_fmt().format(ld.itemsize, simple_ld_off, simple_ld_off + ld.itemsize)
-
-
-def packed_dtype_fmt():
- from sys import byteorder
-
- return "[('bool_', '?'), ('uint_', '{e}u4'), ('float_', '{e}f4'), ('ldbl_', '{e}f{}')]".format(
- np.dtype("longdouble").itemsize, e="<" if byteorder == "little" else ">"
- )
-
-
-def partial_ld_offset():
- return (
- 12
- + 4 * (np.dtype("uint64").alignment > 4)
- + 8
- + 8 * (np.dtype("longdouble").alignment > 8)
- )
-
-
-def partial_dtype_fmt():
- ld = np.dtype("longdouble")
- partial_ld_off = partial_ld_offset()
- return dt_fmt().format(ld.itemsize, partial_ld_off, partial_ld_off + ld.itemsize)
-
-
-def partial_nested_fmt():
- ld = np.dtype("longdouble")
- partial_nested_off = 8 + 8 * (ld.alignment > 8)
- partial_ld_off = partial_ld_offset()
- partial_nested_size = partial_nested_off * 2 + partial_ld_off + ld.itemsize
- return "{{'names':['a'], 'formats':[{}], 'offsets':[{}], 'itemsize':{}}}".format(
- partial_dtype_fmt(), partial_nested_off, partial_nested_size
- )
-
-
-def assert_equal(actual, expected_data, expected_dtype):
- np.testing.assert_equal(actual, np.array(expected_data, dtype=expected_dtype))
-
-
-def test_format_descriptors():
- with pytest.raises(RuntimeError) as excinfo:
- m.get_format_unbound()
- assert re.match(
- "^NumPy type info missing for .*UnboundStruct.*$", str(excinfo.value)
- )
-
- ld = np.dtype("longdouble")
- ldbl_fmt = ("4x" if ld.alignment > 4 else "") + ld.char
- ss_fmt = "^T{?:bool_:3xI:uint_:f:float_:" + ldbl_fmt + ":ldbl_:}"
- dbl = np.dtype("double")
- partial_fmt = (
- "^T{?:bool_:3xI:uint_:f:float_:"
- + str(4 * (dbl.alignment > 4) + dbl.itemsize + 8 * (ld.alignment > 8))
- + "xg:ldbl_:}"
- )
- nested_extra = str(max(8, ld.alignment))
- assert m.print_format_descriptors() == [
- ss_fmt,
- "^T{?:bool_:I:uint_:f:float_:g:ldbl_:}",
- "^T{" + ss_fmt + ":a:^T{?:bool_:I:uint_:f:float_:g:ldbl_:}:b:}",
- partial_fmt,
- "^T{" + nested_extra + "x" + partial_fmt + ":a:" + nested_extra + "x}",
- "^T{3s:a:3s:b:}",
- "^T{(3)4s:a:(2)i:b:(3)B:c:1x(4, 2)f:d:}",
- "^T{q:e1:B:e2:}",
- "^T{Zf:cflt:Zd:cdbl:}",
- ]
-
-
-def test_dtype(simple_dtype):
- from sys import byteorder
-
- e = "<" if byteorder == "little" else ">"
-
- assert m.print_dtypes() == [
- simple_dtype_fmt(),
- packed_dtype_fmt(),
- "[('a', {}), ('b', {})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
- partial_dtype_fmt(),
- partial_nested_fmt(),
- "[('a', 'S3'), ('b', 'S3')]",
- (
- "{{'names':['a','b','c','d'], "
- + "'formats':[('S4', (3,)),('"
- + e
- + "i4', (2,)),('u1', (3,)),('"
- + e
- + "f4', (4, 2))], "
- + "'offsets':[0,12,20,24], 'itemsize':56}}"
- ).format(e=e),
- "[('e1', '" + e + "i8'), ('e2', 'u1')]",
- "[('x', 'i1'), ('y', '" + e + "u8')]",
- "[('cflt', '" + e + "c8'), ('cdbl', '" + e + "c16')]",
- ]
-
- d1 = np.dtype(
- {
- "names": ["a", "b"],
- "formats": ["int32", "float64"],
- "offsets": [1, 10],
- "itemsize": 20,
- }
- )
- d2 = np.dtype([("a", "i4"), ("b", "f4")])
- assert m.test_dtype_ctors() == [
- np.dtype("int32"),
- np.dtype("float64"),
- np.dtype("bool"),
- d1,
- d1,
- np.dtype("uint32"),
- d2,
- ]
-
- assert m.test_dtype_methods() == [
- np.dtype("int32"),
- simple_dtype,
- False,
- True,
- np.dtype("int32").itemsize,
- simple_dtype.itemsize,
- ]
-
- assert m.trailing_padding_dtype() == m.buffer_to_dtype(
- np.zeros(1, m.trailing_padding_dtype())
- )
-
-
-def test_recarray(simple_dtype, packed_dtype):
- elements = [(False, 0, 0.0, -0.0), (True, 1, 1.5, -2.5), (False, 2, 3.0, -5.0)]
-
- for func, dtype in [
- (m.create_rec_simple, simple_dtype),
- (m.create_rec_packed, packed_dtype),
- ]:
- arr = func(0)
- assert arr.dtype == dtype
- assert_equal(arr, [], simple_dtype)
- assert_equal(arr, [], packed_dtype)
-
- arr = func(3)
- assert arr.dtype == dtype
- assert_equal(arr, elements, simple_dtype)
- assert_equal(arr, elements, packed_dtype)
-
- # Show what recarray's look like in NumPy.
- assert type(arr[0]) == np.void
- assert type(arr[0].item()) == tuple
-
- if dtype == simple_dtype:
- assert m.print_rec_simple(arr) == [
- "s:0,0,0,-0",
- "s:1,1,1.5,-2.5",
- "s:0,2,3,-5",
- ]
- else:
- assert m.print_rec_packed(arr) == [
- "p:0,0,0,-0",
- "p:1,1,1.5,-2.5",
- "p:0,2,3,-5",
- ]
-
- nested_dtype = np.dtype([("a", simple_dtype), ("b", packed_dtype)])
-
- arr = m.create_rec_nested(0)
- assert arr.dtype == nested_dtype
- assert_equal(arr, [], nested_dtype)
-
- arr = m.create_rec_nested(3)
- assert arr.dtype == nested_dtype
- assert_equal(
- arr,
- [
- ((False, 0, 0.0, -0.0), (True, 1, 1.5, -2.5)),
- ((True, 1, 1.5, -2.5), (False, 2, 3.0, -5.0)),
- ((False, 2, 3.0, -5.0), (True, 3, 4.5, -7.5)),
- ],
- nested_dtype,
- )
- assert m.print_rec_nested(arr) == [
- "n:a=s:0,0,0,-0;b=p:1,1,1.5,-2.5",
- "n:a=s:1,1,1.5,-2.5;b=p:0,2,3,-5",
- "n:a=s:0,2,3,-5;b=p:1,3,4.5,-7.5",
- ]
-
- arr = m.create_rec_partial(3)
- assert str(arr.dtype) == partial_dtype_fmt()
- partial_dtype = arr.dtype
- assert "" not in arr.dtype.fields
- assert partial_dtype.itemsize > simple_dtype.itemsize
- assert_equal(arr, elements, simple_dtype)
- assert_equal(arr, elements, packed_dtype)
-
- arr = m.create_rec_partial_nested(3)
- assert str(arr.dtype) == partial_nested_fmt()
- assert "" not in arr.dtype.fields
- assert "" not in arr.dtype.fields["a"][0].fields
- assert arr.dtype.itemsize > partial_dtype.itemsize
- np.testing.assert_equal(arr["a"], m.create_rec_partial(3))
-
-
-def test_array_constructors():
- data = np.arange(1, 7, dtype="int32")
- for i in range(8):
- np.testing.assert_array_equal(m.test_array_ctors(10 + i), data.reshape((3, 2)))
- np.testing.assert_array_equal(m.test_array_ctors(20 + i), data.reshape((3, 2)))
- for i in range(5):
- np.testing.assert_array_equal(m.test_array_ctors(30 + i), data)
- np.testing.assert_array_equal(m.test_array_ctors(40 + i), data)
-
-
-def test_string_array():
- arr = m.create_string_array(True)
- assert str(arr.dtype) == "[('a', 'S3'), ('b', 'S3')]"
- assert m.print_string_array(arr) == [
- "a='',b=''",
- "a='a',b='a'",
- "a='ab',b='ab'",
- "a='abc',b='abc'",
- ]
- dtype = arr.dtype
- assert arr["a"].tolist() == [b"", b"a", b"ab", b"abc"]
- assert arr["b"].tolist() == [b"", b"a", b"ab", b"abc"]
- arr = m.create_string_array(False)
- assert dtype == arr.dtype
-
-
-def test_array_array():
- from sys import byteorder
-
- e = "<" if byteorder == "little" else ">"
-
- arr = m.create_array_array(3)
- assert str(arr.dtype) == (
- "{{'names':['a','b','c','d'], "
- + "'formats':[('S4', (3,)),('"
- + e
- + "i4', (2,)),('u1', (3,)),('{e}f4', (4, 2))], "
- + "'offsets':[0,12,20,24], 'itemsize':56}}"
- ).format(e=e)
- assert m.print_array_array(arr) == [
- "a={{A,B,C,D},{K,L,M,N},{U,V,W,X}},b={0,1},"
- + "c={0,1,2},d={{0,1},{10,11},{20,21},{30,31}}",
- "a={{W,X,Y,Z},{G,H,I,J},{Q,R,S,T}},b={1000,1001},"
- + "c={10,11,12},d={{100,101},{110,111},{120,121},{130,131}}",
- "a={{S,T,U,V},{C,D,E,F},{M,N,O,P}},b={2000,2001},"
- + "c={20,21,22},d={{200,201},{210,211},{220,221},{230,231}}",
- ]
- assert arr["a"].tolist() == [
- [b"ABCD", b"KLMN", b"UVWX"],
- [b"WXYZ", b"GHIJ", b"QRST"],
- [b"STUV", b"CDEF", b"MNOP"],
- ]
- assert arr["b"].tolist() == [[0, 1], [1000, 1001], [2000, 2001]]
- assert m.create_array_array(0).dtype == arr.dtype
-
-
-def test_enum_array():
- from sys import byteorder
-
- e = "<" if byteorder == "little" else ">"
-
- arr = m.create_enum_array(3)
- dtype = arr.dtype
- assert dtype == np.dtype([("e1", e + "i8"), ("e2", "u1")])
- assert m.print_enum_array(arr) == ["e1=A,e2=X", "e1=B,e2=Y", "e1=A,e2=X"]
- assert arr["e1"].tolist() == [-1, 1, -1]
- assert arr["e2"].tolist() == [1, 2, 1]
- assert m.create_enum_array(0).dtype == dtype
-
-
-def test_complex_array():
- from sys import byteorder
-
- e = "<" if byteorder == "little" else ">"
-
- arr = m.create_complex_array(3)
- dtype = arr.dtype
- assert dtype == np.dtype([("cflt", e + "c8"), ("cdbl", e + "c16")])
- assert m.print_complex_array(arr) == [
- "c:(0,0.25),(0.5,0.75)",
- "c:(1,1.25),(1.5,1.75)",
- "c:(2,2.25),(2.5,2.75)",
- ]
- assert arr["cflt"].tolist() == [0.0 + 0.25j, 1.0 + 1.25j, 2.0 + 2.25j]
- assert arr["cdbl"].tolist() == [0.5 + 0.75j, 1.5 + 1.75j, 2.5 + 2.75j]
- assert m.create_complex_array(0).dtype == dtype
-
-
-def test_signature(doc):
- assert (
- doc(m.create_rec_nested)
- == "create_rec_nested(arg0: int) -> numpy.ndarray[NestedStruct]"
- )
-
-
-def test_scalar_conversion():
- n = 3
- arrays = [
- m.create_rec_simple(n),
- m.create_rec_packed(n),
- m.create_rec_nested(n),
- m.create_enum_array(n),
- ]
- funcs = [m.f_simple, m.f_packed, m.f_nested]
-
- for i, func in enumerate(funcs):
- for j, arr in enumerate(arrays):
- if i == j and i < 2:
- assert [func(arr[k]) for k in range(n)] == [k * 10 for k in range(n)]
- else:
- with pytest.raises(TypeError) as excinfo:
- func(arr[0])
- assert "incompatible function arguments" in str(excinfo.value)
-
-
-def test_vectorize():
- n = 3
- array = m.create_rec_simple(n)
- values = m.f_simple_vectorized(array)
- np.testing.assert_array_equal(values, [0, 10, 20])
- array_2 = m.f_simple_pass_thru_vectorized(array)
- np.testing.assert_array_equal(array, array_2)
-
-
-def test_cls_and_dtype_conversion(simple_dtype):
- s = m.SimpleStruct()
- assert s.astuple() == (False, 0, 0.0, 0.0)
- assert m.SimpleStruct.fromtuple(s.astuple()).astuple() == s.astuple()
-
- s.uint_ = 2
- assert m.f_simple(s) == 20
-
- # Try as recarray of shape==(1,).
- s_recarray = np.array([(False, 2, 0.0, 0.0)], dtype=simple_dtype)
- # Show that this will work for vectorized case.
- np.testing.assert_array_equal(m.f_simple_vectorized(s_recarray), [20])
-
- # Show as a scalar that inherits from np.generic.
- s_scalar = s_recarray[0]
- assert isinstance(s_scalar, np.void)
- assert m.f_simple(s_scalar) == 20
-
- # Show that an *array* scalar (np.ndarray.shape == ()) does not convert.
- # More specifically, conversion to SimpleStruct is not implicit.
- s_recarray_scalar = s_recarray.reshape(())
- assert isinstance(s_recarray_scalar, np.ndarray)
- assert s_recarray_scalar.dtype == simple_dtype
- with pytest.raises(TypeError) as excinfo:
- m.f_simple(s_recarray_scalar)
- assert "incompatible function arguments" in str(excinfo.value)
- # Explicitly convert to m.SimpleStruct.
- assert m.f_simple(m.SimpleStruct.fromtuple(s_recarray_scalar.item())) == 20
-
- # Show that an array of dtype=object does *not* convert.
- s_array_object = np.array([s])
- assert s_array_object.dtype == object
- with pytest.raises(TypeError) as excinfo:
- m.f_simple_vectorized(s_array_object)
- assert "incompatible function arguments" in str(excinfo.value)
- # Explicitly convert to `np.array(..., dtype=simple_dtype)`
- s_array = np.array([s.astuple()], dtype=simple_dtype)
- np.testing.assert_array_equal(m.f_simple_vectorized(s_array), [20])
-
-
-def test_register_dtype():
- with pytest.raises(RuntimeError) as excinfo:
- m.register_dtype()
- assert "dtype is already registered" in str(excinfo.value)
-
-
-@pytest.mark.xfail("env.PYPY")
-def test_str_leak():
- from sys import getrefcount
-
- fmt = "f4"
- pytest.gc_collect()
- start = getrefcount(fmt)
- d = m.dtype_wrapper(fmt)
- assert d is np.dtype("f4")
- del d
- pytest.gc_collect()
- assert getrefcount(fmt) == start
-
-
-def test_compare_buffer_info():
- assert all(m.compare_buffer_info())
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_vectorize.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_vectorize.cpp
deleted file mode 100644
index 274b7558a9e80cab3cc390b03dd303eb37533f5d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_vectorize.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- tests/test_numpy_vectorize.cpp -- auto-vectorize functions over NumPy array
- arguments
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include <pybind11/numpy.h>
-
-double my_func(int x, float y, double z) {
- py::print("my_func(x:int={}, y:float={:.0f}, z:float={:.0f})"_s.format(x, y, z));
- return (float) x*y*z;
-}
-
-TEST_SUBMODULE(numpy_vectorize, m) {
- try { py::module_::import("numpy"); }
- catch (...) { return; }
-
- // test_vectorize, test_docs, test_array_collapse
- // Vectorize all arguments of a function (though non-vector arguments are also allowed)
- m.def("vectorized_func", py::vectorize(my_func));
-
- // Vectorize a lambda function with a capture object (e.g. to exclude some arguments from the vectorization)
- m.def("vectorized_func2",
- [](py::array_t<int> x, py::array_t<float> y, float z) {
- return py::vectorize([z](int x, float y) { return my_func(x, y, z); })(x, y);
- }
- );
-
- // Vectorize a complex-valued function
- m.def("vectorized_func3", py::vectorize(
- [](std::complex<double> c) { return c * std::complex<double>(2.f); }
- ));
-
- // test_type_selection
- // NumPy function which only accepts specific data types
- m.def("selective_func", [](py::array_t<int, py::array::c_style>) { return "Int branch taken."; });
- m.def("selective_func", [](py::array_t<float, py::array::c_style>) { return "Float branch taken."; });
- m.def("selective_func", [](py::array_t<std::complex<float>, py::array::c_style>) { return "Complex float branch taken."; });
-
-
- // test_passthrough_arguments
- // Passthrough test: references and non-pod types should be automatically passed through (in the
- // function definition below, only `b`, `d`, and `g` are vectorized):
- struct NonPODClass {
- NonPODClass(int v) : value{v} {}
- int value;
- };
- py::class_<NonPODClass>(m, "NonPODClass")
- .def(py::init<int>())
- .def_readwrite("value", &NonPODClass::value);
- m.def("vec_passthrough", py::vectorize(
- [](double *a, double b, py::array_t<double> c, const int &d, int &e, NonPODClass f, const double g) {
- return *a + b + c.at(0) + d + e + f.value + g;
- }
- ));
-
- // test_method_vectorization
- struct VectorizeTestClass {
- VectorizeTestClass(int v) : value{v} {};
- float method(int x, float y) { return y + (float) (x + value); }
- int value = 0;
- };
- py::class_<VectorizeTestClass> vtc(m, "VectorizeTestClass");
- vtc .def(py::init<int>())
- .def_readwrite("value", &VectorizeTestClass::value);
-
- // Automatic vectorizing of methods
- vtc.def("method", py::vectorize(&VectorizeTestClass::method));
-
- // test_trivial_broadcasting
- // Internal optimization test for whether the input is trivially broadcastable:
- py::enum_<py::detail::broadcast_trivial>(m, "trivial")
- .value("f_trivial", py::detail::broadcast_trivial::f_trivial)
- .value("c_trivial", py::detail::broadcast_trivial::c_trivial)
- .value("non_trivial", py::detail::broadcast_trivial::non_trivial);
- m.def("vectorized_is_trivial", [](
- py::array_t<int, py::array::forcecast> arg1,
- py::array_t<float, py::array::forcecast> arg2,
- py::array_t<double, py::array::forcecast> arg3
- ) {
- py::ssize_t ndim;
- std::vector<py::ssize_t> shape;
- std::array<py::buffer_info, 3> buffers {{ arg1.request(), arg2.request(), arg3.request() }};
- return py::detail::broadcast(buffers, ndim, shape);
- });
-
- m.def("add_to", py::vectorize([](NonPODClass& x, int a) { x.value += a; }));
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_vectorize.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_vectorize.py
deleted file mode 100644
index 4e6b2d198209eb790e6b80bfdf1b86010e87b366..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_numpy_vectorize.py
+++ /dev/null
@@ -1,266 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-from pybind11_tests import numpy_vectorize as m
-
-np = pytest.importorskip("numpy")
-
-
-def test_vectorize(capture):
- assert np.isclose(m.vectorized_func3(np.array(3 + 7j)), [6 + 14j])
-
- for f in [m.vectorized_func, m.vectorized_func2]:
- with capture:
- assert np.isclose(f(1, 2, 3), 6)
- assert capture == "my_func(x:int=1, y:float=2, z:float=3)"
- with capture:
- assert np.isclose(f(np.array(1), np.array(2), 3), 6)
- assert capture == "my_func(x:int=1, y:float=2, z:float=3)"
- with capture:
- assert np.allclose(f(np.array([1, 3]), np.array([2, 4]), 3), [6, 36])
- assert (
- capture
- == """
- my_func(x:int=1, y:float=2, z:float=3)
- my_func(x:int=3, y:float=4, z:float=3)
- """
- )
- with capture:
- a = np.array([[1, 2], [3, 4]], order="F")
- b = np.array([[10, 20], [30, 40]], order="F")
- c = 3
- result = f(a, b, c)
- assert np.allclose(result, a * b * c)
- assert result.flags.f_contiguous
- # All inputs are F order and full or singletons, so we the result is in col-major order:
- assert (
- capture
- == """
- my_func(x:int=1, y:float=10, z:float=3)
- my_func(x:int=3, y:float=30, z:float=3)
- my_func(x:int=2, y:float=20, z:float=3)
- my_func(x:int=4, y:float=40, z:float=3)
- """
- )
- with capture:
- a, b, c = (
- np.array([[1, 3, 5], [7, 9, 11]]),
- np.array([[2, 4, 6], [8, 10, 12]]),
- 3,
- )
- assert np.allclose(f(a, b, c), a * b * c)
- assert (
- capture
- == """
- my_func(x:int=1, y:float=2, z:float=3)
- my_func(x:int=3, y:float=4, z:float=3)
- my_func(x:int=5, y:float=6, z:float=3)
- my_func(x:int=7, y:float=8, z:float=3)
- my_func(x:int=9, y:float=10, z:float=3)
- my_func(x:int=11, y:float=12, z:float=3)
- """
- )
- with capture:
- a, b, c = np.array([[1, 2, 3], [4, 5, 6]]), np.array([2, 3, 4]), 2
- assert np.allclose(f(a, b, c), a * b * c)
- assert (
- capture
- == """
- my_func(x:int=1, y:float=2, z:float=2)
- my_func(x:int=2, y:float=3, z:float=2)
- my_func(x:int=3, y:float=4, z:float=2)
- my_func(x:int=4, y:float=2, z:float=2)
- my_func(x:int=5, y:float=3, z:float=2)
- my_func(x:int=6, y:float=4, z:float=2)
- """
- )
- with capture:
- a, b, c = np.array([[1, 2, 3], [4, 5, 6]]), np.array([[2], [3]]), 2
- assert np.allclose(f(a, b, c), a * b * c)
- assert (
- capture
- == """
- my_func(x:int=1, y:float=2, z:float=2)
- my_func(x:int=2, y:float=2, z:float=2)
- my_func(x:int=3, y:float=2, z:float=2)
- my_func(x:int=4, y:float=3, z:float=2)
- my_func(x:int=5, y:float=3, z:float=2)
- my_func(x:int=6, y:float=3, z:float=2)
- """
- )
- with capture:
- a, b, c = (
- np.array([[1, 2, 3], [4, 5, 6]], order="F"),
- np.array([[2], [3]]),
- 2,
- )
- assert np.allclose(f(a, b, c), a * b * c)
- assert (
- capture
- == """
- my_func(x:int=1, y:float=2, z:float=2)
- my_func(x:int=2, y:float=2, z:float=2)
- my_func(x:int=3, y:float=2, z:float=2)
- my_func(x:int=4, y:float=3, z:float=2)
- my_func(x:int=5, y:float=3, z:float=2)
- my_func(x:int=6, y:float=3, z:float=2)
- """
- )
- with capture:
- a, b, c = np.array([[1, 2, 3], [4, 5, 6]])[::, ::2], np.array([[2], [3]]), 2
- assert np.allclose(f(a, b, c), a * b * c)
- assert (
- capture
- == """
- my_func(x:int=1, y:float=2, z:float=2)
- my_func(x:int=3, y:float=2, z:float=2)
- my_func(x:int=4, y:float=3, z:float=2)
- my_func(x:int=6, y:float=3, z:float=2)
- """
- )
- with capture:
- a, b, c = (
- np.array([[1, 2, 3], [4, 5, 6]], order="F")[::, ::2],
- np.array([[2], [3]]),
- 2,
- )
- assert np.allclose(f(a, b, c), a * b * c)
- assert (
- capture
- == """
- my_func(x:int=1, y:float=2, z:float=2)
- my_func(x:int=3, y:float=2, z:float=2)
- my_func(x:int=4, y:float=3, z:float=2)
- my_func(x:int=6, y:float=3, z:float=2)
- """
- )
-
-
-def test_type_selection():
- assert m.selective_func(np.array([1], dtype=np.int32)) == "Int branch taken."
- assert m.selective_func(np.array([1.0], dtype=np.float32)) == "Float branch taken."
- assert (
- m.selective_func(np.array([1.0j], dtype=np.complex64))
- == "Complex float branch taken."
- )
-
-
-def test_docs(doc):
- assert (
- doc(m.vectorized_func)
- == """
- vectorized_func(arg0: numpy.ndarray[numpy.int32], arg1: numpy.ndarray[numpy.float32], arg2: numpy.ndarray[numpy.float64]) -> object
- """ # noqa: E501 line too long
- )
-
-
-def test_trivial_broadcasting():
- trivial, vectorized_is_trivial = m.trivial, m.vectorized_is_trivial
-
- assert vectorized_is_trivial(1, 2, 3) == trivial.c_trivial
- assert vectorized_is_trivial(np.array(1), np.array(2), 3) == trivial.c_trivial
- assert (
- vectorized_is_trivial(np.array([1, 3]), np.array([2, 4]), 3)
- == trivial.c_trivial
- )
- assert trivial.c_trivial == vectorized_is_trivial(
- np.array([[1, 3, 5], [7, 9, 11]]), np.array([[2, 4, 6], [8, 10, 12]]), 3
- )
- assert (
- vectorized_is_trivial(np.array([[1, 2, 3], [4, 5, 6]]), np.array([2, 3, 4]), 2)
- == trivial.non_trivial
- )
- assert (
- vectorized_is_trivial(np.array([[1, 2, 3], [4, 5, 6]]), np.array([[2], [3]]), 2)
- == trivial.non_trivial
- )
- z1 = np.array([[1, 2, 3, 4], [5, 6, 7, 8]], dtype="int32")
- z2 = np.array(z1, dtype="float32")
- z3 = np.array(z1, dtype="float64")
- assert vectorized_is_trivial(z1, z2, z3) == trivial.c_trivial
- assert vectorized_is_trivial(1, z2, z3) == trivial.c_trivial
- assert vectorized_is_trivial(z1, 1, z3) == trivial.c_trivial
- assert vectorized_is_trivial(z1, z2, 1) == trivial.c_trivial
- assert vectorized_is_trivial(z1[::2, ::2], 1, 1) == trivial.non_trivial
- assert vectorized_is_trivial(1, 1, z1[::2, ::2]) == trivial.c_trivial
- assert vectorized_is_trivial(1, 1, z3[::2, ::2]) == trivial.non_trivial
- assert vectorized_is_trivial(z1, 1, z3[1::4, 1::4]) == trivial.c_trivial
-
- y1 = np.array(z1, order="F")
- y2 = np.array(y1)
- y3 = np.array(y1)
- assert vectorized_is_trivial(y1, y2, y3) == trivial.f_trivial
- assert vectorized_is_trivial(y1, 1, 1) == trivial.f_trivial
- assert vectorized_is_trivial(1, y2, 1) == trivial.f_trivial
- assert vectorized_is_trivial(1, 1, y3) == trivial.f_trivial
- assert vectorized_is_trivial(y1, z2, 1) == trivial.non_trivial
- assert vectorized_is_trivial(z1[1::4, 1::4], y2, 1) == trivial.f_trivial
- assert vectorized_is_trivial(y1[1::4, 1::4], z2, 1) == trivial.c_trivial
-
- assert m.vectorized_func(z1, z2, z3).flags.c_contiguous
- assert m.vectorized_func(y1, y2, y3).flags.f_contiguous
- assert m.vectorized_func(z1, 1, 1).flags.c_contiguous
- assert m.vectorized_func(1, y2, 1).flags.f_contiguous
- assert m.vectorized_func(z1[1::4, 1::4], y2, 1).flags.f_contiguous
- assert m.vectorized_func(y1[1::4, 1::4], z2, 1).flags.c_contiguous
-
-
-def test_passthrough_arguments(doc):
- assert doc(m.vec_passthrough) == (
- "vec_passthrough("
- + ", ".join(
- [
- "arg0: float",
- "arg1: numpy.ndarray[numpy.float64]",
- "arg2: numpy.ndarray[numpy.float64]",
- "arg3: numpy.ndarray[numpy.int32]",
- "arg4: int",
- "arg5: m.numpy_vectorize.NonPODClass",
- "arg6: numpy.ndarray[numpy.float64]",
- ]
- )
- + ") -> object"
- )
-
- b = np.array([[10, 20, 30]], dtype="float64")
- c = np.array([100, 200]) # NOT a vectorized argument
- d = np.array([[1000], [2000], [3000]], dtype="int")
- g = np.array([[1000000, 2000000, 3000000]], dtype="int") # requires casting
- assert np.all(
- m.vec_passthrough(1, b, c, d, 10000, m.NonPODClass(100000), g)
- == np.array(
- [
- [1111111, 2111121, 3111131],
- [1112111, 2112121, 3112131],
- [1113111, 2113121, 3113131],
- ]
- )
- )
-
-
-def test_method_vectorization():
- o = m.VectorizeTestClass(3)
- x = np.array([1, 2], dtype="int")
- y = np.array([[10], [20]], dtype="float32")
- assert np.all(o.method(x, y) == [[14, 15], [24, 25]])
-
-
-def test_array_collapse():
- assert not isinstance(m.vectorized_func(1, 2, 3), np.ndarray)
- assert not isinstance(m.vectorized_func(np.array(1), 2, 3), np.ndarray)
- z = m.vectorized_func([1], 2, 3)
- assert isinstance(z, np.ndarray)
- assert z.shape == (1,)
- z = m.vectorized_func(1, [[[2]]], 3)
- assert isinstance(z, np.ndarray)
- assert z.shape == (1, 1, 1)
-
-
-def test_vectorized_noreturn():
- x = m.NonPODClass(0)
- assert x.value == 0
- m.add_to(x, [1, 2, 3, 4])
- assert x.value == 10
- m.add_to(x, 1)
- assert x.value == 11
- m.add_to(x, [[1, 1], [2, 3]])
- assert x.value == 18
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_opaque_types.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_opaque_types.cpp
deleted file mode 100644
index 5a23431635532b9280f5b4a5c8ed32c7808561bc..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_opaque_types.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- tests/test_opaque_types.cpp -- opaque types, passing void pointers
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include <pybind11/stl.h>
-#include <vector>
-
-// IMPORTANT: Disable internal pybind11 translation mechanisms for STL data structures
-//
-// This also deliberately doesn't use the below StringList type alias to test
-// that MAKE_OPAQUE can handle a type containing a `,`. (The `std::allocator`
-// bit is just the default `std::vector` allocator).
-PYBIND11_MAKE_OPAQUE(std::vector<std::string, std::allocator<std::string>>);
-
-using StringList = std::vector<std::string, std::allocator<std::string>>;
-
-TEST_SUBMODULE(opaque_types, m) {
- // test_string_list
- py::class_<StringList>(m, "StringList")
- .def(py::init<>())
- .def("pop_back", &StringList::pop_back)
- /* There are multiple versions of push_back(), etc. Select the right ones. */
- .def("push_back", (void (StringList::*)(const std::string &)) &StringList::push_back)
- .def("back", (std::string &(StringList::*)()) &StringList::back)
- .def("__len__", [](const StringList &v) { return v.size(); })
- .def("__iter__", [](StringList &v) {
- return py::make_iterator(v.begin(), v.end());
- }, py::keep_alive<0, 1>());
-
- class ClassWithSTLVecProperty {
- public:
- StringList stringList;
- };
- py::class_<ClassWithSTLVecProperty>(m, "ClassWithSTLVecProperty")
- .def(py::init<>())
- .def_readwrite("stringList", &ClassWithSTLVecProperty::stringList);
-
- m.def("print_opaque_list", [](const StringList &l) {
- std::string ret = "Opaque list: [";
- bool first = true;
- for (auto entry : l) {
- if (!first)
- ret += ", ";
- ret += entry;
- first = false;
- }
- return ret + "]";
- });
-
- // test_pointers
- m.def("return_void_ptr", []() { return (void *) 0x1234; });
- m.def("get_void_ptr_value", [](void *ptr) { return reinterpret_cast<std::intptr_t>(ptr); });
- m.def("return_null_str", []() { return (char *) nullptr; });
- m.def("get_null_str_value", [](char *ptr) { return reinterpret_cast<std::intptr_t>(ptr); });
-
- m.def("return_unique_ptr", []() -> std::unique_ptr<StringList> {
- auto *result = new StringList();
- result->push_back("some value");
- return std::unique_ptr<StringList>(result);
- });
-
- // test unions
- py::class_<IntFloat>(m, "IntFloat")
- .def(py::init<>())
- .def_readwrite("i", &IntFloat::i)
- .def_readwrite("f", &IntFloat::f);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_opaque_types.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_opaque_types.py
deleted file mode 100644
index 773794634c79daa287e0577b991d6bd54f1d7c88..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_opaque_types.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-from pybind11_tests import opaque_types as m
-from pybind11_tests import ConstructorStats, UserType
-
-
-def test_string_list():
- lst = m.StringList()
- lst.push_back("Element 1")
- lst.push_back("Element 2")
- assert m.print_opaque_list(lst) == "Opaque list: [Element 1, Element 2]"
- assert lst.back() == "Element 2"
-
- for i, k in enumerate(lst, start=1):
- assert k == "Element {}".format(i)
- lst.pop_back()
- assert m.print_opaque_list(lst) == "Opaque list: [Element 1]"
-
- cvp = m.ClassWithSTLVecProperty()
- assert m.print_opaque_list(cvp.stringList) == "Opaque list: []"
-
- cvp.stringList = lst
- cvp.stringList.push_back("Element 3")
- assert m.print_opaque_list(cvp.stringList) == "Opaque list: [Element 1, Element 3]"
-
-
-def test_pointers(msg):
- living_before = ConstructorStats.get(UserType).alive()
- assert m.get_void_ptr_value(m.return_void_ptr()) == 0x1234
- assert m.get_void_ptr_value(UserType()) # Should also work for other C++ types
- assert ConstructorStats.get(UserType).alive() == living_before
-
- with pytest.raises(TypeError) as excinfo:
- m.get_void_ptr_value([1, 2, 3]) # This should not work
- assert (
- msg(excinfo.value)
- == """
- get_void_ptr_value(): incompatible function arguments. The following argument types are supported:
- 1. (arg0: capsule) -> int
-
- Invoked with: [1, 2, 3]
- """ # noqa: E501 line too long
- )
-
- assert m.return_null_str() is None
- assert m.get_null_str_value(m.return_null_str()) is not None
-
- ptr = m.return_unique_ptr()
- assert "StringList" in repr(ptr)
- assert m.print_opaque_list(ptr) == "Opaque list: [some value]"
-
-
-def test_unions():
- int_float_union = m.IntFloat()
- int_float_union.i = 42
- assert int_float_union.i == 42
- int_float_union.f = 3.0
- assert int_float_union.f == 3.0
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_operator_overloading.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_operator_overloading.cpp
deleted file mode 100644
index 0a27bfd57b6b3fb392ff043c523df8a6d692b017..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_operator_overloading.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- tests/test_operator_overloading.cpp -- operator overloading
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <pybind11/operators.h>
-#include <functional>
-
-class Vector2 {
-public:
- Vector2(float x, float y) : x(x), y(y) { print_created(this, toString()); }
- Vector2(const Vector2 &v) : x(v.x), y(v.y) { print_copy_created(this); }
- Vector2(Vector2 &&v) : x(v.x), y(v.y) { print_move_created(this); v.x = v.y = 0; }
- Vector2 &operator=(const Vector2 &v) { x = v.x; y = v.y; print_copy_assigned(this); return *this; }
- Vector2 &operator=(Vector2 &&v) { x = v.x; y = v.y; v.x = v.y = 0; print_move_assigned(this); return *this; }
- ~Vector2() { print_destroyed(this); }
-
- std::string toString() const { return "[" + std::to_string(x) + ", " + std::to_string(y) + "]"; }
-
- Vector2 operator-() const { return Vector2(-x, -y); }
- Vector2 operator+(const Vector2 &v) const { return Vector2(x + v.x, y + v.y); }
- Vector2 operator-(const Vector2 &v) const { return Vector2(x - v.x, y - v.y); }
- Vector2 operator-(float value) const { return Vector2(x - value, y - value); }
- Vector2 operator+(float value) const { return Vector2(x + value, y + value); }
- Vector2 operator*(float value) const { return Vector2(x * value, y * value); }
- Vector2 operator/(float value) const { return Vector2(x / value, y / value); }
- Vector2 operator*(const Vector2 &v) const { return Vector2(x * v.x, y * v.y); }
- Vector2 operator/(const Vector2 &v) const { return Vector2(x / v.x, y / v.y); }
- Vector2& operator+=(const Vector2 &v) { x += v.x; y += v.y; return *this; }
- Vector2& operator-=(const Vector2 &v) { x -= v.x; y -= v.y; return *this; }
- Vector2& operator*=(float v) { x *= v; y *= v; return *this; }
- Vector2& operator/=(float v) { x /= v; y /= v; return *this; }
- Vector2& operator*=(const Vector2 &v) { x *= v.x; y *= v.y; return *this; }
- Vector2& operator/=(const Vector2 &v) { x /= v.x; y /= v.y; return *this; }
-
- friend Vector2 operator+(float f, const Vector2 &v) { return Vector2(f + v.x, f + v.y); }
- friend Vector2 operator-(float f, const Vector2 &v) { return Vector2(f - v.x, f - v.y); }
- friend Vector2 operator*(float f, const Vector2 &v) { return Vector2(f * v.x, f * v.y); }
- friend Vector2 operator/(float f, const Vector2 &v) { return Vector2(f / v.x, f / v.y); }
-
- bool operator==(const Vector2 &v) const {
- return x == v.x && y == v.y;
- }
- bool operator!=(const Vector2 &v) const {
- return x != v.x || y != v.y;
- }
-private:
- float x, y;
-};
-
-class C1 { };
-class C2 { };
-
-int operator+(const C1 &, const C1 &) { return 11; }
-int operator+(const C2 &, const C2 &) { return 22; }
-int operator+(const C2 &, const C1 &) { return 21; }
-int operator+(const C1 &, const C2 &) { return 12; }
-
-// Note: Specializing explicit within `namespace std { ... }` is done due to a
-// bug in GCC<7. If you are supporting compilers later than this, consider
-// specializing `using template<> struct std::hash<...>` in the global
-// namespace instead, per this recommendation:
-// https://en.cppreference.com/w/cpp/language/extending_std#Adding_template_specializations
-namespace std {
- template<>
- struct hash<Vector2> {
- // Not a good hash function, but easy to test
- size_t operator()(const Vector2 &) { return 4; }
- };
-} // namespace std
-
-// Not a good abs function, but easy to test.
-std::string abs(const Vector2&) {
- return "abs(Vector2)";
-}
-
-// MSVC warns about unknown pragmas, and warnings are errors.
-#ifndef _MSC_VER
- #pragma GCC diagnostic push
- // clang 7.0.0 and Apple LLVM 10.0.1 introduce `-Wself-assign-overloaded` to
- // `-Wall`, which is used here for overloading (e.g. `py::self += py::self `).
- // Here, we suppress the warning using `#pragma diagnostic`.
- // Taken from: https://github.com/RobotLocomotion/drake/commit/aaf84b46
- // TODO(eric): This could be resolved using a function / functor (e.g. `py::self()`).
- #if defined(__APPLE__) && defined(__clang__)
- #if (__clang_major__ >= 10)
- #pragma GCC diagnostic ignored "-Wself-assign-overloaded"
- #endif
- #elif defined(__clang__)
- #if (__clang_major__ >= 7)
- #pragma GCC diagnostic ignored "-Wself-assign-overloaded"
- #endif
- #endif
-#endif
-
-TEST_SUBMODULE(operators, m) {
-
- // test_operator_overloading
- py::class_<Vector2>(m, "Vector2")
- .def(py::init<float, float>())
- .def(py::self + py::self)
- .def(py::self + float())
- .def(py::self - py::self)
- .def(py::self - float())
- .def(py::self * float())
- .def(py::self / float())
- .def(py::self * py::self)
- .def(py::self / py::self)
- .def(py::self += py::self)
- .def(py::self -= py::self)
- .def(py::self *= float())
- .def(py::self /= float())
- .def(py::self *= py::self)
- .def(py::self /= py::self)
- .def(float() + py::self)
- .def(float() - py::self)
- .def(float() * py::self)
- .def(float() / py::self)
- .def(-py::self)
- .def("__str__", &Vector2::toString)
- .def("__repr__", &Vector2::toString)
- .def(py::self == py::self)
- .def(py::self != py::self)
- .def(py::hash(py::self))
- // N.B. See warning about usage of `py::detail::abs(py::self)` in
- // `operators.h`.
- .def("__abs__", [](const Vector2& v) { return abs(v); })
- ;
-
- m.attr("Vector") = m.attr("Vector2");
-
- // test_operators_notimplemented
- // #393: need to return NotSupported to ensure correct arithmetic operator behavior
- py::class_<C1>(m, "C1")
- .def(py::init<>())
- .def(py::self + py::self);
-
- py::class_<C2>(m, "C2")
- .def(py::init<>())
- .def(py::self + py::self)
- .def("__add__", [](const C2& c2, const C1& c1) { return c2 + c1; })
- .def("__radd__", [](const C2& c2, const C1& c1) { return c1 + c2; });
-
- // test_nested
- // #328: first member in a class can't be used in operators
- struct NestABase { int value = -2; };
- py::class_<NestABase>(m, "NestABase")
- .def(py::init<>())
- .def_readwrite("value", &NestABase::value);
-
- struct NestA : NestABase {
- int value = 3;
- NestA& operator+=(int i) { value += i; return *this; }
- };
- py::class_<NestA>(m, "NestA")
- .def(py::init<>())
- .def(py::self += int())
- .def("as_base", [](NestA &a) -> NestABase& {
- return (NestABase&) a;
- }, py::return_value_policy::reference_internal);
- m.def("get_NestA", [](const NestA &a) { return a.value; });
-
- struct NestB {
- NestA a;
- int value = 4;
- NestB& operator-=(int i) { value -= i; return *this; }
- };
- py::class_<NestB>(m, "NestB")
- .def(py::init<>())
- .def(py::self -= int())
- .def_readwrite("a", &NestB::a);
- m.def("get_NestB", [](const NestB &b) { return b.value; });
-
- struct NestC {
- NestB b;
- int value = 5;
- NestC& operator*=(int i) { value *= i; return *this; }
- };
- py::class_<NestC>(m, "NestC")
- .def(py::init<>())
- .def(py::self *= int())
- .def_readwrite("b", &NestC::b);
- m.def("get_NestC", [](const NestC &c) { return c.value; });
-
-
- // test_overriding_eq_reset_hash
- // #2191 Overriding __eq__ should set __hash__ to None
- struct Comparable {
- int value;
- bool operator==(const Comparable& rhs) const {return value == rhs.value;}
- };
-
- struct Hashable : Comparable {
- explicit Hashable(int value): Comparable{value}{};
- size_t hash() const { return static_cast<size_t>(value); }
- };
-
- struct Hashable2 : Hashable {
- using Hashable::Hashable;
- };
-
- py::class_<Comparable>(m, "Comparable")
- .def(py::init<int>())
- .def(py::self == py::self);
-
- py::class_<Hashable>(m, "Hashable")
- .def(py::init<int>())
- .def(py::self == py::self)
- .def("__hash__", &Hashable::hash);
-
- // define __hash__ before __eq__
- py::class_<Hashable2>(m, "Hashable2")
- .def("__hash__", &Hashable::hash)
- .def(py::init<int>())
- .def(py::self == py::self);
-}
-
-#ifndef _MSC_VER
- #pragma GCC diagnostic pop
-#endif
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_operator_overloading.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_operator_overloading.py
deleted file mode 100644
index 5dbfb32c8a9616e5041b76d99d450b582d1f7d48..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_operator_overloading.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-from pybind11_tests import operators as m
-from pybind11_tests import ConstructorStats
-
-
-def test_operator_overloading():
- v1 = m.Vector2(1, 2)
- v2 = m.Vector(3, -1)
- v3 = m.Vector2(1, 2) # Same value as v1, but different instance.
- assert v1 is not v3
-
- assert str(v1) == "[1.000000, 2.000000]"
- assert str(v2) == "[3.000000, -1.000000]"
-
- assert str(-v2) == "[-3.000000, 1.000000]"
-
- assert str(v1 + v2) == "[4.000000, 1.000000]"
- assert str(v1 - v2) == "[-2.000000, 3.000000]"
- assert str(v1 - 8) == "[-7.000000, -6.000000]"
- assert str(v1 + 8) == "[9.000000, 10.000000]"
- assert str(v1 * 8) == "[8.000000, 16.000000]"
- assert str(v1 / 8) == "[0.125000, 0.250000]"
- assert str(8 - v1) == "[7.000000, 6.000000]"
- assert str(8 + v1) == "[9.000000, 10.000000]"
- assert str(8 * v1) == "[8.000000, 16.000000]"
- assert str(8 / v1) == "[8.000000, 4.000000]"
- assert str(v1 * v2) == "[3.000000, -2.000000]"
- assert str(v2 / v1) == "[3.000000, -0.500000]"
-
- assert v1 == v3
- assert v1 != v2
- assert hash(v1) == 4
- # TODO(eric.cousineau): Make this work.
- # assert abs(v1) == "abs(Vector2)"
-
- v1 += 2 * v2
- assert str(v1) == "[7.000000, 0.000000]"
- v1 -= v2
- assert str(v1) == "[4.000000, 1.000000]"
- v1 *= 2
- assert str(v1) == "[8.000000, 2.000000]"
- v1 /= 16
- assert str(v1) == "[0.500000, 0.125000]"
- v1 *= v2
- assert str(v1) == "[1.500000, -0.125000]"
- v2 /= v1
- assert str(v2) == "[2.000000, 8.000000]"
-
- cstats = ConstructorStats.get(m.Vector2)
- assert cstats.alive() == 3
- del v1
- assert cstats.alive() == 2
- del v2
- assert cstats.alive() == 1
- del v3
- assert cstats.alive() == 0
- assert cstats.values() == [
- "[1.000000, 2.000000]",
- "[3.000000, -1.000000]",
- "[1.000000, 2.000000]",
- "[-3.000000, 1.000000]",
- "[4.000000, 1.000000]",
- "[-2.000000, 3.000000]",
- "[-7.000000, -6.000000]",
- "[9.000000, 10.000000]",
- "[8.000000, 16.000000]",
- "[0.125000, 0.250000]",
- "[7.000000, 6.000000]",
- "[9.000000, 10.000000]",
- "[8.000000, 16.000000]",
- "[8.000000, 4.000000]",
- "[3.000000, -2.000000]",
- "[3.000000, -0.500000]",
- "[6.000000, -2.000000]",
- ]
- assert cstats.default_constructions == 0
- assert cstats.copy_constructions == 0
- assert cstats.move_constructions >= 10
- assert cstats.copy_assignments == 0
- assert cstats.move_assignments == 0
-
-
-def test_operators_notimplemented():
- """#393: need to return NotSupported to ensure correct arithmetic operator behavior"""
-
- c1, c2 = m.C1(), m.C2()
- assert c1 + c1 == 11
- assert c2 + c2 == 22
- assert c2 + c1 == 21
- assert c1 + c2 == 12
-
-
-def test_nested():
- """#328: first member in a class can't be used in operators"""
-
- a = m.NestA()
- b = m.NestB()
- c = m.NestC()
-
- a += 10
- assert m.get_NestA(a) == 13
- b.a += 100
- assert m.get_NestA(b.a) == 103
- c.b.a += 1000
- assert m.get_NestA(c.b.a) == 1003
- b -= 1
- assert m.get_NestB(b) == 3
- c.b -= 3
- assert m.get_NestB(c.b) == 1
- c *= 7
- assert m.get_NestC(c) == 35
-
- abase = a.as_base()
- assert abase.value == -2
- a.as_base().value += 44
- assert abase.value == 42
- assert c.b.a.as_base().value == -2
- c.b.a.as_base().value += 44
- assert c.b.a.as_base().value == 42
-
- del c
- pytest.gc_collect()
- del a # Shouldn't delete while abase is still alive
- pytest.gc_collect()
-
- assert abase.value == 42
- del abase, b
- pytest.gc_collect()
-
-
-def test_overriding_eq_reset_hash():
-
- assert m.Comparable(15) is not m.Comparable(15)
- assert m.Comparable(15) == m.Comparable(15)
-
- with pytest.raises(TypeError):
- hash(m.Comparable(15)) # TypeError: unhashable type: 'm.Comparable'
-
- for hashable in (m.Hashable, m.Hashable2):
- assert hashable(15) is not hashable(15)
- assert hashable(15) == hashable(15)
-
- assert hash(hashable(15)) == 15
- assert hash(hashable(15)) == hash(hashable(15))
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_pickling.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_pickling.cpp
deleted file mode 100644
index 9dc63bda3b5949032fbcd30e7aa4e7db2072dcff..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_pickling.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- tests/test_pickling.cpp -- pickle support
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-TEST_SUBMODULE(pickling, m) {
- // test_roundtrip
- class Pickleable {
- public:
- Pickleable(const std::string &value) : m_value(value) { }
- const std::string &value() const { return m_value; }
-
- void setExtra1(int extra1) { m_extra1 = extra1; }
- void setExtra2(int extra2) { m_extra2 = extra2; }
- int extra1() const { return m_extra1; }
- int extra2() const { return m_extra2; }
- private:
- std::string m_value;
- int m_extra1 = 0;
- int m_extra2 = 0;
- };
-
- class PickleableNew : public Pickleable {
- public:
- using Pickleable::Pickleable;
- };
-
- py::class_<Pickleable>(m, "Pickleable")
- .def(py::init<std::string>())
- .def("value", &Pickleable::value)
- .def("extra1", &Pickleable::extra1)
- .def("extra2", &Pickleable::extra2)
- .def("setExtra1", &Pickleable::setExtra1)
- .def("setExtra2", &Pickleable::setExtra2)
- // For details on the methods below, refer to
- // http://docs.python.org/3/library/pickle.html#pickling-class-instances
- .def("__getstate__", [](const Pickleable &p) {
- /* Return a tuple that fully encodes the state of the object */
- return py::make_tuple(p.value(), p.extra1(), p.extra2());
- })
- .def("__setstate__", [](Pickleable &p, py::tuple t) {
- if (t.size() != 3)
- throw std::runtime_error("Invalid state!");
- /* Invoke the constructor (need to use in-place version) */
- new (&p) Pickleable(t[0].cast<std::string>());
-
- /* Assign any additional state */
- p.setExtra1(t[1].cast<int>());
- p.setExtra2(t[2].cast<int>());
- });
-
- py::class_<PickleableNew, Pickleable>(m, "PickleableNew")
- .def(py::init<std::string>())
- .def(py::pickle(
- [](const PickleableNew &p) {
- return py::make_tuple(p.value(), p.extra1(), p.extra2());
- },
- [](py::tuple t) {
- if (t.size() != 3)
- throw std::runtime_error("Invalid state!");
- auto p = PickleableNew(t[0].cast<std::string>());
-
- p.setExtra1(t[1].cast<int>());
- p.setExtra2(t[2].cast<int>());
- return p;
- }
- ));
-
-#if !defined(PYPY_VERSION)
- // test_roundtrip_with_dict
- class PickleableWithDict {
- public:
- PickleableWithDict(const std::string &value) : value(value) { }
-
- std::string value;
- int extra;
- };
-
- class PickleableWithDictNew : public PickleableWithDict {
- public:
- using PickleableWithDict::PickleableWithDict;
- };
-
- py::class_<PickleableWithDict>(m, "PickleableWithDict", py::dynamic_attr())
- .def(py::init<std::string>())
- .def_readwrite("value", &PickleableWithDict::value)
- .def_readwrite("extra", &PickleableWithDict::extra)
- .def("__getstate__", [](py::object self) {
- /* Also include __dict__ in state */
- return py::make_tuple(self.attr("value"), self.attr("extra"), self.attr("__dict__"));
- })
- .def("__setstate__", [](py::object self, py::tuple t) {
- if (t.size() != 3)
- throw std::runtime_error("Invalid state!");
- /* Cast and construct */
- auto& p = self.cast<PickleableWithDict&>();
- new (&p) PickleableWithDict(t[0].cast<std::string>());
-
- /* Assign C++ state */
- p.extra = t[1].cast<int>();
-
- /* Assign Python state */
- self.attr("__dict__") = t[2];
- });
-
- py::class_<PickleableWithDictNew, PickleableWithDict>(m, "PickleableWithDictNew")
- .def(py::init<std::string>())
- .def(py::pickle(
- [](py::object self) {
- return py::make_tuple(self.attr("value"), self.attr("extra"), self.attr("__dict__"));
- },
- [](const py::tuple &t) {
- if (t.size() != 3)
- throw std::runtime_error("Invalid state!");
-
- auto cpp_state = PickleableWithDictNew(t[0].cast<std::string>());
- cpp_state.extra = t[1].cast<int>();
-
- auto py_state = t[2].cast<py::dict>();
- return std::make_pair(cpp_state, py_state);
- }
- ));
-#endif
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_pickling.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_pickling.py
deleted file mode 100644
index 6b27a73a573299ed6c5da7f11cca0f7b7d328a37..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_pickling.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import pickling as m
-
-try:
- import cPickle as pickle # Use cPickle on Python 2.7
-except ImportError:
- import pickle
-
-
-@pytest.mark.parametrize("cls_name", ["Pickleable", "PickleableNew"])
-def test_roundtrip(cls_name):
- cls = getattr(m, cls_name)
- p = cls("test_value")
- p.setExtra1(15)
- p.setExtra2(48)
-
- data = pickle.dumps(p, 2) # Must use pickle protocol >= 2
- p2 = pickle.loads(data)
- assert p2.value() == p.value()
- assert p2.extra1() == p.extra1()
- assert p2.extra2() == p.extra2()
-
-
-@pytest.mark.xfail("env.PYPY")
-@pytest.mark.parametrize("cls_name", ["PickleableWithDict", "PickleableWithDictNew"])
-def test_roundtrip_with_dict(cls_name):
- cls = getattr(m, cls_name)
- p = cls("test_value")
- p.extra = 15
- p.dynamic = "Attribute"
-
- data = pickle.dumps(p, pickle.HIGHEST_PROTOCOL)
- p2 = pickle.loads(data)
- assert p2.value == p.value
- assert p2.extra == p.extra
- assert p2.dynamic == p.dynamic
-
-
-def test_enum_pickle():
- from pybind11_tests import enums as e
-
- data = pickle.dumps(e.EOne, 2)
- assert e.EOne == pickle.loads(data)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_pytypes.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_pytypes.cpp
deleted file mode 100644
index 113cf5cbbc7c3de9a8501dca284e5c6d0e790cd6..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_pytypes.cpp
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- tests/test_pytypes.cpp -- Python type casters
-
- Copyright (c) 2017 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-
-TEST_SUBMODULE(pytypes, m) {
- // test_int
- m.def("get_int", []{return py::int_(0);});
- // test_iterator
- m.def("get_iterator", []{return py::iterator();});
- // test_iterable
- m.def("get_iterable", []{return py::iterable();});
- // test_list
- m.def("get_list", []() {
- py::list list;
- list.append("value");
- py::print("Entry at position 0:", list[0]);
- list[0] = py::str("overwritten");
- list.insert(0, "inserted-0");
- list.insert(2, "inserted-2");
- return list;
- });
- m.def("print_list", [](py::list list) {
- int index = 0;
- for (auto item : list)
- py::print("list item {}: {}"_s.format(index++, item));
- });
- // test_none
- m.def("get_none", []{return py::none();});
- m.def("print_none", [](py::none none) {
- py::print("none: {}"_s.format(none));
- });
-
- // test_set
- m.def("get_set", []() {
- py::set set;
- set.add(py::str("key1"));
- set.add("key2");
- set.add(std::string("key3"));
- return set;
- });
- m.def("print_set", [](py::set set) {
- for (auto item : set)
- py::print("key:", item);
- });
- m.def("set_contains", [](py::set set, py::object key) {
- return set.contains(key);
- });
- m.def("set_contains", [](py::set set, const char* key) {
- return set.contains(key);
- });
-
- // test_dict
- m.def("get_dict", []() { return py::dict("key"_a="value"); });
- m.def("print_dict", [](py::dict dict) {
- for (auto item : dict)
- py::print("key: {}, value={}"_s.format(item.first, item.second));
- });
- m.def("dict_keyword_constructor", []() {
- auto d1 = py::dict("x"_a=1, "y"_a=2);
- auto d2 = py::dict("z"_a=3, **d1);
- return d2;
- });
- m.def("dict_contains", [](py::dict dict, py::object val) {
- return dict.contains(val);
- });
- m.def("dict_contains", [](py::dict dict, const char* val) {
- return dict.contains(val);
- });
-
- // test_str
- m.def("str_from_string", []() { return py::str(std::string("baz")); });
- m.def("str_from_bytes", []() { return py::str(py::bytes("boo", 3)); });
- m.def("str_from_object", [](const py::object& obj) { return py::str(obj); });
- m.def("repr_from_object", [](const py::object& obj) { return py::repr(obj); });
- m.def("str_from_handle", [](py::handle h) { return py::str(h); });
-
- m.def("str_format", []() {
- auto s1 = "{} + {} = {}"_s.format(1, 2, 3);
- auto s2 = "{a} + {b} = {c}"_s.format("a"_a=1, "b"_a=2, "c"_a=3);
- return py::make_tuple(s1, s2);
- });
-
- // test_bytes
- m.def("bytes_from_string", []() { return py::bytes(std::string("foo")); });
- m.def("bytes_from_str", []() { return py::bytes(py::str("bar", 3)); });
-
- // test_capsule
- m.def("return_capsule_with_destructor", []() {
- py::print("creating capsule");
- return py::capsule([]() {
- py::print("destructing capsule");
- });
- });
-
- m.def("return_capsule_with_destructor_2", []() {
- py::print("creating capsule");
- return py::capsule((void *) 1234, [](void *ptr) {
- py::print("destructing capsule: {}"_s.format((size_t) ptr));
- });
- });
-
- m.def("return_capsule_with_name_and_destructor", []() {
- auto capsule = py::capsule((void *) 12345, "pointer type description", [](PyObject *ptr) {
- if (ptr) {
- auto name = PyCapsule_GetName(ptr);
- py::print("destructing capsule ({}, '{}')"_s.format(
- (size_t) PyCapsule_GetPointer(ptr, name), name
- ));
- }
- });
-
- capsule.set_pointer((void *) 1234);
-
- // Using get_pointer<T>()
- void* contents1 = static_cast<void*>(capsule);
- void* contents2 = capsule.get_pointer();
- void* contents3 = capsule.get_pointer<void>();
-
- auto result1 = reinterpret_cast<size_t>(contents1);
- auto result2 = reinterpret_cast<size_t>(contents2);
- auto result3 = reinterpret_cast<size_t>(contents3);
-
- py::print("created capsule ({}, '{}')"_s.format(result1 & result2 & result3, capsule.name()));
- return capsule;
- });
-
- // test_accessors
- m.def("accessor_api", [](py::object o) {
- auto d = py::dict();
-
- d["basic_attr"] = o.attr("basic_attr");
-
- auto l = py::list();
- for (auto item : o.attr("begin_end")) {
- l.append(item);
- }
- d["begin_end"] = l;
-
- d["operator[object]"] = o.attr("d")["operator[object]"_s];
- d["operator[char *]"] = o.attr("d")["operator[char *]"];
-
- d["attr(object)"] = o.attr("sub").attr("attr_obj");
- d["attr(char *)"] = o.attr("sub").attr("attr_char");
- try {
- o.attr("sub").attr("missing").ptr();
- } catch (const py::error_already_set &) {
- d["missing_attr_ptr"] = "raised"_s;
- }
- try {
- o.attr("missing").attr("doesn't matter");
- } catch (const py::error_already_set &) {
- d["missing_attr_chain"] = "raised"_s;
- }
-
- d["is_none"] = o.attr("basic_attr").is_none();
-
- d["operator()"] = o.attr("func")(1);
- d["operator*"] = o.attr("func")(*o.attr("begin_end"));
-
- // Test implicit conversion
- py::list implicit_list = o.attr("begin_end");
- d["implicit_list"] = implicit_list;
- py::dict implicit_dict = o.attr("__dict__");
- d["implicit_dict"] = implicit_dict;
-
- return d;
- });
-
- m.def("tuple_accessor", [](py::tuple existing_t) {
- try {
- existing_t[0] = 1;
- } catch (const py::error_already_set &) {
- // --> Python system error
- // Only new tuples (refcount == 1) are mutable
- auto new_t = py::tuple(3);
- for (size_t i = 0; i < new_t.size(); ++i) {
- new_t[i] = i;
- }
- return new_t;
- }
- return py::tuple();
- });
-
- m.def("accessor_assignment", []() {
- auto l = py::list(1);
- l[0] = 0;
-
- auto d = py::dict();
- d["get"] = l[0];
- auto var = l[0];
- d["deferred_get"] = var;
- l[0] = 1;
- d["set"] = l[0];
- var = 99; // this assignment should not overwrite l[0]
- d["deferred_set"] = l[0];
- d["var"] = var;
-
- return d;
- });
-
- // test_constructors
- m.def("default_constructors", []() {
- return py::dict(
- "bytes"_a=py::bytes(),
- "str"_a=py::str(),
- "bool"_a=py::bool_(),
- "int"_a=py::int_(),
- "float"_a=py::float_(),
- "tuple"_a=py::tuple(),
- "list"_a=py::list(),
- "dict"_a=py::dict(),
- "set"_a=py::set()
- );
- });
-
- m.def("converting_constructors", [](py::dict d) {
- return py::dict(
- "bytes"_a=py::bytes(d["bytes"]),
- "str"_a=py::str(d["str"]),
- "bool"_a=py::bool_(d["bool"]),
- "int"_a=py::int_(d["int"]),
- "float"_a=py::float_(d["float"]),
- "tuple"_a=py::tuple(d["tuple"]),
- "list"_a=py::list(d["list"]),
- "dict"_a=py::dict(d["dict"]),
- "set"_a=py::set(d["set"]),
- "memoryview"_a=py::memoryview(d["memoryview"])
- );
- });
-
- m.def("cast_functions", [](py::dict d) {
- // When converting between Python types, obj.cast<T>() should be the same as T(obj)
- return py::dict(
- "bytes"_a=d["bytes"].cast<py::bytes>(),
- "str"_a=d["str"].cast<py::str>(),
- "bool"_a=d["bool"].cast<py::bool_>(),
- "int"_a=d["int"].cast<py::int_>(),
- "float"_a=d["float"].cast<py::float_>(),
- "tuple"_a=d["tuple"].cast<py::tuple>(),
- "list"_a=d["list"].cast<py::list>(),
- "dict"_a=d["dict"].cast<py::dict>(),
- "set"_a=d["set"].cast<py::set>(),
- "memoryview"_a=d["memoryview"].cast<py::memoryview>()
- );
- });
-
- m.def("convert_to_pybind11_str", [](py::object o) { return py::str(o); });
-
- m.def("nonconverting_constructor", [](std::string type, py::object value) -> py::object {
- if (type == "bytes") {
- return py::bytes(value);
- }
- else if (type == "none") {
- return py::none(value);
- }
- else if (type == "ellipsis") {
- return py::ellipsis(value);
- }
- throw std::runtime_error("Invalid type");
- });
-
- m.def("get_implicit_casting", []() {
- py::dict d;
- d["char*_i1"] = "abc";
- const char *c2 = "abc";
- d["char*_i2"] = c2;
- d["char*_e"] = py::cast(c2);
- d["char*_p"] = py::str(c2);
-
- d["int_i1"] = 42;
- int i = 42;
- d["int_i2"] = i;
- i++;
- d["int_e"] = py::cast(i);
- i++;
- d["int_p"] = py::int_(i);
-
- d["str_i1"] = std::string("str");
- std::string s2("str1");
- d["str_i2"] = s2;
- s2[3] = '2';
- d["str_e"] = py::cast(s2);
- s2[3] = '3';
- d["str_p"] = py::str(s2);
-
- py::list l(2);
- l[0] = 3;
- l[1] = py::cast(6);
- l.append(9);
- l.append(py::cast(12));
- l.append(py::int_(15));
-
- return py::dict(
- "d"_a=d,
- "l"_a=l
- );
- });
-
- // test_print
- m.def("print_function", []() {
- py::print("Hello, World!");
- py::print(1, 2.0, "three", true, std::string("-- multiple args"));
- auto args = py::make_tuple("and", "a", "custom", "separator");
- py::print("*args", *args, "sep"_a="-");
- py::print("no new line here", "end"_a=" -- ");
- py::print("next print");
-
- auto py_stderr = py::module_::import("sys").attr("stderr");
- py::print("this goes to stderr", "file"_a=py_stderr);
-
- py::print("flush", "flush"_a=true);
-
- py::print("{a} + {b} = {c}"_s.format("a"_a="py::print", "b"_a="str.format", "c"_a="this"));
- });
-
- m.def("print_failure", []() { py::print(42, UnregisteredType()); });
-
- m.def("hash_function", [](py::object obj) { return py::hash(obj); });
-
- m.def("test_number_protocol", [](py::object a, py::object b) {
- py::list l;
- l.append(a.equal(b));
- l.append(a.not_equal(b));
- l.append(a < b);
- l.append(a <= b);
- l.append(a > b);
- l.append(a >= b);
- l.append(a + b);
- l.append(a - b);
- l.append(a * b);
- l.append(a / b);
- l.append(a | b);
- l.append(a & b);
- l.append(a ^ b);
- l.append(a >> b);
- l.append(a << b);
- return l;
- });
-
- m.def("test_list_slicing", [](py::list a) {
- return a[py::slice(0, -1, 2)];
- });
-
- // See #2361
- m.def("issue2361_str_implicit_copy_none", []() {
- py::str is_this_none = py::none();
- return is_this_none;
- });
- m.def("issue2361_dict_implicit_copy_none", []() {
- py::dict is_this_none = py::none();
- return is_this_none;
- });
-
- m.def("test_memoryview_object", [](py::buffer b) {
- return py::memoryview(b);
- });
-
- m.def("test_memoryview_buffer_info", [](py::buffer b) {
- return py::memoryview(b.request());
- });
-
- m.def("test_memoryview_from_buffer", [](bool is_unsigned) {
- static const int16_t si16[] = { 3, 1, 4, 1, 5 };
- static const uint16_t ui16[] = { 2, 7, 1, 8 };
- if (is_unsigned)
- return py::memoryview::from_buffer(
- ui16, { 4 }, { sizeof(uint16_t) });
- else
- return py::memoryview::from_buffer(
- si16, { 5 }, { sizeof(int16_t) });
- });
-
- m.def("test_memoryview_from_buffer_nativeformat", []() {
- static const char* format = "@i";
- static const int32_t arr[] = { 4, 7, 5 };
- return py::memoryview::from_buffer(
- arr, sizeof(int32_t), format, { 3 }, { sizeof(int32_t) });
- });
-
- m.def("test_memoryview_from_buffer_empty_shape", []() {
- static const char* buf = "";
- return py::memoryview::from_buffer(buf, 1, "B", { }, { });
- });
-
- m.def("test_memoryview_from_buffer_invalid_strides", []() {
- static const char* buf = "\x02\x03\x04";
- return py::memoryview::from_buffer(buf, 1, "B", { 3 }, { });
- });
-
- m.def("test_memoryview_from_buffer_nullptr", []() {
- return py::memoryview::from_buffer(
- static_cast<void*>(nullptr), 1, "B", { }, { });
- });
-
-#if PY_MAJOR_VERSION >= 3
- m.def("test_memoryview_from_memory", []() {
- const char* buf = "\xff\xe1\xab\x37";
- return py::memoryview::from_memory(
- buf, static_cast<py::ssize_t>(strlen(buf)));
- });
-#endif
-
- // test_builtin_functions
- m.def("get_len", [](py::handle h) { return py::len(h); });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_pytypes.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_pytypes.py
deleted file mode 100644
index 9e5c302e56f18806de4b9ea499745efb581dd506..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_pytypes.py
+++ /dev/null
@@ -1,488 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import division
-import pytest
-import sys
-
-import env # noqa: F401
-
-from pybind11_tests import pytypes as m
-from pybind11_tests import debug_enabled
-
-
-def test_int(doc):
- assert doc(m.get_int) == "get_int() -> int"
-
-
-def test_iterator(doc):
- assert doc(m.get_iterator) == "get_iterator() -> Iterator"
-
-
-def test_iterable(doc):
- assert doc(m.get_iterable) == "get_iterable() -> Iterable"
-
-
-def test_list(capture, doc):
- with capture:
- lst = m.get_list()
- assert lst == ["inserted-0", "overwritten", "inserted-2"]
-
- lst.append("value2")
- m.print_list(lst)
- assert (
- capture.unordered
- == """
- Entry at position 0: value
- list item 0: inserted-0
- list item 1: overwritten
- list item 2: inserted-2
- list item 3: value2
- """
- )
-
- assert doc(m.get_list) == "get_list() -> list"
- assert doc(m.print_list) == "print_list(arg0: list) -> None"
-
-
-def test_none(capture, doc):
- assert doc(m.get_none) == "get_none() -> None"
- assert doc(m.print_none) == "print_none(arg0: None) -> None"
-
-
-def test_set(capture, doc):
- s = m.get_set()
- assert s == {"key1", "key2", "key3"}
-
- with capture:
- s.add("key4")
- m.print_set(s)
- assert (
- capture.unordered
- == """
- key: key1
- key: key2
- key: key3
- key: key4
- """
- )
-
- assert not m.set_contains(set([]), 42)
- assert m.set_contains({42}, 42)
- assert m.set_contains({"foo"}, "foo")
-
- assert doc(m.get_list) == "get_list() -> list"
- assert doc(m.print_list) == "print_list(arg0: list) -> None"
-
-
-def test_dict(capture, doc):
- d = m.get_dict()
- assert d == {"key": "value"}
-
- with capture:
- d["key2"] = "value2"
- m.print_dict(d)
- assert (
- capture.unordered
- == """
- key: key, value=value
- key: key2, value=value2
- """
- )
-
- assert not m.dict_contains({}, 42)
- assert m.dict_contains({42: None}, 42)
- assert m.dict_contains({"foo": None}, "foo")
-
- assert doc(m.get_dict) == "get_dict() -> dict"
- assert doc(m.print_dict) == "print_dict(arg0: dict) -> None"
-
- assert m.dict_keyword_constructor() == {"x": 1, "y": 2, "z": 3}
-
-
-def test_str(doc):
- assert m.str_from_string().encode().decode() == "baz"
- assert m.str_from_bytes().encode().decode() == "boo"
-
- assert doc(m.str_from_bytes) == "str_from_bytes() -> str"
-
- class A(object):
- def __str__(self):
- return "this is a str"
-
- def __repr__(self):
- return "this is a repr"
-
- assert m.str_from_object(A()) == "this is a str"
- assert m.repr_from_object(A()) == "this is a repr"
- assert m.str_from_handle(A()) == "this is a str"
-
- s1, s2 = m.str_format()
- assert s1 == "1 + 2 = 3"
- assert s1 == s2
-
- malformed_utf8 = b"\x80"
- assert m.str_from_object(malformed_utf8) is malformed_utf8 # To be fixed; see #2380
- if env.PY2:
- # with pytest.raises(UnicodeDecodeError):
- # m.str_from_object(malformed_utf8)
- with pytest.raises(UnicodeDecodeError):
- m.str_from_handle(malformed_utf8)
- else:
- # assert m.str_from_object(malformed_utf8) == "b'\\x80'"
- assert m.str_from_handle(malformed_utf8) == "b'\\x80'"
-
-
-def test_bytes(doc):
- assert m.bytes_from_string().decode() == "foo"
- assert m.bytes_from_str().decode() == "bar"
-
- assert doc(m.bytes_from_str) == "bytes_from_str() -> {}".format(
- "str" if env.PY2 else "bytes"
- )
-
-
-def test_capsule(capture):
- pytest.gc_collect()
- with capture:
- a = m.return_capsule_with_destructor()
- del a
- pytest.gc_collect()
- assert (
- capture.unordered
- == """
- creating capsule
- destructing capsule
- """
- )
-
- with capture:
- a = m.return_capsule_with_destructor_2()
- del a
- pytest.gc_collect()
- assert (
- capture.unordered
- == """
- creating capsule
- destructing capsule: 1234
- """
- )
-
- with capture:
- a = m.return_capsule_with_name_and_destructor()
- del a
- pytest.gc_collect()
- assert (
- capture.unordered
- == """
- created capsule (1234, 'pointer type description')
- destructing capsule (1234, 'pointer type description')
- """
- )
-
-
-def test_accessors():
- class SubTestObject:
- attr_obj = 1
- attr_char = 2
-
- class TestObject:
- basic_attr = 1
- begin_end = [1, 2, 3]
- d = {"operator[object]": 1, "operator[char *]": 2}
- sub = SubTestObject()
-
- def func(self, x, *args):
- return self.basic_attr + x + sum(args)
-
- d = m.accessor_api(TestObject())
- assert d["basic_attr"] == 1
- assert d["begin_end"] == [1, 2, 3]
- assert d["operator[object]"] == 1
- assert d["operator[char *]"] == 2
- assert d["attr(object)"] == 1
- assert d["attr(char *)"] == 2
- assert d["missing_attr_ptr"] == "raised"
- assert d["missing_attr_chain"] == "raised"
- assert d["is_none"] is False
- assert d["operator()"] == 2
- assert d["operator*"] == 7
- assert d["implicit_list"] == [1, 2, 3]
- assert all(x in TestObject.__dict__ for x in d["implicit_dict"])
-
- assert m.tuple_accessor(tuple()) == (0, 1, 2)
-
- d = m.accessor_assignment()
- assert d["get"] == 0
- assert d["deferred_get"] == 0
- assert d["set"] == 1
- assert d["deferred_set"] == 1
- assert d["var"] == 99
-
-
-def test_constructors():
- """C++ default and converting constructors are equivalent to type calls in Python"""
- types = [bytes, str, bool, int, float, tuple, list, dict, set]
- expected = {t.__name__: t() for t in types}
- if env.PY2:
- # Note that bytes.__name__ == 'str' in Python 2.
- # pybind11::str is unicode even under Python 2.
- expected["bytes"] = bytes()
- expected["str"] = unicode() # noqa: F821
- assert m.default_constructors() == expected
-
- data = {
- bytes: b"41", # Currently no supported or working conversions.
- str: 42,
- bool: "Not empty",
- int: "42",
- float: "+1e3",
- tuple: range(3),
- list: range(3),
- dict: [("two", 2), ("one", 1), ("three", 3)],
- set: [4, 4, 5, 6, 6, 6],
- memoryview: b"abc",
- }
- inputs = {k.__name__: v for k, v in data.items()}
- expected = {k.__name__: k(v) for k, v in data.items()}
- if env.PY2: # Similar to the above. See comments above.
- inputs["bytes"] = b"41"
- inputs["str"] = 42
- expected["bytes"] = b"41"
- expected["str"] = u"42"
-
- assert m.converting_constructors(inputs) == expected
- assert m.cast_functions(inputs) == expected
-
- # Converting constructors and cast functions should just reference rather
- # than copy when no conversion is needed:
- noconv1 = m.converting_constructors(expected)
- for k in noconv1:
- assert noconv1[k] is expected[k]
-
- noconv2 = m.cast_functions(expected)
- for k in noconv2:
- assert noconv2[k] is expected[k]
-
-
-def test_non_converting_constructors():
- non_converting_test_cases = [
- ("bytes", range(10)),
- ("none", 42),
- ("ellipsis", 42),
- ]
- for t, v in non_converting_test_cases:
- with pytest.raises(TypeError) as excinfo:
- m.nonconverting_constructor(t, v)
- expected_error = "Object of type '{}' is not an instance of '{}'".format(
- type(v).__name__, t
- )
- assert str(excinfo.value) == expected_error
-
-
-def test_pybind11_str_raw_str():
- # specifically to exercise pybind11::str::raw_str
- cvt = m.convert_to_pybind11_str
- assert cvt(u"Str") == u"Str"
- assert cvt(b"Bytes") == u"Bytes" if env.PY2 else "b'Bytes'"
- assert cvt(None) == u"None"
- assert cvt(False) == u"False"
- assert cvt(True) == u"True"
- assert cvt(42) == u"42"
- assert cvt(2 ** 65) == u"36893488147419103232"
- assert cvt(-1.50) == u"-1.5"
- assert cvt(()) == u"()"
- assert cvt((18,)) == u"(18,)"
- assert cvt([]) == u"[]"
- assert cvt([28]) == u"[28]"
- assert cvt({}) == u"{}"
- assert cvt({3: 4}) == u"{3: 4}"
- assert cvt(set()) == u"set([])" if env.PY2 else "set()"
- assert cvt({3, 3}) == u"set([3])" if env.PY2 else "{3}"
-
- valid_orig = u"DZ"
- valid_utf8 = valid_orig.encode("utf-8")
- valid_cvt = cvt(valid_utf8)
- assert type(valid_cvt) == bytes # Probably surprising.
- assert valid_cvt == b"\xc7\xb1"
-
- malformed_utf8 = b"\x80"
- malformed_cvt = cvt(malformed_utf8)
- assert type(malformed_cvt) == bytes # Probably surprising.
- assert malformed_cvt == b"\x80"
-
-
-def test_implicit_casting():
- """Tests implicit casting when assigning or appending to dicts and lists."""
- z = m.get_implicit_casting()
- assert z["d"] == {
- "char*_i1": "abc",
- "char*_i2": "abc",
- "char*_e": "abc",
- "char*_p": "abc",
- "str_i1": "str",
- "str_i2": "str1",
- "str_e": "str2",
- "str_p": "str3",
- "int_i1": 42,
- "int_i2": 42,
- "int_e": 43,
- "int_p": 44,
- }
- assert z["l"] == [3, 6, 9, 12, 15]
-
-
-def test_print(capture):
- with capture:
- m.print_function()
- assert (
- capture
- == """
- Hello, World!
- 1 2.0 three True -- multiple args
- *args-and-a-custom-separator
- no new line here -- next print
- flush
- py::print + str.format = this
- """
- )
- assert capture.stderr == "this goes to stderr"
-
- with pytest.raises(RuntimeError) as excinfo:
- m.print_failure()
- assert str(excinfo.value) == "make_tuple(): unable to convert " + (
- "argument of type 'UnregisteredType' to Python object"
- if debug_enabled
- else "arguments to Python object (compile in debug mode for details)"
- )
-
-
-def test_hash():
- class Hashable(object):
- def __init__(self, value):
- self.value = value
-
- def __hash__(self):
- return self.value
-
- class Unhashable(object):
- __hash__ = None
-
- assert m.hash_function(Hashable(42)) == 42
- with pytest.raises(TypeError):
- m.hash_function(Unhashable())
-
-
-def test_number_protocol():
- for a, b in [(1, 1), (3, 5)]:
- li = [
- a == b,
- a != b,
- a < b,
- a <= b,
- a > b,
- a >= b,
- a + b,
- a - b,
- a * b,
- a / b,
- a | b,
- a & b,
- a ^ b,
- a >> b,
- a << b,
- ]
- assert m.test_number_protocol(a, b) == li
-
-
-def test_list_slicing():
- li = list(range(100))
- assert li[::2] == m.test_list_slicing(li)
-
-
-def test_issue2361():
- # See issue #2361
- assert m.issue2361_str_implicit_copy_none() == "None"
- with pytest.raises(TypeError) as excinfo:
- assert m.issue2361_dict_implicit_copy_none()
- assert "'NoneType' object is not iterable" in str(excinfo.value)
-
-
-@pytest.mark.parametrize(
- "method, args, fmt, expected_view",
- [
- (m.test_memoryview_object, (b"red",), "B", b"red"),
- (m.test_memoryview_buffer_info, (b"green",), "B", b"green"),
- (m.test_memoryview_from_buffer, (False,), "h", [3, 1, 4, 1, 5]),
- (m.test_memoryview_from_buffer, (True,), "H", [2, 7, 1, 8]),
- (m.test_memoryview_from_buffer_nativeformat, (), "@i", [4, 7, 5]),
- ],
-)
-def test_memoryview(method, args, fmt, expected_view):
- view = method(*args)
- assert isinstance(view, memoryview)
- assert view.format == fmt
- if isinstance(expected_view, bytes) or not env.PY2:
- view_as_list = list(view)
- else:
- # Using max to pick non-zero byte (big-endian vs little-endian).
- view_as_list = [max([ord(c) for c in s]) for s in view]
- assert view_as_list == list(expected_view)
-
-
-@pytest.mark.xfail("env.PYPY", reason="getrefcount is not available")
-@pytest.mark.parametrize(
- "method",
- [
- m.test_memoryview_object,
- m.test_memoryview_buffer_info,
- ],
-)
-def test_memoryview_refcount(method):
- buf = b"\x0a\x0b\x0c\x0d"
- ref_before = sys.getrefcount(buf)
- view = method(buf)
- ref_after = sys.getrefcount(buf)
- assert ref_before < ref_after
- assert list(view) == list(buf)
-
-
-def test_memoryview_from_buffer_empty_shape():
- view = m.test_memoryview_from_buffer_empty_shape()
- assert isinstance(view, memoryview)
- assert view.format == "B"
- if env.PY2:
- # Python 2 behavior is weird, but Python 3 (the future) is fine.
- # PyPy3 has <memoryview, while CPython 2 has <memory
- assert bytes(view).startswith(b"<memory")
- else:
- assert bytes(view) == b""
-
-
-def test_test_memoryview_from_buffer_invalid_strides():
- with pytest.raises(RuntimeError):
- m.test_memoryview_from_buffer_invalid_strides()
-
-
-def test_test_memoryview_from_buffer_nullptr():
- if env.PY2:
- m.test_memoryview_from_buffer_nullptr()
- else:
- with pytest.raises(ValueError):
- m.test_memoryview_from_buffer_nullptr()
-
-
-@pytest.mark.skipif("env.PY2")
-def test_memoryview_from_memory():
- view = m.test_memoryview_from_memory()
- assert isinstance(view, memoryview)
- assert view.format == "B"
- assert bytes(view) == b"\xff\xe1\xab\x37"
-
-
-def test_builtin_functions():
- assert m.get_len([i for i in range(42)]) == 42
- with pytest.raises(TypeError) as exc_info:
- m.get_len(i for i in range(42))
- assert str(exc_info.value) in [
- "object of type 'generator' has no len()",
- "'generator' has no length",
- ] # PyPy
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_sequences_and_iterators.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_sequences_and_iterators.cpp
deleted file mode 100644
index d318052a48923dc281b1f78cf141d08fe7017eee..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_sequences_and_iterators.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- tests/test_sequences_and_iterators.cpp -- supporting Pythons' sequence protocol, iterators,
- etc.
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <pybind11/operators.h>
-#include <pybind11/stl.h>
-
-#include <algorithm>
-
-template<typename T>
-class NonZeroIterator {
- const T* ptr_;
-public:
- NonZeroIterator(const T* ptr) : ptr_(ptr) {}
- const T& operator*() const { return *ptr_; }
- NonZeroIterator& operator++() { ++ptr_; return *this; }
-};
-
-class NonZeroSentinel {};
-
-template<typename A, typename B>
-bool operator==(const NonZeroIterator<std::pair<A, B>>& it, const NonZeroSentinel&) {
- return !(*it).first || !(*it).second;
-}
-
-template <typename PythonType>
-py::list test_random_access_iterator(PythonType x) {
- if (x.size() < 5)
- throw py::value_error("Please provide at least 5 elements for testing.");
-
- auto checks = py::list();
- auto assert_equal = [&checks](py::handle a, py::handle b) {
- auto result = PyObject_RichCompareBool(a.ptr(), b.ptr(), Py_EQ);
- if (result == -1) { throw py::error_already_set(); }
- checks.append(result != 0);
- };
-
- auto it = x.begin();
- assert_equal(x[0], *it);
- assert_equal(x[0], it[0]);
- assert_equal(x[1], it[1]);
-
- assert_equal(x[1], *(++it));
- assert_equal(x[1], *(it++));
- assert_equal(x[2], *it);
- assert_equal(x[3], *(it += 1));
- assert_equal(x[2], *(--it));
- assert_equal(x[2], *(it--));
- assert_equal(x[1], *it);
- assert_equal(x[0], *(it -= 1));
-
- assert_equal(it->attr("real"), x[0].attr("real"));
- assert_equal((it + 1)->attr("real"), x[1].attr("real"));
-
- assert_equal(x[1], *(it + 1));
- assert_equal(x[1], *(1 + it));
- it += 3;
- assert_equal(x[1], *(it - 2));
-
- checks.append(static_cast<std::size_t>(x.end() - x.begin()) == x.size());
- checks.append((x.begin() + static_cast<std::ptrdiff_t>(x.size())) == x.end());
- checks.append(x.begin() < x.end());
-
- return checks;
-}
-
-TEST_SUBMODULE(sequences_and_iterators, m) {
- // test_sliceable
- class Sliceable{
- public:
- Sliceable(int n): size(n) {}
- int start,stop,step;
- int size;
- };
- py::class_<Sliceable>(m,"Sliceable")
- .def(py::init<int>())
- .def("__getitem__",[](const Sliceable &s, py::slice slice) {
- py::ssize_t start, stop, step, slicelength;
- if (!slice.compute(s.size, &start, &stop, &step, &slicelength))
- throw py::error_already_set();
- int istart = static_cast<int>(start);
- int istop = static_cast<int>(stop);
- int istep = static_cast<int>(step);
- return std::make_tuple(istart,istop,istep);
- })
- ;
-
- // test_sequence
- class Sequence {
- public:
- Sequence(size_t size) : m_size(size) {
- print_created(this, "of size", m_size);
- m_data = new float[size];
- memset(m_data, 0, sizeof(float) * size);
- }
- Sequence(const std::vector<float> &value) : m_size(value.size()) {
- print_created(this, "of size", m_size, "from std::vector");
- m_data = new float[m_size];
- memcpy(m_data, &value[0], sizeof(float) * m_size);
- }
- Sequence(const Sequence &s) : m_size(s.m_size) {
- print_copy_created(this);
- m_data = new float[m_size];
- memcpy(m_data, s.m_data, sizeof(float)*m_size);
- }
- Sequence(Sequence &&s) : m_size(s.m_size), m_data(s.m_data) {
- print_move_created(this);
- s.m_size = 0;
- s.m_data = nullptr;
- }
-
- ~Sequence() { print_destroyed(this); delete[] m_data; }
-
- Sequence &operator=(const Sequence &s) {
- if (&s != this) {
- delete[] m_data;
- m_size = s.m_size;
- m_data = new float[m_size];
- memcpy(m_data, s.m_data, sizeof(float)*m_size);
- }
- print_copy_assigned(this);
- return *this;
- }
-
- Sequence &operator=(Sequence &&s) {
- if (&s != this) {
- delete[] m_data;
- m_size = s.m_size;
- m_data = s.m_data;
- s.m_size = 0;
- s.m_data = nullptr;
- }
- print_move_assigned(this);
- return *this;
- }
-
- bool operator==(const Sequence &s) const {
- if (m_size != s.size()) return false;
- for (size_t i = 0; i < m_size; ++i)
- if (m_data[i] != s[i])
- return false;
- return true;
- }
- bool operator!=(const Sequence &s) const { return !operator==(s); }
-
- float operator[](size_t index) const { return m_data[index]; }
- float &operator[](size_t index) { return m_data[index]; }
-
- bool contains(float v) const {
- for (size_t i = 0; i < m_size; ++i)
- if (v == m_data[i])
- return true;
- return false;
- }
-
- Sequence reversed() const {
- Sequence result(m_size);
- for (size_t i = 0; i < m_size; ++i)
- result[m_size - i - 1] = m_data[i];
- return result;
- }
-
- size_t size() const { return m_size; }
-
- const float *begin() const { return m_data; }
- const float *end() const { return m_data+m_size; }
-
- private:
- size_t m_size;
- float *m_data;
- };
- py::class_<Sequence>(m, "Sequence")
- .def(py::init<size_t>())
- .def(py::init<const std::vector<float>&>())
- /// Bare bones interface
- .def("__getitem__", [](const Sequence &s, size_t i) {
- if (i >= s.size()) throw py::index_error();
- return s[i];
- })
- .def("__setitem__", [](Sequence &s, size_t i, float v) {
- if (i >= s.size()) throw py::index_error();
- s[i] = v;
- })
- .def("__len__", &Sequence::size)
- /// Optional sequence protocol operations
- .def("__iter__", [](const Sequence &s) { return py::make_iterator(s.begin(), s.end()); },
- py::keep_alive<0, 1>() /* Essential: keep object alive while iterator exists */)
- .def("__contains__", [](const Sequence &s, float v) { return s.contains(v); })
- .def("__reversed__", [](const Sequence &s) -> Sequence { return s.reversed(); })
- /// Slicing protocol (optional)
- .def("__getitem__", [](const Sequence &s, py::slice slice) -> Sequence* {
- size_t start, stop, step, slicelength;
- if (!slice.compute(s.size(), &start, &stop, &step, &slicelength))
- throw py::error_already_set();
- auto *seq = new Sequence(slicelength);
- for (size_t i = 0; i < slicelength; ++i) {
- (*seq)[i] = s[start]; start += step;
- }
- return seq;
- })
- .def("__setitem__", [](Sequence &s, py::slice slice, const Sequence &value) {
- size_t start, stop, step, slicelength;
- if (!slice.compute(s.size(), &start, &stop, &step, &slicelength))
- throw py::error_already_set();
- if (slicelength != value.size())
- throw std::runtime_error("Left and right hand size of slice assignment have different sizes!");
- for (size_t i = 0; i < slicelength; ++i) {
- s[start] = value[i]; start += step;
- }
- })
- /// Comparisons
- .def(py::self == py::self)
- .def(py::self != py::self)
- // Could also define py::self + py::self for concatenation, etc.
- ;
-
- // test_map_iterator
- // Interface of a map-like object that isn't (directly) an unordered_map, but provides some basic
- // map-like functionality.
- class StringMap {
- public:
- StringMap() = default;
- StringMap(std::unordered_map<std::string, std::string> init)
- : map(std::move(init)) {}
-
- void set(std::string key, std::string val) { map[key] = val; }
- std::string get(std::string key) const { return map.at(key); }
- size_t size() const { return map.size(); }
- private:
- std::unordered_map<std::string, std::string> map;
- public:
- decltype(map.cbegin()) begin() const { return map.cbegin(); }
- decltype(map.cend()) end() const { return map.cend(); }
- };
- py::class_<StringMap>(m, "StringMap")
- .def(py::init<>())
- .def(py::init<std::unordered_map<std::string, std::string>>())
- .def("__getitem__", [](const StringMap &map, std::string key) {
- try { return map.get(key); }
- catch (const std::out_of_range&) {
- throw py::key_error("key '" + key + "' does not exist");
- }
- })
- .def("__setitem__", &StringMap::set)
- .def("__len__", &StringMap::size)
- .def("__iter__", [](const StringMap &map) { return py::make_key_iterator(map.begin(), map.end()); },
- py::keep_alive<0, 1>())
- .def("items", [](const StringMap &map) { return py::make_iterator(map.begin(), map.end()); },
- py::keep_alive<0, 1>())
- ;
-
- // test_generalized_iterators
- class IntPairs {
- public:
- IntPairs(std::vector<std::pair<int, int>> data) : data_(std::move(data)) {}
- const std::pair<int, int>* begin() const { return data_.data(); }
- private:
- std::vector<std::pair<int, int>> data_;
- };
- py::class_<IntPairs>(m, "IntPairs")
- .def(py::init<std::vector<std::pair<int, int>>>())
- .def("nonzero", [](const IntPairs& s) {
- return py::make_iterator(NonZeroIterator<std::pair<int, int>>(s.begin()), NonZeroSentinel());
- }, py::keep_alive<0, 1>())
- .def("nonzero_keys", [](const IntPairs& s) {
- return py::make_key_iterator(NonZeroIterator<std::pair<int, int>>(s.begin()), NonZeroSentinel());
- }, py::keep_alive<0, 1>())
- ;
-
-
-#if 0
- // Obsolete: special data structure for exposing custom iterator types to python
- // kept here for illustrative purposes because there might be some use cases which
- // are not covered by the much simpler py::make_iterator
-
- struct PySequenceIterator {
- PySequenceIterator(const Sequence &seq, py::object ref) : seq(seq), ref(ref) { }
-
- float next() {
- if (index == seq.size())
- throw py::stop_iteration();
- return seq[index++];
- }
-
- const Sequence &seq;
- py::object ref; // keep a reference
- size_t index = 0;
- };
-
- py::class_<PySequenceIterator>(seq, "Iterator")
- .def("__iter__", [](PySequenceIterator &it) -> PySequenceIterator& { return it; })
- .def("__next__", &PySequenceIterator::next);
-
- On the actual Sequence object, the iterator would be constructed as follows:
- .def("__iter__", [](py::object s) { return PySequenceIterator(s.cast<const Sequence &>(), s); })
-#endif
-
- // test_python_iterator_in_cpp
- m.def("object_to_list", [](py::object o) {
- auto l = py::list();
- for (auto item : o) {
- l.append(item);
- }
- return l;
- });
-
- m.def("iterator_to_list", [](py::iterator it) {
- auto l = py::list();
- while (it != py::iterator::sentinel()) {
- l.append(*it);
- ++it;
- }
- return l;
- });
-
- // test_sequence_length: check that Python sequences can be converted to py::sequence.
- m.def("sequence_length", [](py::sequence seq) { return seq.size(); });
-
- // Make sure that py::iterator works with std algorithms
- m.def("count_none", [](py::object o) {
- return std::count_if(o.begin(), o.end(), [](py::handle h) { return h.is_none(); });
- });
-
- m.def("find_none", [](py::object o) {
- auto it = std::find_if(o.begin(), o.end(), [](py::handle h) { return h.is_none(); });
- return it->is_none();
- });
-
- m.def("count_nonzeros", [](py::dict d) {
- return std::count_if(d.begin(), d.end(), [](std::pair<py::handle, py::handle> p) {
- return p.second.cast<int>() != 0;
- });
- });
-
- m.def("tuple_iterator", &test_random_access_iterator<py::tuple>);
- m.def("list_iterator", &test_random_access_iterator<py::list>);
- m.def("sequence_iterator", &test_random_access_iterator<py::sequence>);
-
- // test_iterator_passthrough
- // #181: iterator passthrough did not compile
- m.def("iterator_passthrough", [](py::iterator s) -> py::iterator {
- return py::make_iterator(std::begin(s), std::end(s));
- });
-
- // test_iterator_rvp
- // #388: Can't make iterators via make_iterator() with different r/v policies
- static std::vector<int> list = { 1, 2, 3 };
- m.def("make_iterator_1", []() { return py::make_iterator<py::return_value_policy::copy>(list); });
- m.def("make_iterator_2", []() { return py::make_iterator<py::return_value_policy::automatic>(list); });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_sequences_and_iterators.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_sequences_and_iterators.py
deleted file mode 100644
index c3b608c43668895f5ba98dac36ac223d8843ce7f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_sequences_and_iterators.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-from pybind11_tests import sequences_and_iterators as m
-from pybind11_tests import ConstructorStats
-
-
-def isclose(a, b, rel_tol=1e-05, abs_tol=0.0):
- """Like math.isclose() from Python 3.5"""
- return abs(a - b) <= max(rel_tol * max(abs(a), abs(b)), abs_tol)
-
-
-def allclose(a_list, b_list, rel_tol=1e-05, abs_tol=0.0):
- return all(
- isclose(a, b, rel_tol=rel_tol, abs_tol=abs_tol) for a, b in zip(a_list, b_list)
- )
-
-
-def test_generalized_iterators():
- assert list(m.IntPairs([(1, 2), (3, 4), (0, 5)]).nonzero()) == [(1, 2), (3, 4)]
- assert list(m.IntPairs([(1, 2), (2, 0), (0, 3), (4, 5)]).nonzero()) == [(1, 2)]
- assert list(m.IntPairs([(0, 3), (1, 2), (3, 4)]).nonzero()) == []
-
- assert list(m.IntPairs([(1, 2), (3, 4), (0, 5)]).nonzero_keys()) == [1, 3]
- assert list(m.IntPairs([(1, 2), (2, 0), (0, 3), (4, 5)]).nonzero_keys()) == [1]
- assert list(m.IntPairs([(0, 3), (1, 2), (3, 4)]).nonzero_keys()) == []
-
- # __next__ must continue to raise StopIteration
- it = m.IntPairs([(0, 0)]).nonzero()
- for _ in range(3):
- with pytest.raises(StopIteration):
- next(it)
-
- it = m.IntPairs([(0, 0)]).nonzero_keys()
- for _ in range(3):
- with pytest.raises(StopIteration):
- next(it)
-
-
-def test_sliceable():
- sliceable = m.Sliceable(100)
- assert sliceable[::] == (0, 100, 1)
- assert sliceable[10::] == (10, 100, 1)
- assert sliceable[:10:] == (0, 10, 1)
- assert sliceable[::10] == (0, 100, 10)
- assert sliceable[-10::] == (90, 100, 1)
- assert sliceable[:-10:] == (0, 90, 1)
- assert sliceable[::-10] == (99, -1, -10)
- assert sliceable[50:60:1] == (50, 60, 1)
- assert sliceable[50:60:-1] == (50, 60, -1)
-
-
-def test_sequence():
- cstats = ConstructorStats.get(m.Sequence)
-
- s = m.Sequence(5)
- assert cstats.values() == ["of size", "5"]
-
- assert "Sequence" in repr(s)
- assert len(s) == 5
- assert s[0] == 0 and s[3] == 0
- assert 12.34 not in s
- s[0], s[3] = 12.34, 56.78
- assert 12.34 in s
- assert isclose(s[0], 12.34) and isclose(s[3], 56.78)
-
- rev = reversed(s)
- assert cstats.values() == ["of size", "5"]
-
- rev2 = s[::-1]
- assert cstats.values() == ["of size", "5"]
-
- it = iter(m.Sequence(0))
- for _ in range(3): # __next__ must continue to raise StopIteration
- with pytest.raises(StopIteration):
- next(it)
- assert cstats.values() == ["of size", "0"]
-
- expected = [0, 56.78, 0, 0, 12.34]
- assert allclose(rev, expected)
- assert allclose(rev2, expected)
- assert rev == rev2
-
- rev[0::2] = m.Sequence([2.0, 2.0, 2.0])
- assert cstats.values() == ["of size", "3", "from std::vector"]
-
- assert allclose(rev, [2, 56.78, 2, 0, 2])
-
- assert cstats.alive() == 4
- del it
- assert cstats.alive() == 3
- del s
- assert cstats.alive() == 2
- del rev
- assert cstats.alive() == 1
- del rev2
- assert cstats.alive() == 0
-
- assert cstats.values() == []
- assert cstats.default_constructions == 0
- assert cstats.copy_constructions == 0
- assert cstats.move_constructions >= 1
- assert cstats.copy_assignments == 0
- assert cstats.move_assignments == 0
-
-
-def test_sequence_length():
- """#2076: Exception raised by len(arg) should be propagated """
-
- class BadLen(RuntimeError):
- pass
-
- class SequenceLike:
- def __getitem__(self, i):
- return None
-
- def __len__(self):
- raise BadLen()
-
- with pytest.raises(BadLen):
- m.sequence_length(SequenceLike())
-
- assert m.sequence_length([1, 2, 3]) == 3
- assert m.sequence_length("hello") == 5
-
-
-def test_map_iterator():
- sm = m.StringMap({"hi": "bye", "black": "white"})
- assert sm["hi"] == "bye"
- assert len(sm) == 2
- assert sm["black"] == "white"
-
- with pytest.raises(KeyError):
- assert sm["orange"]
- sm["orange"] = "banana"
- assert sm["orange"] == "banana"
-
- expected = {"hi": "bye", "black": "white", "orange": "banana"}
- for k in sm:
- assert sm[k] == expected[k]
- for k, v in sm.items():
- assert v == expected[k]
-
- it = iter(m.StringMap({}))
- for _ in range(3): # __next__ must continue to raise StopIteration
- with pytest.raises(StopIteration):
- next(it)
-
-
-def test_python_iterator_in_cpp():
- t = (1, 2, 3)
- assert m.object_to_list(t) == [1, 2, 3]
- assert m.object_to_list(iter(t)) == [1, 2, 3]
- assert m.iterator_to_list(iter(t)) == [1, 2, 3]
-
- with pytest.raises(TypeError) as excinfo:
- m.object_to_list(1)
- assert "object is not iterable" in str(excinfo.value)
-
- with pytest.raises(TypeError) as excinfo:
- m.iterator_to_list(1)
- assert "incompatible function arguments" in str(excinfo.value)
-
- def bad_next_call():
- raise RuntimeError("py::iterator::advance() should propagate errors")
-
- with pytest.raises(RuntimeError) as excinfo:
- m.iterator_to_list(iter(bad_next_call, None))
- assert str(excinfo.value) == "py::iterator::advance() should propagate errors"
-
- lst = [1, None, 0, None]
- assert m.count_none(lst) == 2
- assert m.find_none(lst) is True
- assert m.count_nonzeros({"a": 0, "b": 1, "c": 2}) == 2
-
- r = range(5)
- assert all(m.tuple_iterator(tuple(r)))
- assert all(m.list_iterator(list(r)))
- assert all(m.sequence_iterator(r))
-
-
-def test_iterator_passthrough():
- """#181: iterator passthrough did not compile"""
- from pybind11_tests.sequences_and_iterators import iterator_passthrough
-
- values = [3, 5, 7, 9, 11, 13, 15]
- assert list(iterator_passthrough(iter(values))) == values
-
-
-def test_iterator_rvp():
- """#388: Can't make iterators via make_iterator() with different r/v policies """
- import pybind11_tests.sequences_and_iterators as m
-
- assert list(m.make_iterator_1()) == [1, 2, 3]
- assert list(m.make_iterator_2()) == [1, 2, 3]
- assert not isinstance(m.make_iterator_1(), type(m.make_iterator_2()))
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_smart_ptr.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_smart_ptr.cpp
deleted file mode 100644
index 60c2e692e578fc50fca4d95094dd88295fb61ca6..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_smart_ptr.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- tests/test_smart_ptr.cpp -- binding classes with custom reference counting,
- implicit conversions between types
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#if defined(_MSC_VER) && _MSC_VER < 1910
-# pragma warning(disable: 4702) // unreachable code in system header
-#endif
-
-#include "pybind11_tests.h"
-#include "object.h"
-
-// Make pybind aware of the ref-counted wrapper type (s):
-
-// ref<T> is a wrapper for 'Object' which uses intrusive reference counting
-// It is always possible to construct a ref<T> from an Object* pointer without
-// possible inconsistencies, hence the 'true' argument at the end.
-PYBIND11_DECLARE_HOLDER_TYPE(T, ref<T>, true);
-// Make pybind11 aware of the non-standard getter member function
-namespace pybind11 { namespace detail {
- template <typename T>
- struct holder_helper<ref<T>> {
- static const T *get(const ref<T> &p) { return p.get_ptr(); }
- };
-} // namespace detail
-} // namespace pybind11
-
-// The following is not required anymore for std::shared_ptr, but it should compile without error:
-PYBIND11_DECLARE_HOLDER_TYPE(T, std::shared_ptr<T>);
-
-// This is just a wrapper around unique_ptr, but with extra fields to deliberately bloat up the
-// holder size to trigger the non-simple-layout internal instance layout for single inheritance with
-// large holder type:
-template <typename T> class huge_unique_ptr {
- std::unique_ptr<T> ptr;
- uint64_t padding[10];
-public:
- huge_unique_ptr(T *p) : ptr(p) {};
- T *get() { return ptr.get(); }
-};
-PYBIND11_DECLARE_HOLDER_TYPE(T, huge_unique_ptr<T>);
-
-// Simple custom holder that works like unique_ptr
-template <typename T>
-class custom_unique_ptr {
- std::unique_ptr<T> impl;
-public:
- custom_unique_ptr(T* p) : impl(p) { }
- T* get() const { return impl.get(); }
- T* release_ptr() { return impl.release(); }
-};
-PYBIND11_DECLARE_HOLDER_TYPE(T, custom_unique_ptr<T>);
-
-// Simple custom holder that works like shared_ptr and has operator& overload
-// To obtain address of an instance of this holder pybind should use std::addressof
-// Attempt to get address via operator& may leads to segmentation fault
-template <typename T>
-class shared_ptr_with_addressof_operator {
- std::shared_ptr<T> impl;
-public:
- shared_ptr_with_addressof_operator( ) = default;
- shared_ptr_with_addressof_operator(T* p) : impl(p) { }
- T* get() const { return impl.get(); }
- T** operator&() { throw std::logic_error("Call of overloaded operator& is not expected"); }
-};
-PYBIND11_DECLARE_HOLDER_TYPE(T, shared_ptr_with_addressof_operator<T>);
-
-// Simple custom holder that works like unique_ptr and has operator& overload
-// To obtain address of an instance of this holder pybind should use std::addressof
-// Attempt to get address via operator& may leads to segmentation fault
-template <typename T>
-class unique_ptr_with_addressof_operator {
- std::unique_ptr<T> impl;
-public:
- unique_ptr_with_addressof_operator() = default;
- unique_ptr_with_addressof_operator(T* p) : impl(p) { }
- T* get() const { return impl.get(); }
- T* release_ptr() { return impl.release(); }
- T** operator&() { throw std::logic_error("Call of overloaded operator& is not expected"); }
-};
-PYBIND11_DECLARE_HOLDER_TYPE(T, unique_ptr_with_addressof_operator<T>);
-
-
-TEST_SUBMODULE(smart_ptr, m) {
-
- // test_smart_ptr
-
- // Object implementation in `object.h`
- py::class_<Object, ref<Object>> obj(m, "Object");
- obj.def("getRefCount", &Object::getRefCount);
-
- // Custom object with builtin reference counting (see 'object.h' for the implementation)
- class MyObject1 : public Object {
- public:
- MyObject1(int value) : value(value) { print_created(this, toString()); }
- std::string toString() const override { return "MyObject1[" + std::to_string(value) + "]"; }
- protected:
- ~MyObject1() override { print_destroyed(this); }
- private:
- int value;
- };
- py::class_<MyObject1, ref<MyObject1>>(m, "MyObject1", obj)
- .def(py::init<int>());
- py::implicitly_convertible<py::int_, MyObject1>();
-
- m.def("make_object_1", []() -> Object * { return new MyObject1(1); });
- m.def("make_object_2", []() -> ref<Object> { return new MyObject1(2); });
- m.def("make_myobject1_1", []() -> MyObject1 * { return new MyObject1(4); });
- m.def("make_myobject1_2", []() -> ref<MyObject1> { return new MyObject1(5); });
- m.def("print_object_1", [](const Object *obj) { py::print(obj->toString()); });
- m.def("print_object_2", [](ref<Object> obj) { py::print(obj->toString()); });
- m.def("print_object_3", [](const ref<Object> &obj) { py::print(obj->toString()); });
- m.def("print_object_4", [](const ref<Object> *obj) { py::print((*obj)->toString()); });
- m.def("print_myobject1_1", [](const MyObject1 *obj) { py::print(obj->toString()); });
- m.def("print_myobject1_2", [](ref<MyObject1> obj) { py::print(obj->toString()); });
- m.def("print_myobject1_3", [](const ref<MyObject1> &obj) { py::print(obj->toString()); });
- m.def("print_myobject1_4", [](const ref<MyObject1> *obj) { py::print((*obj)->toString()); });
-
- // Expose constructor stats for the ref type
- m.def("cstats_ref", &ConstructorStats::get<ref_tag>);
-
-
- // Object managed by a std::shared_ptr<>
- class MyObject2 {
- public:
- MyObject2(const MyObject2 &) = default;
- MyObject2(int value) : value(value) { print_created(this, toString()); }
- std::string toString() const { return "MyObject2[" + std::to_string(value) + "]"; }
- virtual ~MyObject2() { print_destroyed(this); }
- private:
- int value;
- };
- py::class_<MyObject2, std::shared_ptr<MyObject2>>(m, "MyObject2")
- .def(py::init<int>());
- m.def("make_myobject2_1", []() { return new MyObject2(6); });
- m.def("make_myobject2_2", []() { return std::make_shared<MyObject2>(7); });
- m.def("print_myobject2_1", [](const MyObject2 *obj) { py::print(obj->toString()); });
- m.def("print_myobject2_2", [](std::shared_ptr<MyObject2> obj) { py::print(obj->toString()); });
- m.def("print_myobject2_3", [](const std::shared_ptr<MyObject2> &obj) { py::print(obj->toString()); });
- m.def("print_myobject2_4", [](const std::shared_ptr<MyObject2> *obj) { py::print((*obj)->toString()); });
-
- // Object managed by a std::shared_ptr<>, additionally derives from std::enable_shared_from_this<>
- class MyObject3 : public std::enable_shared_from_this<MyObject3> {
- public:
- MyObject3(const MyObject3 &) = default;
- MyObject3(int value) : value(value) { print_created(this, toString()); }
- std::string toString() const { return "MyObject3[" + std::to_string(value) + "]"; }
- virtual ~MyObject3() { print_destroyed(this); }
- private:
- int value;
- };
- py::class_<MyObject3, std::shared_ptr<MyObject3>>(m, "MyObject3")
- .def(py::init<int>());
- m.def("make_myobject3_1", []() { return new MyObject3(8); });
- m.def("make_myobject3_2", []() { return std::make_shared<MyObject3>(9); });
- m.def("print_myobject3_1", [](const MyObject3 *obj) { py::print(obj->toString()); });
- m.def("print_myobject3_2", [](std::shared_ptr<MyObject3> obj) { py::print(obj->toString()); });
- m.def("print_myobject3_3", [](const std::shared_ptr<MyObject3> &obj) { py::print(obj->toString()); });
- m.def("print_myobject3_4", [](const std::shared_ptr<MyObject3> *obj) { py::print((*obj)->toString()); });
-
- // test_smart_ptr_refcounting
- m.def("test_object1_refcounting", []() {
- ref<MyObject1> o = new MyObject1(0);
- bool good = o->getRefCount() == 1;
- py::object o2 = py::cast(o, py::return_value_policy::reference);
- // always request (partial) ownership for objects with intrusive
- // reference counting even when using the 'reference' RVP
- good &= o->getRefCount() == 2;
- return good;
- });
-
- // test_unique_nodelete
- // Object with a private destructor
- class MyObject4 {
- public:
- MyObject4(int value) : value{value} { print_created(this); }
- int value;
- private:
- ~MyObject4() { print_destroyed(this); }
- };
- py::class_<MyObject4, std::unique_ptr<MyObject4, py::nodelete>>(m, "MyObject4")
- .def(py::init<int>())
- .def_readwrite("value", &MyObject4::value);
-
- // test_unique_deleter
- // Object with std::unique_ptr<T, D> where D is not matching the base class
- // Object with a protected destructor
- class MyObject4a {
- public:
- MyObject4a(int i) {
- value = i;
- print_created(this);
- };
- int value;
- protected:
- virtual ~MyObject4a() { print_destroyed(this); }
- };
- py::class_<MyObject4a, std::unique_ptr<MyObject4a, py::nodelete>>(m, "MyObject4a")
- .def(py::init<int>())
- .def_readwrite("value", &MyObject4a::value);
-
- // Object derived but with public destructor and no Deleter in default holder
- class MyObject4b : public MyObject4a {
- public:
- MyObject4b(int i) : MyObject4a(i) { print_created(this); }
- ~MyObject4b() override { print_destroyed(this); }
- };
- py::class_<MyObject4b, MyObject4a>(m, "MyObject4b")
- .def(py::init<int>());
-
- // test_large_holder
- class MyObject5 { // managed by huge_unique_ptr
- public:
- MyObject5(int value) : value{value} { print_created(this); }
- ~MyObject5() { print_destroyed(this); }
- int value;
- };
- py::class_<MyObject5, huge_unique_ptr<MyObject5>>(m, "MyObject5")
- .def(py::init<int>())
- .def_readwrite("value", &MyObject5::value);
-
- // test_shared_ptr_and_references
- struct SharedPtrRef {
- struct A {
- A() { print_created(this); }
- A(const A &) { print_copy_created(this); }
- A(A &&) { print_move_created(this); }
- ~A() { print_destroyed(this); }
- };
-
- A value = {};
- std::shared_ptr<A> shared = std::make_shared<A>();
- };
- using A = SharedPtrRef::A;
- py::class_<A, std::shared_ptr<A>>(m, "A");
- py::class_<SharedPtrRef>(m, "SharedPtrRef")
- .def(py::init<>())
- .def_readonly("ref", &SharedPtrRef::value)
- .def_property_readonly("copy", [](const SharedPtrRef &s) { return s.value; },
- py::return_value_policy::copy)
- .def_readonly("holder_ref", &SharedPtrRef::shared)
- .def_property_readonly("holder_copy", [](const SharedPtrRef &s) { return s.shared; },
- py::return_value_policy::copy)
- .def("set_ref", [](SharedPtrRef &, const A &) { return true; })
- .def("set_holder", [](SharedPtrRef &, std::shared_ptr<A>) { return true; });
-
- // test_shared_ptr_from_this_and_references
- struct SharedFromThisRef {
- struct B : std::enable_shared_from_this<B> {
- B() { print_created(this); }
- B(const B &) : std::enable_shared_from_this<B>() { print_copy_created(this); }
- B(B &&) : std::enable_shared_from_this<B>() { print_move_created(this); }
- ~B() { print_destroyed(this); }
- };
-
- B value = {};
- std::shared_ptr<B> shared = std::make_shared<B>();
- };
- using B = SharedFromThisRef::B;
- py::class_<B, std::shared_ptr<B>>(m, "B");
- py::class_<SharedFromThisRef>(m, "SharedFromThisRef")
- .def(py::init<>())
- .def_readonly("bad_wp", &SharedFromThisRef::value)
- .def_property_readonly("ref", [](const SharedFromThisRef &s) -> const B & { return *s.shared; })
- .def_property_readonly("copy", [](const SharedFromThisRef &s) { return s.value; },
- py::return_value_policy::copy)
- .def_readonly("holder_ref", &SharedFromThisRef::shared)
- .def_property_readonly("holder_copy", [](const SharedFromThisRef &s) { return s.shared; },
- py::return_value_policy::copy)
- .def("set_ref", [](SharedFromThisRef &, const B &) { return true; })
- .def("set_holder", [](SharedFromThisRef &, std::shared_ptr<B>) { return true; });
-
- // Issue #865: shared_from_this doesn't work with virtual inheritance
- struct SharedFromThisVBase : std::enable_shared_from_this<SharedFromThisVBase> {
- SharedFromThisVBase() = default;
- SharedFromThisVBase(const SharedFromThisVBase &) = default;
- virtual ~SharedFromThisVBase() = default;
- };
- struct SharedFromThisVirt : virtual SharedFromThisVBase {};
- static std::shared_ptr<SharedFromThisVirt> sft(new SharedFromThisVirt());
- py::class_<SharedFromThisVirt, std::shared_ptr<SharedFromThisVirt>>(m, "SharedFromThisVirt")
- .def_static("get", []() { return sft.get(); });
-
- // test_move_only_holder
- struct C {
- C() { print_created(this); }
- ~C() { print_destroyed(this); }
- };
- py::class_<C, custom_unique_ptr<C>>(m, "TypeWithMoveOnlyHolder")
- .def_static("make", []() { return custom_unique_ptr<C>(new C); })
- .def_static("make_as_object", []() { return py::cast(custom_unique_ptr<C>(new C)); });
-
- // test_holder_with_addressof_operator
- struct TypeForHolderWithAddressOf {
- TypeForHolderWithAddressOf() { print_created(this); }
- TypeForHolderWithAddressOf(const TypeForHolderWithAddressOf &) { print_copy_created(this); }
- TypeForHolderWithAddressOf(TypeForHolderWithAddressOf &&) { print_move_created(this); }
- ~TypeForHolderWithAddressOf() { print_destroyed(this); }
- std::string toString() const {
- return "TypeForHolderWithAddressOf[" + std::to_string(value) + "]";
- }
- int value = 42;
- };
- using HolderWithAddressOf = shared_ptr_with_addressof_operator<TypeForHolderWithAddressOf>;
- py::class_<TypeForHolderWithAddressOf, HolderWithAddressOf>(m, "TypeForHolderWithAddressOf")
- .def_static("make", []() { return HolderWithAddressOf(new TypeForHolderWithAddressOf); })
- .def("get", [](const HolderWithAddressOf &self) { return self.get(); })
- .def("print_object_1", [](const TypeForHolderWithAddressOf *obj) { py::print(obj->toString()); })
- .def("print_object_2", [](HolderWithAddressOf obj) { py::print(obj.get()->toString()); })
- .def("print_object_3", [](const HolderWithAddressOf &obj) { py::print(obj.get()->toString()); })
- .def("print_object_4", [](const HolderWithAddressOf *obj) { py::print((*obj).get()->toString()); });
-
- // test_move_only_holder_with_addressof_operator
- struct TypeForMoveOnlyHolderWithAddressOf {
- TypeForMoveOnlyHolderWithAddressOf(int value) : value{value} { print_created(this); }
- ~TypeForMoveOnlyHolderWithAddressOf() { print_destroyed(this); }
- std::string toString() const {
- return "MoveOnlyHolderWithAddressOf[" + std::to_string(value) + "]";
- }
- int value;
- };
- using MoveOnlyHolderWithAddressOf = unique_ptr_with_addressof_operator<TypeForMoveOnlyHolderWithAddressOf>;
- py::class_<TypeForMoveOnlyHolderWithAddressOf, MoveOnlyHolderWithAddressOf>(m, "TypeForMoveOnlyHolderWithAddressOf")
- .def_static("make", []() { return MoveOnlyHolderWithAddressOf(new TypeForMoveOnlyHolderWithAddressOf(0)); })
- .def_readwrite("value", &TypeForMoveOnlyHolderWithAddressOf::value)
- .def("print_object", [](const TypeForMoveOnlyHolderWithAddressOf *obj) { py::print(obj->toString()); });
-
- // test_smart_ptr_from_default
- struct HeldByDefaultHolder { };
- py::class_<HeldByDefaultHolder>(m, "HeldByDefaultHolder")
- .def(py::init<>())
- .def_static("load_shared_ptr", [](std::shared_ptr<HeldByDefaultHolder>) {});
-
- // test_shared_ptr_gc
- // #187: issue involving std::shared_ptr<> return value policy & garbage collection
- struct ElementBase {
- virtual ~ElementBase() = default; /* Force creation of virtual table */
- ElementBase() = default;
- ElementBase(const ElementBase&) = delete;
- };
- py::class_<ElementBase, std::shared_ptr<ElementBase>>(m, "ElementBase");
-
- struct ElementA : ElementBase {
- ElementA(int v) : v(v) { }
- int value() { return v; }
- int v;
- };
- py::class_<ElementA, ElementBase, std::shared_ptr<ElementA>>(m, "ElementA")
- .def(py::init<int>())
- .def("value", &ElementA::value);
-
- struct ElementList {
- void add(std::shared_ptr<ElementBase> e) { l.push_back(e); }
- std::vector<std::shared_ptr<ElementBase>> l;
- };
- py::class_<ElementList, std::shared_ptr<ElementList>>(m, "ElementList")
- .def(py::init<>())
- .def("add", &ElementList::add)
- .def("get", [](ElementList &el) {
- py::list list;
- for (auto &e : el.l)
- list.append(py::cast(e));
- return list;
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_smart_ptr.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_smart_ptr.py
deleted file mode 100644
index c55bffba07df6e167f29be39eecaa3798243e8c3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_smart_ptr.py
+++ /dev/null
@@ -1,310 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-m = pytest.importorskip("pybind11_tests.smart_ptr")
-from pybind11_tests import ConstructorStats # noqa: E402
-
-
-def test_smart_ptr(capture):
- # Object1
- for i, o in enumerate(
- [m.make_object_1(), m.make_object_2(), m.MyObject1(3)], start=1
- ):
- assert o.getRefCount() == 1
- with capture:
- m.print_object_1(o)
- m.print_object_2(o)
- m.print_object_3(o)
- m.print_object_4(o)
- assert capture == "MyObject1[{i}]\n".format(i=i) * 4
-
- for i, o in enumerate(
- [m.make_myobject1_1(), m.make_myobject1_2(), m.MyObject1(6), 7], start=4
- ):
- print(o)
- with capture:
- if not isinstance(o, int):
- m.print_object_1(o)
- m.print_object_2(o)
- m.print_object_3(o)
- m.print_object_4(o)
- m.print_myobject1_1(o)
- m.print_myobject1_2(o)
- m.print_myobject1_3(o)
- m.print_myobject1_4(o)
-
- times = 4 if isinstance(o, int) else 8
- assert capture == "MyObject1[{i}]\n".format(i=i) * times
-
- cstats = ConstructorStats.get(m.MyObject1)
- assert cstats.alive() == 0
- expected_values = ["MyObject1[{}]".format(i) for i in range(1, 7)] + [
- "MyObject1[7]"
- ] * 4
- assert cstats.values() == expected_values
- assert cstats.default_constructions == 0
- assert cstats.copy_constructions == 0
- # assert cstats.move_constructions >= 0 # Doesn't invoke any
- assert cstats.copy_assignments == 0
- assert cstats.move_assignments == 0
-
- # Object2
- for i, o in zip(
- [8, 6, 7], [m.MyObject2(8), m.make_myobject2_1(), m.make_myobject2_2()]
- ):
- print(o)
- with capture:
- m.print_myobject2_1(o)
- m.print_myobject2_2(o)
- m.print_myobject2_3(o)
- m.print_myobject2_4(o)
- assert capture == "MyObject2[{i}]\n".format(i=i) * 4
-
- cstats = ConstructorStats.get(m.MyObject2)
- assert cstats.alive() == 1
- o = None
- assert cstats.alive() == 0
- assert cstats.values() == ["MyObject2[8]", "MyObject2[6]", "MyObject2[7]"]
- assert cstats.default_constructions == 0
- assert cstats.copy_constructions == 0
- # assert cstats.move_constructions >= 0 # Doesn't invoke any
- assert cstats.copy_assignments == 0
- assert cstats.move_assignments == 0
-
- # Object3
- for i, o in zip(
- [9, 8, 9], [m.MyObject3(9), m.make_myobject3_1(), m.make_myobject3_2()]
- ):
- print(o)
- with capture:
- m.print_myobject3_1(o)
- m.print_myobject3_2(o)
- m.print_myobject3_3(o)
- m.print_myobject3_4(o)
- assert capture == "MyObject3[{i}]\n".format(i=i) * 4
-
- cstats = ConstructorStats.get(m.MyObject3)
- assert cstats.alive() == 1
- o = None
- assert cstats.alive() == 0
- assert cstats.values() == ["MyObject3[9]", "MyObject3[8]", "MyObject3[9]"]
- assert cstats.default_constructions == 0
- assert cstats.copy_constructions == 0
- # assert cstats.move_constructions >= 0 # Doesn't invoke any
- assert cstats.copy_assignments == 0
- assert cstats.move_assignments == 0
-
- # Object
- cstats = ConstructorStats.get(m.Object)
- assert cstats.alive() == 0
- assert cstats.values() == []
- assert cstats.default_constructions == 10
- assert cstats.copy_constructions == 0
- # assert cstats.move_constructions >= 0 # Doesn't invoke any
- assert cstats.copy_assignments == 0
- assert cstats.move_assignments == 0
-
- # ref<>
- cstats = m.cstats_ref()
- assert cstats.alive() == 0
- assert cstats.values() == ["from pointer"] * 10
- assert cstats.default_constructions == 30
- assert cstats.copy_constructions == 12
- # assert cstats.move_constructions >= 0 # Doesn't invoke any
- assert cstats.copy_assignments == 30
- assert cstats.move_assignments == 0
-
-
-def test_smart_ptr_refcounting():
- assert m.test_object1_refcounting()
-
-
-def test_unique_nodelete():
- o = m.MyObject4(23)
- assert o.value == 23
- cstats = ConstructorStats.get(m.MyObject4)
- assert cstats.alive() == 1
- del o
- assert cstats.alive() == 1 # Leak, but that's intentional
-
-
-def test_unique_nodelete4a():
- o = m.MyObject4a(23)
- assert o.value == 23
- cstats = ConstructorStats.get(m.MyObject4a)
- assert cstats.alive() == 1
- del o
- assert cstats.alive() == 1 # Leak, but that's intentional
-
-
-def test_unique_deleter():
- o = m.MyObject4b(23)
- assert o.value == 23
- cstats4a = ConstructorStats.get(m.MyObject4a)
- assert cstats4a.alive() == 2 # Two because of previous test
- cstats4b = ConstructorStats.get(m.MyObject4b)
- assert cstats4b.alive() == 1
- del o
- assert cstats4a.alive() == 1 # Should now only be one leftover from previous test
- assert cstats4b.alive() == 0 # Should be deleted
-
-
-def test_large_holder():
- o = m.MyObject5(5)
- assert o.value == 5
- cstats = ConstructorStats.get(m.MyObject5)
- assert cstats.alive() == 1
- del o
- assert cstats.alive() == 0
-
-
-def test_shared_ptr_and_references():
- s = m.SharedPtrRef()
- stats = ConstructorStats.get(m.A)
- assert stats.alive() == 2
-
- ref = s.ref # init_holder_helper(holder_ptr=false, owned=false)
- assert stats.alive() == 2
- assert s.set_ref(ref)
- with pytest.raises(RuntimeError) as excinfo:
- assert s.set_holder(ref)
- assert "Unable to cast from non-held to held instance" in str(excinfo.value)
-
- copy = s.copy # init_holder_helper(holder_ptr=false, owned=true)
- assert stats.alive() == 3
- assert s.set_ref(copy)
- assert s.set_holder(copy)
-
- holder_ref = s.holder_ref # init_holder_helper(holder_ptr=true, owned=false)
- assert stats.alive() == 3
- assert s.set_ref(holder_ref)
- assert s.set_holder(holder_ref)
-
- holder_copy = s.holder_copy # init_holder_helper(holder_ptr=true, owned=true)
- assert stats.alive() == 3
- assert s.set_ref(holder_copy)
- assert s.set_holder(holder_copy)
-
- del ref, copy, holder_ref, holder_copy, s
- assert stats.alive() == 0
-
-
-def test_shared_ptr_from_this_and_references():
- s = m.SharedFromThisRef()
- stats = ConstructorStats.get(m.B)
- assert stats.alive() == 2
-
- ref = s.ref # init_holder_helper(holder_ptr=false, owned=false, bad_wp=false)
- assert stats.alive() == 2
- assert s.set_ref(ref)
- assert s.set_holder(
- ref
- ) # std::enable_shared_from_this can create a holder from a reference
-
- bad_wp = s.bad_wp # init_holder_helper(holder_ptr=false, owned=false, bad_wp=true)
- assert stats.alive() == 2
- assert s.set_ref(bad_wp)
- with pytest.raises(RuntimeError) as excinfo:
- assert s.set_holder(bad_wp)
- assert "Unable to cast from non-held to held instance" in str(excinfo.value)
-
- copy = s.copy # init_holder_helper(holder_ptr=false, owned=true, bad_wp=false)
- assert stats.alive() == 3
- assert s.set_ref(copy)
- assert s.set_holder(copy)
-
- holder_ref = (
- s.holder_ref
- ) # init_holder_helper(holder_ptr=true, owned=false, bad_wp=false)
- assert stats.alive() == 3
- assert s.set_ref(holder_ref)
- assert s.set_holder(holder_ref)
-
- holder_copy = (
- s.holder_copy
- ) # init_holder_helper(holder_ptr=true, owned=true, bad_wp=false)
- assert stats.alive() == 3
- assert s.set_ref(holder_copy)
- assert s.set_holder(holder_copy)
-
- del ref, bad_wp, copy, holder_ref, holder_copy, s
- assert stats.alive() == 0
-
- z = m.SharedFromThisVirt.get()
- y = m.SharedFromThisVirt.get()
- assert y is z
-
-
-def test_move_only_holder():
- a = m.TypeWithMoveOnlyHolder.make()
- b = m.TypeWithMoveOnlyHolder.make_as_object()
- stats = ConstructorStats.get(m.TypeWithMoveOnlyHolder)
- assert stats.alive() == 2
- del b
- assert stats.alive() == 1
- del a
- assert stats.alive() == 0
-
-
-def test_holder_with_addressof_operator():
- # this test must not throw exception from c++
- a = m.TypeForHolderWithAddressOf.make()
- a.print_object_1()
- a.print_object_2()
- a.print_object_3()
- a.print_object_4()
-
- stats = ConstructorStats.get(m.TypeForHolderWithAddressOf)
- assert stats.alive() == 1
-
- np = m.TypeForHolderWithAddressOf.make()
- assert stats.alive() == 2
- del a
- assert stats.alive() == 1
- del np
- assert stats.alive() == 0
-
- b = m.TypeForHolderWithAddressOf.make()
- c = b
- assert b.get() is c.get()
- assert stats.alive() == 1
-
- del b
- assert stats.alive() == 1
-
- del c
- assert stats.alive() == 0
-
-
-def test_move_only_holder_with_addressof_operator():
- a = m.TypeForMoveOnlyHolderWithAddressOf.make()
- a.print_object()
-
- stats = ConstructorStats.get(m.TypeForMoveOnlyHolderWithAddressOf)
- assert stats.alive() == 1
-
- a.value = 42
- assert a.value == 42
-
- del a
- assert stats.alive() == 0
-
-
-def test_smart_ptr_from_default():
- instance = m.HeldByDefaultHolder()
- with pytest.raises(RuntimeError) as excinfo:
- m.HeldByDefaultHolder.load_shared_ptr(instance)
- assert (
- "Unable to load a custom holder type from a "
- "default-holder instance" in str(excinfo.value)
- )
-
-
-def test_shared_ptr_gc():
- """#187: issue involving std::shared_ptr<> return value policy & garbage collection"""
- el = m.ElementList()
- for i in range(10):
- el.add(m.ElementA(i))
- pytest.gc_collect()
- for i, v in enumerate(el.get()):
- assert i == v.value()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl.cpp
deleted file mode 100644
index 0590162770ecb004fd3208141b9dbda88e45a9f5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- tests/test_stl.cpp -- STL type casters
-
- Copyright (c) 2017 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <pybind11/stl.h>
-
-#include <vector>
-#include <string>
-
-// Test with `std::variant` in C++17 mode, or with `boost::variant` in C++11/14
-#if defined(PYBIND11_HAS_VARIANT)
-using std::variant;
-#elif defined(PYBIND11_TEST_BOOST) && (!defined(_MSC_VER) || _MSC_VER >= 1910)
-# include <boost/variant.hpp>
-# define PYBIND11_HAS_VARIANT 1
-using boost::variant;
-
-namespace pybind11 { namespace detail {
-template <typename... Ts>
-struct type_caster<boost::variant<Ts...>> : variant_caster<boost::variant<Ts...>> {};
-
-template <>
-struct visit_helper<boost::variant> {
- template <typename... Args>
- static auto call(Args &&...args) -> decltype(boost::apply_visitor(args...)) {
- return boost::apply_visitor(args...);
- }
-};
-}} // namespace pybind11::detail
-#endif
-
-PYBIND11_MAKE_OPAQUE(std::vector<std::string, std::allocator<std::string>>);
-
-/// Issue #528: templated constructor
-struct TplCtorClass {
- template <typename T> TplCtorClass(const T &) { }
- bool operator==(const TplCtorClass &) const { return true; }
-};
-
-namespace std {
- template <>
- struct hash<TplCtorClass> { size_t operator()(const TplCtorClass &) const { return 0; } };
-} // namespace std
-
-
-template <template <typename> class OptionalImpl, typename T>
-struct OptionalHolder
-{
- OptionalHolder() = default;
- bool member_initialized() const {
- return member && member->initialized;
- }
- OptionalImpl<T> member = T{};
-};
-
-
-TEST_SUBMODULE(stl, m) {
- // test_vector
- m.def("cast_vector", []() { return std::vector<int>{1}; });
- m.def("load_vector", [](const std::vector<int> &v) { return v.at(0) == 1 && v.at(1) == 2; });
- // `std::vector<bool>` is special because it returns proxy objects instead of references
- m.def("cast_bool_vector", []() { return std::vector<bool>{true, false}; });
- m.def("load_bool_vector", [](const std::vector<bool> &v) {
- return v.at(0) == true && v.at(1) == false;
- });
- // Unnumbered regression (caused by #936): pointers to stl containers aren't castable
- static std::vector<RValueCaster> lvv{2};
- m.def("cast_ptr_vector", []() { return &lvv; });
-
- // test_deque
- m.def("cast_deque", []() { return std::deque<int>{1}; });
- m.def("load_deque", [](const std::deque<int> &v) { return v.at(0) == 1 && v.at(1) == 2; });
-
- // test_array
- m.def("cast_array", []() { return std::array<int, 2> {{1 , 2}}; });
- m.def("load_array", [](const std::array<int, 2> &a) { return a[0] == 1 && a[1] == 2; });
-
- // test_valarray
- m.def("cast_valarray", []() { return std::valarray<int>{1, 4, 9}; });
- m.def("load_valarray", [](const std::valarray<int>& v) {
- return v.size() == 3 && v[0] == 1 && v[1] == 4 && v[2] == 9;
- });
-
- // test_map
- m.def("cast_map", []() { return std::map<std::string, std::string>{{"key", "value"}}; });
- m.def("load_map", [](const std::map<std::string, std::string> &map) {
- return map.at("key") == "value" && map.at("key2") == "value2";
- });
-
- // test_set
- m.def("cast_set", []() { return std::set<std::string>{"key1", "key2"}; });
- m.def("load_set", [](const std::set<std::string> &set) {
- return set.count("key1") && set.count("key2") && set.count("key3");
- });
-
- // test_recursive_casting
- m.def("cast_rv_vector", []() { return std::vector<RValueCaster>{2}; });
- m.def("cast_rv_array", []() { return std::array<RValueCaster, 3>(); });
- // NB: map and set keys are `const`, so while we technically do move them (as `const Type &&`),
- // casters don't typically do anything with that, which means they fall to the `const Type &`
- // caster.
- m.def("cast_rv_map", []() { return std::unordered_map<std::string, RValueCaster>{{"a", RValueCaster{}}}; });
- m.def("cast_rv_nested", []() {
- std::vector<std::array<std::list<std::unordered_map<std::string, RValueCaster>>, 2>> v;
- v.emplace_back(); // add an array
- v.back()[0].emplace_back(); // add a map to the array
- v.back()[0].back().emplace("b", RValueCaster{});
- v.back()[0].back().emplace("c", RValueCaster{});
- v.back()[1].emplace_back(); // add a map to the array
- v.back()[1].back().emplace("a", RValueCaster{});
- return v;
- });
- static std::array<RValueCaster, 2> lva;
- static std::unordered_map<std::string, RValueCaster> lvm{{"a", RValueCaster{}}, {"b", RValueCaster{}}};
- static std::unordered_map<std::string, std::vector<std::list<std::array<RValueCaster, 2>>>> lvn;
- lvn["a"].emplace_back(); // add a list
- lvn["a"].back().emplace_back(); // add an array
- lvn["a"].emplace_back(); // another list
- lvn["a"].back().emplace_back(); // add an array
- lvn["b"].emplace_back(); // add a list
- lvn["b"].back().emplace_back(); // add an array
- lvn["b"].back().emplace_back(); // add another array
- m.def("cast_lv_vector", []() -> const decltype(lvv) & { return lvv; });
- m.def("cast_lv_array", []() -> const decltype(lva) & { return lva; });
- m.def("cast_lv_map", []() -> const decltype(lvm) & { return lvm; });
- m.def("cast_lv_nested", []() -> const decltype(lvn) & { return lvn; });
- // #853:
- m.def("cast_unique_ptr_vector", []() {
- std::vector<std::unique_ptr<UserType>> v;
- v.emplace_back(new UserType{7});
- v.emplace_back(new UserType{42});
- return v;
- });
-
- // test_move_out_container
- struct MoveOutContainer {
- struct Value { int value; };
- std::list<Value> move_list() const { return {{0}, {1}, {2}}; }
- };
- py::class_<MoveOutContainer::Value>(m, "MoveOutContainerValue")
- .def_readonly("value", &MoveOutContainer::Value::value);
- py::class_<MoveOutContainer>(m, "MoveOutContainer")
- .def(py::init<>())
- .def_property_readonly("move_list", &MoveOutContainer::move_list);
-
- // Class that can be move- and copy-constructed, but not assigned
- struct NoAssign {
- int value;
-
- explicit NoAssign(int value = 0) : value(value) { }
- NoAssign(const NoAssign &) = default;
- NoAssign(NoAssign &&) = default;
-
- NoAssign &operator=(const NoAssign &) = delete;
- NoAssign &operator=(NoAssign &&) = delete;
- };
- py::class_<NoAssign>(m, "NoAssign", "Class with no C++ assignment operators")
- .def(py::init<>())
- .def(py::init<int>());
-
-
- struct MoveOutDetector
- {
- MoveOutDetector() = default;
- MoveOutDetector(const MoveOutDetector&) = default;
- MoveOutDetector(MoveOutDetector&& other) noexcept
- : initialized(other.initialized) {
- // steal underlying resource
- other.initialized = false;
- }
- bool initialized = true;
- };
- py::class_<MoveOutDetector>(m, "MoveOutDetector", "Class with move tracking")
- .def(py::init<>())
- .def_readonly("initialized", &MoveOutDetector::initialized);
-
-
-#ifdef PYBIND11_HAS_OPTIONAL
- // test_optional
- m.attr("has_optional") = true;
-
- using opt_int = std::optional<int>;
- using opt_no_assign = std::optional<NoAssign>;
- m.def("double_or_zero", [](const opt_int& x) -> int {
- return x.value_or(0) * 2;
- });
- m.def("half_or_none", [](int x) -> opt_int {
- return x ? opt_int(x / 2) : opt_int();
- });
- m.def("test_nullopt", [](opt_int x) {
- return x.value_or(42);
- }, py::arg_v("x", std::nullopt, "None"));
- m.def("test_no_assign", [](const opt_no_assign &x) {
- return x ? x->value : 42;
- }, py::arg_v("x", std::nullopt, "None"));
-
- m.def("nodefer_none_optional", [](std::optional<int>) { return true; });
- m.def("nodefer_none_optional", [](py::none) { return false; });
-
- using opt_holder = OptionalHolder<std::optional, MoveOutDetector>;
- py::class_<opt_holder>(m, "OptionalHolder", "Class with optional member")
- .def(py::init<>())
- .def_readonly("member", &opt_holder::member)
- .def("member_initialized", &opt_holder::member_initialized);
-#endif
-
-#ifdef PYBIND11_HAS_EXP_OPTIONAL
- // test_exp_optional
- m.attr("has_exp_optional") = true;
-
- using exp_opt_int = std::experimental::optional<int>;
- using exp_opt_no_assign = std::experimental::optional<NoAssign>;
- m.def("double_or_zero_exp", [](const exp_opt_int& x) -> int {
- return x.value_or(0) * 2;
- });
- m.def("half_or_none_exp", [](int x) -> exp_opt_int {
- return x ? exp_opt_int(x / 2) : exp_opt_int();
- });
- m.def("test_nullopt_exp", [](exp_opt_int x) {
- return x.value_or(42);
- }, py::arg_v("x", std::experimental::nullopt, "None"));
- m.def("test_no_assign_exp", [](const exp_opt_no_assign &x) {
- return x ? x->value : 42;
- }, py::arg_v("x", std::experimental::nullopt, "None"));
-
- using opt_exp_holder = OptionalHolder<std::experimental::optional, MoveOutDetector>;
- py::class_<opt_exp_holder>(m, "OptionalExpHolder", "Class with optional member")
- .def(py::init<>())
- .def_readonly("member", &opt_exp_holder::member)
- .def("member_initialized", &opt_exp_holder::member_initialized);
-#endif
-
-#ifdef PYBIND11_HAS_VARIANT
- static_assert(std::is_same<py::detail::variant_caster_visitor::result_type, py::handle>::value,
- "visitor::result_type is required by boost::variant in C++11 mode");
-
- struct visitor {
- using result_type = const char *;
-
- result_type operator()(int) { return "int"; }
- result_type operator()(std::string) { return "std::string"; }
- result_type operator()(double) { return "double"; }
- result_type operator()(std::nullptr_t) { return "std::nullptr_t"; }
- };
-
- // test_variant
- m.def("load_variant", [](variant<int, std::string, double, std::nullptr_t> v) {
- return py::detail::visit_helper<variant>::call(visitor(), v);
- });
- m.def("load_variant_2pass", [](variant<double, int> v) {
- return py::detail::visit_helper<variant>::call(visitor(), v);
- });
- m.def("cast_variant", []() {
- using V = variant<int, std::string>;
- return py::make_tuple(V(5), V("Hello"));
- });
-#endif
-
- // #528: templated constructor
- // (no python tests: the test here is that this compiles)
- m.def("tpl_ctor_vector", [](std::vector<TplCtorClass> &) {});
- m.def("tpl_ctor_map", [](std::unordered_map<TplCtorClass, TplCtorClass> &) {});
- m.def("tpl_ctor_set", [](std::unordered_set<TplCtorClass> &) {});
-#if defined(PYBIND11_HAS_OPTIONAL)
- m.def("tpl_constr_optional", [](std::optional<TplCtorClass> &) {});
-#elif defined(PYBIND11_HAS_EXP_OPTIONAL)
- m.def("tpl_constr_optional", [](std::experimental::optional<TplCtorClass> &) {});
-#endif
-
- // test_vec_of_reference_wrapper
- // #171: Can't return STL structures containing reference wrapper
- m.def("return_vec_of_reference_wrapper", [](std::reference_wrapper<UserType> p4) {
- static UserType p1{1}, p2{2}, p3{3};
- return std::vector<std::reference_wrapper<UserType>> {
- std::ref(p1), std::ref(p2), std::ref(p3), p4
- };
- });
-
- // test_stl_pass_by_pointer
- m.def("stl_pass_by_pointer", [](std::vector<int>* v) { return *v; }, "v"_a=nullptr);
-
- // #1258: pybind11/stl.h converts string to vector<string>
- m.def("func_with_string_or_vector_string_arg_overload", [](std::vector<std::string>) { return 1; });
- m.def("func_with_string_or_vector_string_arg_overload", [](std::list<std::string>) { return 2; });
- m.def("func_with_string_or_vector_string_arg_overload", [](std::string) { return 3; });
-
- class Placeholder {
- public:
- Placeholder() { print_created(this); }
- Placeholder(const Placeholder &) = delete;
- ~Placeholder() { print_destroyed(this); }
- };
- py::class_<Placeholder>(m, "Placeholder");
-
- /// test_stl_vector_ownership
- m.def("test_stl_ownership",
- []() {
- std::vector<Placeholder *> result;
- result.push_back(new Placeholder());
- return result;
- },
- py::return_value_policy::take_ownership);
-
- m.def("array_cast_sequence", [](std::array<int, 3> x) { return x; });
-
- /// test_issue_1561
- struct Issue1561Inner { std::string data; };
- struct Issue1561Outer { std::vector<Issue1561Inner> list; };
-
- py::class_<Issue1561Inner>(m, "Issue1561Inner")
- .def(py::init<std::string>())
- .def_readwrite("data", &Issue1561Inner::data);
-
- py::class_<Issue1561Outer>(m, "Issue1561Outer")
- .def(py::init<>())
- .def_readwrite("list", &Issue1561Outer::list);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl.py
deleted file mode 100644
index 330017544de22232a9a929903e9062e94dafd71a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl.py
+++ /dev/null
@@ -1,266 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-from pybind11_tests import stl as m
-from pybind11_tests import UserType
-from pybind11_tests import ConstructorStats
-
-
-def test_vector(doc):
- """std::vector <-> list"""
- lst = m.cast_vector()
- assert lst == [1]
- lst.append(2)
- assert m.load_vector(lst)
- assert m.load_vector(tuple(lst))
-
- assert m.cast_bool_vector() == [True, False]
- assert m.load_bool_vector([True, False])
-
- assert doc(m.cast_vector) == "cast_vector() -> List[int]"
- assert doc(m.load_vector) == "load_vector(arg0: List[int]) -> bool"
-
- # Test regression caused by 936: pointers to stl containers weren't castable
- assert m.cast_ptr_vector() == ["lvalue", "lvalue"]
-
-
-def test_deque(doc):
- """std::deque <-> list"""
- lst = m.cast_deque()
- assert lst == [1]
- lst.append(2)
- assert m.load_deque(lst)
- assert m.load_deque(tuple(lst))
-
-
-def test_array(doc):
- """std::array <-> list"""
- lst = m.cast_array()
- assert lst == [1, 2]
- assert m.load_array(lst)
-
- assert doc(m.cast_array) == "cast_array() -> List[int[2]]"
- assert doc(m.load_array) == "load_array(arg0: List[int[2]]) -> bool"
-
-
-def test_valarray(doc):
- """std::valarray <-> list"""
- lst = m.cast_valarray()
- assert lst == [1, 4, 9]
- assert m.load_valarray(lst)
-
- assert doc(m.cast_valarray) == "cast_valarray() -> List[int]"
- assert doc(m.load_valarray) == "load_valarray(arg0: List[int]) -> bool"
-
-
-def test_map(doc):
- """std::map <-> dict"""
- d = m.cast_map()
- assert d == {"key": "value"}
- assert "key" in d
- d["key2"] = "value2"
- assert "key2" in d
- assert m.load_map(d)
-
- assert doc(m.cast_map) == "cast_map() -> Dict[str, str]"
- assert doc(m.load_map) == "load_map(arg0: Dict[str, str]) -> bool"
-
-
-def test_set(doc):
- """std::set <-> set"""
- s = m.cast_set()
- assert s == {"key1", "key2"}
- s.add("key3")
- assert m.load_set(s)
-
- assert doc(m.cast_set) == "cast_set() -> Set[str]"
- assert doc(m.load_set) == "load_set(arg0: Set[str]) -> bool"
-
-
-def test_recursive_casting():
- """Tests that stl casters preserve lvalue/rvalue context for container values"""
- assert m.cast_rv_vector() == ["rvalue", "rvalue"]
- assert m.cast_lv_vector() == ["lvalue", "lvalue"]
- assert m.cast_rv_array() == ["rvalue", "rvalue", "rvalue"]
- assert m.cast_lv_array() == ["lvalue", "lvalue"]
- assert m.cast_rv_map() == {"a": "rvalue"}
- assert m.cast_lv_map() == {"a": "lvalue", "b": "lvalue"}
- assert m.cast_rv_nested() == [[[{"b": "rvalue", "c": "rvalue"}], [{"a": "rvalue"}]]]
- assert m.cast_lv_nested() == {
- "a": [[["lvalue", "lvalue"]], [["lvalue", "lvalue"]]],
- "b": [[["lvalue", "lvalue"], ["lvalue", "lvalue"]]],
- }
-
- # Issue #853 test case:
- z = m.cast_unique_ptr_vector()
- assert z[0].value == 7 and z[1].value == 42
-
-
-def test_move_out_container():
- """Properties use the `reference_internal` policy by default. If the underlying function
- returns an rvalue, the policy is automatically changed to `move` to avoid referencing
- a temporary. In case the return value is a container of user-defined types, the policy
- also needs to be applied to the elements, not just the container."""
- c = m.MoveOutContainer()
- moved_out_list = c.move_list
- assert [x.value for x in moved_out_list] == [0, 1, 2]
-
-
-@pytest.mark.skipif(not hasattr(m, "has_optional"), reason="no <optional>")
-def test_optional():
- assert m.double_or_zero(None) == 0
- assert m.double_or_zero(42) == 84
- pytest.raises(TypeError, m.double_or_zero, "foo")
-
- assert m.half_or_none(0) is None
- assert m.half_or_none(42) == 21
- pytest.raises(TypeError, m.half_or_none, "foo")
-
- assert m.test_nullopt() == 42
- assert m.test_nullopt(None) == 42
- assert m.test_nullopt(42) == 42
- assert m.test_nullopt(43) == 43
-
- assert m.test_no_assign() == 42
- assert m.test_no_assign(None) == 42
- assert m.test_no_assign(m.NoAssign(43)) == 43
- pytest.raises(TypeError, m.test_no_assign, 43)
-
- assert m.nodefer_none_optional(None)
-
- holder = m.OptionalHolder()
- mvalue = holder.member
- assert mvalue.initialized
- assert holder.member_initialized()
-
-
-@pytest.mark.skipif(
- not hasattr(m, "has_exp_optional"), reason="no <experimental/optional>"
-)
-def test_exp_optional():
- assert m.double_or_zero_exp(None) == 0
- assert m.double_or_zero_exp(42) == 84
- pytest.raises(TypeError, m.double_or_zero_exp, "foo")
-
- assert m.half_or_none_exp(0) is None
- assert m.half_or_none_exp(42) == 21
- pytest.raises(TypeError, m.half_or_none_exp, "foo")
-
- assert m.test_nullopt_exp() == 42
- assert m.test_nullopt_exp(None) == 42
- assert m.test_nullopt_exp(42) == 42
- assert m.test_nullopt_exp(43) == 43
-
- assert m.test_no_assign_exp() == 42
- assert m.test_no_assign_exp(None) == 42
- assert m.test_no_assign_exp(m.NoAssign(43)) == 43
- pytest.raises(TypeError, m.test_no_assign_exp, 43)
-
- holder = m.OptionalExpHolder()
- mvalue = holder.member
- assert mvalue.initialized
- assert holder.member_initialized()
-
-
-@pytest.mark.skipif(not hasattr(m, "load_variant"), reason="no <variant>")
-def test_variant(doc):
- assert m.load_variant(1) == "int"
- assert m.load_variant("1") == "std::string"
- assert m.load_variant(1.0) == "double"
- assert m.load_variant(None) == "std::nullptr_t"
-
- assert m.load_variant_2pass(1) == "int"
- assert m.load_variant_2pass(1.0) == "double"
-
- assert m.cast_variant() == (5, "Hello")
-
- assert (
- doc(m.load_variant) == "load_variant(arg0: Union[int, str, float, None]) -> str"
- )
-
-
-def test_vec_of_reference_wrapper():
- """#171: Can't return reference wrappers (or STL structures containing them)"""
- assert (
- str(m.return_vec_of_reference_wrapper(UserType(4)))
- == "[UserType(1), UserType(2), UserType(3), UserType(4)]"
- )
-
-
-def test_stl_pass_by_pointer(msg):
- """Passing nullptr or None to an STL container pointer is not expected to work"""
- with pytest.raises(TypeError) as excinfo:
- m.stl_pass_by_pointer() # default value is `nullptr`
- assert (
- msg(excinfo.value)
- == """
- stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported:
- 1. (v: List[int] = None) -> List[int]
-
- Invoked with:
- """ # noqa: E501 line too long
- )
-
- with pytest.raises(TypeError) as excinfo:
- m.stl_pass_by_pointer(None)
- assert (
- msg(excinfo.value)
- == """
- stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported:
- 1. (v: List[int] = None) -> List[int]
-
- Invoked with: None
- """ # noqa: E501 line too long
- )
-
- assert m.stl_pass_by_pointer([1, 2, 3]) == [1, 2, 3]
-
-
-def test_missing_header_message():
- """Trying convert `list` to a `std::vector`, or vice versa, without including
- <pybind11/stl.h> should result in a helpful suggestion in the error message"""
- import pybind11_cross_module_tests as cm
-
- expected_message = (
- "Did you forget to `#include <pybind11/stl.h>`? Or <pybind11/complex.h>,\n"
- "<pybind11/functional.h>, <pybind11/chrono.h>, etc. Some automatic\n"
- "conversions are optional and require extra headers to be included\n"
- "when compiling your pybind11 module."
- )
-
- with pytest.raises(TypeError) as excinfo:
- cm.missing_header_arg([1.0, 2.0, 3.0])
- assert expected_message in str(excinfo.value)
-
- with pytest.raises(TypeError) as excinfo:
- cm.missing_header_return()
- assert expected_message in str(excinfo.value)
-
-
-def test_function_with_string_and_vector_string_arg():
- """Check if a string is NOT implicitly converted to a list, which was the
- behavior before fix of issue #1258"""
- assert m.func_with_string_or_vector_string_arg_overload(("A", "B")) == 2
- assert m.func_with_string_or_vector_string_arg_overload(["A", "B"]) == 2
- assert m.func_with_string_or_vector_string_arg_overload("A") == 3
-
-
-def test_stl_ownership():
- cstats = ConstructorStats.get(m.Placeholder)
- assert cstats.alive() == 0
- r = m.test_stl_ownership()
- assert len(r) == 1
- del r
- assert cstats.alive() == 0
-
-
-def test_array_cast_sequence():
- assert m.array_cast_sequence((1, 2, 3)) == [1, 2, 3]
-
-
-def test_issue_1561():
- """ check fix for issue #1561 """
- bar = m.Issue1561Outer()
- bar.list = [m.Issue1561Inner("bar")]
- bar.list
- assert bar.list[0].data == "bar"
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl_binders.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl_binders.cpp
deleted file mode 100644
index 1c0df984d89925b0ca17caccd3dca069fe5ec51f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl_binders.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- tests/test_stl_binders.cpp -- Usage of stl_binders functions
-
- Copyright (c) 2016 Sergey Lyskov
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-#include <pybind11/stl_bind.h>
-#include <pybind11/numpy.h>
-#include <map>
-#include <deque>
-#include <unordered_map>
-
-class El {
-public:
- El() = delete;
- El(int v) : a(v) { }
-
- int a;
-};
-
-std::ostream & operator<<(std::ostream &s, El const&v) {
- s << "El{" << v.a << '}';
- return s;
-}
-
-/// Issue #487: binding std::vector<E> with E non-copyable
-class E_nc {
-public:
- explicit E_nc(int i) : value{i} {}
- E_nc(const E_nc &) = delete;
- E_nc &operator=(const E_nc &) = delete;
- E_nc(E_nc &&) = default;
- E_nc &operator=(E_nc &&) = default;
-
- int value;
-};
-
-template <class Container> Container *one_to_n(int n) {
- auto v = new Container();
- for (int i = 1; i <= n; i++)
- v->emplace_back(i);
- return v;
-}
-
-template <class Map> Map *times_ten(int n) {
- auto m = new Map();
- for (int i = 1; i <= n; i++)
- m->emplace(int(i), E_nc(10*i));
- return m;
-}
-
-template <class NestMap> NestMap *times_hundred(int n) {
- auto m = new NestMap();
- for (int i = 1; i <= n; i++)
- for (int j = 1; j <= n; j++)
- (*m)[i].emplace(int(j*10), E_nc(100*j));
- return m;
-}
-
-TEST_SUBMODULE(stl_binders, m) {
- // test_vector_int
- py::bind_vector<std::vector<unsigned int>>(m, "VectorInt", py::buffer_protocol());
-
- // test_vector_custom
- py::class_<El>(m, "El")
- .def(py::init<int>());
- py::bind_vector<std::vector<El>>(m, "VectorEl");
- py::bind_vector<std::vector<std::vector<El>>>(m, "VectorVectorEl");
-
- // test_map_string_double
- py::bind_map<std::map<std::string, double>>(m, "MapStringDouble");
- py::bind_map<std::unordered_map<std::string, double>>(m, "UnorderedMapStringDouble");
-
- // test_map_string_double_const
- py::bind_map<std::map<std::string, double const>>(m, "MapStringDoubleConst");
- py::bind_map<std::unordered_map<std::string, double const>>(m, "UnorderedMapStringDoubleConst");
-
- py::class_<E_nc>(m, "ENC")
- .def(py::init<int>())
- .def_readwrite("value", &E_nc::value);
-
- // test_noncopyable_containers
- py::bind_vector<std::vector<E_nc>>(m, "VectorENC");
- m.def("get_vnc", &one_to_n<std::vector<E_nc>>, py::return_value_policy::reference);
- py::bind_vector<std::deque<E_nc>>(m, "DequeENC");
- m.def("get_dnc", &one_to_n<std::deque<E_nc>>, py::return_value_policy::reference);
- py::bind_map<std::map<int, E_nc>>(m, "MapENC");
- m.def("get_mnc", ×_ten<std::map<int, E_nc>>, py::return_value_policy::reference);
- py::bind_map<std::unordered_map<int, E_nc>>(m, "UmapENC");
- m.def("get_umnc", ×_ten<std::unordered_map<int, E_nc>>, py::return_value_policy::reference);
- // Issue #1885: binding nested std::map<X, Container<E>> with E non-copyable
- py::bind_map<std::map<int, std::vector<E_nc>>>(m, "MapVecENC");
- m.def("get_nvnc", [](int n)
- {
- auto m = new std::map<int, std::vector<E_nc>>();
- for (int i = 1; i <= n; i++)
- for (int j = 1; j <= n; j++)
- (*m)[i].emplace_back(j);
- return m;
- }, py::return_value_policy::reference);
- py::bind_map<std::map<int, std::map<int, E_nc>>>(m, "MapMapENC");
- m.def("get_nmnc", ×_hundred<std::map<int, std::map<int, E_nc>>>, py::return_value_policy::reference);
- py::bind_map<std::unordered_map<int, std::unordered_map<int, E_nc>>>(m, "UmapUmapENC");
- m.def("get_numnc", ×_hundred<std::unordered_map<int, std::unordered_map<int, E_nc>>>, py::return_value_policy::reference);
-
- // test_vector_buffer
- py::bind_vector<std::vector<unsigned char>>(m, "VectorUChar", py::buffer_protocol());
- // no dtype declared for this version:
- struct VUndeclStruct { bool w; uint32_t x; double y; bool z; };
- m.def("create_undeclstruct", [m] () mutable {
- py::bind_vector<std::vector<VUndeclStruct>>(m, "VectorUndeclStruct", py::buffer_protocol());
- });
-
- // The rest depends on numpy:
- try { py::module_::import("numpy"); }
- catch (...) { return; }
-
- // test_vector_buffer_numpy
- struct VStruct { bool w; uint32_t x; double y; bool z; };
- PYBIND11_NUMPY_DTYPE(VStruct, w, x, y, z);
- py::class_<VStruct>(m, "VStruct").def_readwrite("x", &VStruct::x);
- py::bind_vector<std::vector<VStruct>>(m, "VectorStruct", py::buffer_protocol());
- m.def("get_vectorstruct", [] {return std::vector<VStruct> {{0, 5, 3.0, 1}, {1, 30, -1e4, 0}};});
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl_binders.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl_binders.py
deleted file mode 100644
index 84132a2b4f40d225de25d553613fc983485acc7f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_stl_binders.py
+++ /dev/null
@@ -1,291 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-from pybind11_tests import stl_binders as m
-
-
-def test_vector_int():
- v_int = m.VectorInt([0, 0])
- assert len(v_int) == 2
- assert bool(v_int) is True
-
- # test construction from a generator
- v_int1 = m.VectorInt(x for x in range(5))
- assert v_int1 == m.VectorInt([0, 1, 2, 3, 4])
-
- v_int2 = m.VectorInt([0, 0])
- assert v_int == v_int2
- v_int2[1] = 1
- assert v_int != v_int2
-
- v_int2.append(2)
- v_int2.insert(0, 1)
- v_int2.insert(0, 2)
- v_int2.insert(0, 3)
- v_int2.insert(6, 3)
- assert str(v_int2) == "VectorInt[3, 2, 1, 0, 1, 2, 3]"
- with pytest.raises(IndexError):
- v_int2.insert(8, 4)
-
- v_int.append(99)
- v_int2[2:-2] = v_int
- assert v_int2 == m.VectorInt([3, 2, 0, 0, 99, 2, 3])
- del v_int2[1:3]
- assert v_int2 == m.VectorInt([3, 0, 99, 2, 3])
- del v_int2[0]
- assert v_int2 == m.VectorInt([0, 99, 2, 3])
-
- v_int2.extend(m.VectorInt([4, 5]))
- assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5])
-
- v_int2.extend([6, 7])
- assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7])
-
- # test error handling, and that the vector is unchanged
- with pytest.raises(RuntimeError):
- v_int2.extend([8, "a"])
-
- assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7])
-
- # test extending from a generator
- v_int2.extend(x for x in range(5))
- assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4])
-
- # test negative indexing
- assert v_int2[-1] == 4
-
- # insert with negative index
- v_int2.insert(-1, 88)
- assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 88, 4])
-
- # delete negative index
- del v_int2[-1]
- assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 88])
-
- v_int2.clear()
- assert len(v_int2) == 0
-
-
-# Older PyPy's failed here, related to the PyPy's buffer protocol.
-def test_vector_buffer():
- b = bytearray([1, 2, 3, 4])
- v = m.VectorUChar(b)
- assert v[1] == 2
- v[2] = 5
- mv = memoryview(v) # We expose the buffer interface
- if not env.PY2:
- assert mv[2] == 5
- mv[2] = 6
- else:
- assert mv[2] == "\x05"
- mv[2] = "\x06"
- assert v[2] == 6
-
- if not env.PY2:
- mv = memoryview(b)
- v = m.VectorUChar(mv[::2])
- assert v[1] == 3
-
- with pytest.raises(RuntimeError) as excinfo:
- m.create_undeclstruct() # Undeclared struct contents, no buffer interface
- assert "NumPy type info missing for " in str(excinfo.value)
-
-
-def test_vector_buffer_numpy():
- np = pytest.importorskip("numpy")
- a = np.array([1, 2, 3, 4], dtype=np.int32)
- with pytest.raises(TypeError):
- m.VectorInt(a)
-
- a = np.array([[1, 2, 3, 4], [5, 6, 7, 8], [9, 10, 11, 12]], dtype=np.uintc)
- v = m.VectorInt(a[0, :])
- assert len(v) == 4
- assert v[2] == 3
- ma = np.asarray(v)
- ma[2] = 5
- assert v[2] == 5
-
- v = m.VectorInt(a[:, 1])
- assert len(v) == 3
- assert v[2] == 10
-
- v = m.get_vectorstruct()
- assert v[0].x == 5
- ma = np.asarray(v)
- ma[1]["x"] = 99
- assert v[1].x == 99
-
- v = m.VectorStruct(
- np.zeros(
- 3,
- dtype=np.dtype(
- [("w", "bool"), ("x", "I"), ("y", "float64"), ("z", "bool")], align=True
- ),
- )
- )
- assert len(v) == 3
-
- b = np.array([1, 2, 3, 4], dtype=np.uint8)
- v = m.VectorUChar(b[::2])
- assert v[1] == 3
-
-
-def test_vector_bool():
- import pybind11_cross_module_tests as cm
-
- vv_c = cm.VectorBool()
- for i in range(10):
- vv_c.append(i % 2 == 0)
- for i in range(10):
- assert vv_c[i] == (i % 2 == 0)
- assert str(vv_c) == "VectorBool[1, 0, 1, 0, 1, 0, 1, 0, 1, 0]"
-
-
-def test_vector_custom():
- v_a = m.VectorEl()
- v_a.append(m.El(1))
- v_a.append(m.El(2))
- assert str(v_a) == "VectorEl[El{1}, El{2}]"
-
- vv_a = m.VectorVectorEl()
- vv_a.append(v_a)
- vv_b = vv_a[0]
- assert str(vv_b) == "VectorEl[El{1}, El{2}]"
-
-
-def test_map_string_double():
- mm = m.MapStringDouble()
- mm["a"] = 1
- mm["b"] = 2.5
-
- assert list(mm) == ["a", "b"]
- assert list(mm.items()) == [("a", 1), ("b", 2.5)]
- assert str(mm) == "MapStringDouble{a: 1, b: 2.5}"
-
- um = m.UnorderedMapStringDouble()
- um["ua"] = 1.1
- um["ub"] = 2.6
-
- assert sorted(list(um)) == ["ua", "ub"]
- assert sorted(list(um.items())) == [("ua", 1.1), ("ub", 2.6)]
- assert "UnorderedMapStringDouble" in str(um)
-
-
-def test_map_string_double_const():
- mc = m.MapStringDoubleConst()
- mc["a"] = 10
- mc["b"] = 20.5
- assert str(mc) == "MapStringDoubleConst{a: 10, b: 20.5}"
-
- umc = m.UnorderedMapStringDoubleConst()
- umc["a"] = 11
- umc["b"] = 21.5
-
- str(umc)
-
-
-def test_noncopyable_containers():
- # std::vector
- vnc = m.get_vnc(5)
- for i in range(0, 5):
- assert vnc[i].value == i + 1
-
- for i, j in enumerate(vnc, start=1):
- assert j.value == i
-
- # std::deque
- dnc = m.get_dnc(5)
- for i in range(0, 5):
- assert dnc[i].value == i + 1
-
- i = 1
- for j in dnc:
- assert j.value == i
- i += 1
-
- # std::map
- mnc = m.get_mnc(5)
- for i in range(1, 6):
- assert mnc[i].value == 10 * i
-
- vsum = 0
- for k, v in mnc.items():
- assert v.value == 10 * k
- vsum += v.value
-
- assert vsum == 150
-
- # std::unordered_map
- mnc = m.get_umnc(5)
- for i in range(1, 6):
- assert mnc[i].value == 10 * i
-
- vsum = 0
- for k, v in mnc.items():
- assert v.value == 10 * k
- vsum += v.value
-
- assert vsum == 150
-
- # nested std::map<std::vector>
- nvnc = m.get_nvnc(5)
- for i in range(1, 6):
- for j in range(0, 5):
- assert nvnc[i][j].value == j + 1
-
- # Note: maps do not have .values()
- for _, v in nvnc.items():
- for i, j in enumerate(v, start=1):
- assert j.value == i
-
- # nested std::map<std::map>
- nmnc = m.get_nmnc(5)
- for i in range(1, 6):
- for j in range(10, 60, 10):
- assert nmnc[i][j].value == 10 * j
-
- vsum = 0
- for _, v_o in nmnc.items():
- for k_i, v_i in v_o.items():
- assert v_i.value == 10 * k_i
- vsum += v_i.value
-
- assert vsum == 7500
-
- # nested std::unordered_map<std::unordered_map>
- numnc = m.get_numnc(5)
- for i in range(1, 6):
- for j in range(10, 60, 10):
- assert numnc[i][j].value == 10 * j
-
- vsum = 0
- for _, v_o in numnc.items():
- for k_i, v_i in v_o.items():
- assert v_i.value == 10 * k_i
- vsum += v_i.value
-
- assert vsum == 7500
-
-
-def test_map_delitem():
- mm = m.MapStringDouble()
- mm["a"] = 1
- mm["b"] = 2.5
-
- assert list(mm) == ["a", "b"]
- assert list(mm.items()) == [("a", 1), ("b", 2.5)]
- del mm["a"]
- assert list(mm) == ["b"]
- assert list(mm.items()) == [("b", 2.5)]
-
- um = m.UnorderedMapStringDouble()
- um["ua"] = 1.1
- um["ub"] = 2.6
-
- assert sorted(list(um)) == ["ua", "ub"]
- assert sorted(list(um.items())) == [("ua", 1.1), ("ub", 2.6)]
- del um["ua"]
- assert sorted(list(um)) == ["ub"]
- assert sorted(list(um.items())) == [("ub", 2.6)]
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_tagbased_polymorphic.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_tagbased_polymorphic.cpp
deleted file mode 100644
index 838a168d2bcaed08347db53181c13b0dcb5b9f43..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_tagbased_polymorphic.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- tests/test_tagbased_polymorphic.cpp -- test of polymorphic_type_hook
-
- Copyright (c) 2018 Hudson River Trading LLC <opensource@hudson-trading.com>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include <pybind11/stl.h>
-
-struct Animal
-{
- // Make this type also a "standard" polymorphic type, to confirm that
- // specializing polymorphic_type_hook using enable_if_t still works
- // (https://github.com/pybind/pybind11/pull/2016/).
- virtual ~Animal() = default;
-
- // Enum for tag-based polymorphism.
- enum class Kind {
- Unknown = 0,
- Dog = 100, Labrador, Chihuahua, LastDog = 199,
- Cat = 200, Panther, LastCat = 299
- };
- static const std::type_info* type_of_kind(Kind kind);
- static std::string name_of_kind(Kind kind);
-
- const Kind kind;
- const std::string name;
-
- protected:
- Animal(const std::string& _name, Kind _kind)
- : kind(_kind), name(_name)
- {}
-};
-
-struct Dog : Animal
-{
- Dog(const std::string& _name, Kind _kind = Kind::Dog) : Animal(_name, _kind) {}
- std::string bark() const { return name_of_kind(kind) + " " + name + " goes " + sound; }
- std::string sound = "WOOF!";
-};
-
-struct Labrador : Dog
-{
- Labrador(const std::string& _name, int _excitement = 9001)
- : Dog(_name, Kind::Labrador), excitement(_excitement) {}
- int excitement;
-};
-
-struct Chihuahua : Dog
-{
- Chihuahua(const std::string& _name) : Dog(_name, Kind::Chihuahua) { sound = "iyiyiyiyiyi"; }
- std::string bark() const { return Dog::bark() + " and runs in circles"; }
-};
-
-struct Cat : Animal
-{
- Cat(const std::string& _name, Kind _kind = Kind::Cat) : Animal(_name, _kind) {}
- std::string purr() const { return "mrowr"; }
-};
-
-struct Panther : Cat
-{
- Panther(const std::string& _name) : Cat(_name, Kind::Panther) {}
- std::string purr() const { return "mrrrRRRRRR"; }
-};
-
-std::vector<std::unique_ptr<Animal>> create_zoo()
-{
- std::vector<std::unique_ptr<Animal>> ret;
- ret.emplace_back(new Labrador("Fido", 15000));
-
- // simulate some new type of Dog that the Python bindings
- // haven't been updated for; it should still be considered
- // a Dog, not just an Animal.
- ret.emplace_back(new Dog("Ginger", Dog::Kind(150)));
-
- ret.emplace_back(new Chihuahua("Hertzl"));
- ret.emplace_back(new Cat("Tiger", Cat::Kind::Cat));
- ret.emplace_back(new Panther("Leo"));
- return ret;
-}
-
-const std::type_info* Animal::type_of_kind(Kind kind)
-{
- switch (kind) {
- case Kind::Unknown: break;
-
- case Kind::Dog: break;
- case Kind::Labrador: return &typeid(Labrador);
- case Kind::Chihuahua: return &typeid(Chihuahua);
- case Kind::LastDog: break;
-
- case Kind::Cat: break;
- case Kind::Panther: return &typeid(Panther);
- case Kind::LastCat: break;
- }
-
- if (kind >= Kind::Dog && kind <= Kind::LastDog) return &typeid(Dog);
- if (kind >= Kind::Cat && kind <= Kind::LastCat) return &typeid(Cat);
- return nullptr;
-}
-
-std::string Animal::name_of_kind(Kind kind)
-{
- std::string raw_name = type_of_kind(kind)->name();
- py::detail::clean_type_id(raw_name);
- return raw_name;
-}
-
-namespace pybind11 {
- template <typename itype>
- struct polymorphic_type_hook<itype, detail::enable_if_t<std::is_base_of<Animal, itype>::value>>
- {
- static const void *get(const itype *src, const std::type_info*& type)
- { type = src ? Animal::type_of_kind(src->kind) : nullptr; return src; }
- };
-} // namespace pybind11
-
-TEST_SUBMODULE(tagbased_polymorphic, m) {
- py::class_<Animal>(m, "Animal")
- .def_readonly("name", &Animal::name);
- py::class_<Dog, Animal>(m, "Dog")
- .def(py::init<std::string>())
- .def_readwrite("sound", &Dog::sound)
- .def("bark", &Dog::bark);
- py::class_<Labrador, Dog>(m, "Labrador")
- .def(py::init<std::string, int>(), "name"_a, "excitement"_a = 9001)
- .def_readwrite("excitement", &Labrador::excitement);
- py::class_<Chihuahua, Dog>(m, "Chihuahua")
- .def(py::init<std::string>())
- .def("bark", &Chihuahua::bark);
- py::class_<Cat, Animal>(m, "Cat")
- .def(py::init<std::string>())
- .def("purr", &Cat::purr);
- py::class_<Panther, Cat>(m, "Panther")
- .def(py::init<std::string>())
- .def("purr", &Panther::purr);
- m.def("create_zoo", &create_zoo);
-};
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_tagbased_polymorphic.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_tagbased_polymorphic.py
deleted file mode 100644
index 64eb8a3c1bf9c6df9c668cef4c65c303fd1d59cc..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_tagbased_polymorphic.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-from pybind11_tests import tagbased_polymorphic as m
-
-
-def test_downcast():
- zoo = m.create_zoo()
- assert [type(animal) for animal in zoo] == [
- m.Labrador,
- m.Dog,
- m.Chihuahua,
- m.Cat,
- m.Panther,
- ]
- assert [animal.name for animal in zoo] == [
- "Fido",
- "Ginger",
- "Hertzl",
- "Tiger",
- "Leo",
- ]
- zoo[1].sound = "woooooo"
- assert [dog.bark() for dog in zoo[:3]] == [
- "Labrador Fido goes WOOF!",
- "Dog Ginger goes woooooo",
- "Chihuahua Hertzl goes iyiyiyiyiyi and runs in circles",
- ]
- assert [cat.purr() for cat in zoo[3:]] == ["mrowr", "mrrrRRRRRR"]
- zoo[0].excitement -= 1000
- assert zoo[0].excitement == 14000
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_union.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_union.cpp
deleted file mode 100644
index 7b98ea216ca0b272978134d9dd1d1eff1b804ad5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_union.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- tests/test_class.cpp -- test py::class_ definitions and basic functionality
-
- Copyright (c) 2019 Roland Dreier <roland.dreier@gmail.com>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-
-TEST_SUBMODULE(union_, m) {
- union TestUnion {
- int value_int;
- unsigned value_uint;
- };
-
- py::class_<TestUnion>(m, "TestUnion")
- .def(py::init<>())
- .def_readonly("as_int", &TestUnion::value_int)
- .def_readwrite("as_uint", &TestUnion::value_uint);
-}
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_union.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_union.py
deleted file mode 100644
index 2a2c12fb4836a0f2194e06af7781216d78ed0ba2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_union.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-from pybind11_tests import union_ as m
-
-
-def test_union():
- instance = m.TestUnion()
-
- instance.as_uint = 10
- assert instance.as_int == 10
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_virtual_functions.cpp b/3rdParty/pybind11/pybind11-2.6.0/tests/test_virtual_functions.cpp
deleted file mode 100644
index 685d64a7ca93da0e354b0efb505cf34ab53c437f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_virtual_functions.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- tests/test_virtual_functions.cpp -- overriding virtual functions from Python
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "pybind11_tests.h"
-#include "constructor_stats.h"
-#include <pybind11/functional.h>
-#include <thread>
-
-/* This is an example class that we'll want to be able to extend from Python */
-class ExampleVirt {
-public:
- ExampleVirt(int state) : state(state) { print_created(this, state); }
- ExampleVirt(const ExampleVirt &e) : state(e.state) { print_copy_created(this); }
- ExampleVirt(ExampleVirt &&e) : state(e.state) { print_move_created(this); e.state = 0; }
- virtual ~ExampleVirt() { print_destroyed(this); }
-
- virtual int run(int value) {
- py::print("Original implementation of "
- "ExampleVirt::run(state={}, value={}, str1={}, str2={})"_s.format(state, value, get_string1(), *get_string2()));
- return state + value;
- }
-
- virtual bool run_bool() = 0;
- virtual void pure_virtual() = 0;
-
- // Returning a reference/pointer to a type converted from python (numbers, strings, etc.) is a
- // bit trickier, because the actual int& or std::string& or whatever only exists temporarily, so
- // we have to handle it specially in the trampoline class (see below).
- virtual const std::string &get_string1() { return str1; }
- virtual const std::string *get_string2() { return &str2; }
-
-private:
- int state;
- const std::string str1{"default1"}, str2{"default2"};
-};
-
-/* This is a wrapper class that must be generated */
-class PyExampleVirt : public ExampleVirt {
-public:
- using ExampleVirt::ExampleVirt; /* Inherit constructors */
-
- int run(int value) override {
- /* Generate wrapping code that enables native function overloading */
- PYBIND11_OVERRIDE(
- int, /* Return type */
- ExampleVirt, /* Parent class */
- run, /* Name of function */
- value /* Argument(s) */
- );
- }
-
- bool run_bool() override {
- PYBIND11_OVERRIDE_PURE(
- bool, /* Return type */
- ExampleVirt, /* Parent class */
- run_bool, /* Name of function */
- /* This function has no arguments. The trailing comma
- in the previous line is needed for some compilers */
- );
- }
-
- void pure_virtual() override {
- PYBIND11_OVERRIDE_PURE(
- void, /* Return type */
- ExampleVirt, /* Parent class */
- pure_virtual, /* Name of function */
- /* This function has no arguments. The trailing comma
- in the previous line is needed for some compilers */
- );
- }
-
- // We can return reference types for compatibility with C++ virtual interfaces that do so, but
- // note they have some significant limitations (see the documentation).
- const std::string &get_string1() override {
- PYBIND11_OVERRIDE(
- const std::string &, /* Return type */
- ExampleVirt, /* Parent class */
- get_string1, /* Name of function */
- /* (no arguments) */
- );
- }
-
- const std::string *get_string2() override {
- PYBIND11_OVERRIDE(
- const std::string *, /* Return type */
- ExampleVirt, /* Parent class */
- get_string2, /* Name of function */
- /* (no arguments) */
- );
- }
-
-};
-
-class NonCopyable {
-public:
- NonCopyable(int a, int b) : value{new int(a*b)} { print_created(this, a, b); }
- NonCopyable(NonCopyable &&o) { value = std::move(o.value); print_move_created(this); }
- NonCopyable(const NonCopyable &) = delete;
- NonCopyable() = delete;
- void operator=(const NonCopyable &) = delete;
- void operator=(NonCopyable &&) = delete;
- std::string get_value() const {
- if (value) return std::to_string(*value); else return "(null)";
- }
- ~NonCopyable() { print_destroyed(this); }
-
-private:
- std::unique_ptr<int> value;
-};
-
-// This is like the above, but is both copy and movable. In effect this means it should get moved
-// when it is not referenced elsewhere, but copied if it is still referenced.
-class Movable {
-public:
- Movable(int a, int b) : value{a+b} { print_created(this, a, b); }
- Movable(const Movable &m) { value = m.value; print_copy_created(this); }
- Movable(Movable &&m) { value = std::move(m.value); print_move_created(this); }
- std::string get_value() const { return std::to_string(value); }
- ~Movable() { print_destroyed(this); }
-private:
- int value;
-};
-
-class NCVirt {
-public:
- virtual ~NCVirt() = default;
- NCVirt() = default;
- NCVirt(const NCVirt&) = delete;
- virtual NonCopyable get_noncopyable(int a, int b) { return NonCopyable(a, b); }
- virtual Movable get_movable(int a, int b) = 0;
-
- std::string print_nc(int a, int b) { return get_noncopyable(a, b).get_value(); }
- std::string print_movable(int a, int b) { return get_movable(a, b).get_value(); }
-};
-class NCVirtTrampoline : public NCVirt {
-#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__) && !defined(__PGIC__)
- NonCopyable get_noncopyable(int a, int b) override {
- PYBIND11_OVERRIDE(NonCopyable, NCVirt, get_noncopyable, a, b);
- }
-#endif
- Movable get_movable(int a, int b) override {
- PYBIND11_OVERRIDE_PURE(Movable, NCVirt, get_movable, a, b);
- }
-};
-
-struct Base {
- /* for some reason MSVC2015 can't compile this if the function is pure virtual */
- virtual std::string dispatch() const { return {}; };
- virtual ~Base() = default;
- Base() = default;
- Base(const Base&) = delete;
-};
-
-struct DispatchIssue : Base {
- std::string dispatch() const override {
- PYBIND11_OVERRIDE_PURE(std::string, Base, dispatch, /* no arguments */);
- }
-};
-
-static void test_gil() {
- {
- py::gil_scoped_acquire lock;
- py::print("1st lock acquired");
-
- }
-
- {
- py::gil_scoped_acquire lock;
- py::print("2nd lock acquired");
- }
-
-}
-
-static void test_gil_from_thread() {
- py::gil_scoped_release release;
-
- std::thread t(test_gil);
- t.join();
-}
-
-
-// Forward declaration (so that we can put the main tests here; the inherited virtual approaches are
-// rather long).
-void initialize_inherited_virtuals(py::module_ &m);
-
-TEST_SUBMODULE(virtual_functions, m) {
- // test_override
- py::class_<ExampleVirt, PyExampleVirt>(m, "ExampleVirt")
- .def(py::init<int>())
- /* Reference original class in function definitions */
- .def("run", &ExampleVirt::run)
- .def("run_bool", &ExampleVirt::run_bool)
- .def("pure_virtual", &ExampleVirt::pure_virtual);
-
- py::class_<NonCopyable>(m, "NonCopyable")
- .def(py::init<int, int>());
-
- py::class_<Movable>(m, "Movable")
- .def(py::init<int, int>());
-
- // test_move_support
-#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__) && !defined(__PGIC__)
- py::class_<NCVirt, NCVirtTrampoline>(m, "NCVirt")
- .def(py::init<>())
- .def("get_noncopyable", &NCVirt::get_noncopyable)
- .def("get_movable", &NCVirt::get_movable)
- .def("print_nc", &NCVirt::print_nc)
- .def("print_movable", &NCVirt::print_movable);
-#endif
-
- m.def("runExampleVirt", [](ExampleVirt *ex, int value) { return ex->run(value); });
- m.def("runExampleVirtBool", [](ExampleVirt* ex) { return ex->run_bool(); });
- m.def("runExampleVirtVirtual", [](ExampleVirt *ex) { ex->pure_virtual(); });
-
- m.def("cstats_debug", &ConstructorStats::get<ExampleVirt>);
- initialize_inherited_virtuals(m);
-
- // test_alias_delay_initialization1
- // don't invoke Python dispatch classes by default when instantiating C++ classes
- // that were not extended on the Python side
- struct A {
- A() = default;
- A(const A&) = delete;
- virtual ~A() = default;
- virtual void f() { py::print("A.f()"); }
- };
-
- struct PyA : A {
- PyA() { py::print("PyA.PyA()"); }
- PyA(const PyA&) = delete;
- ~PyA() override { py::print("PyA.~PyA()"); }
-
- void f() override {
- py::print("PyA.f()");
- // This convolution just gives a `void`, but tests that PYBIND11_TYPE() works to protect
- // a type containing a ,
- PYBIND11_OVERRIDE(PYBIND11_TYPE(typename std::enable_if<true, void>::type), A, f);
- }
- };
-
- py::class_<A, PyA>(m, "A")
- .def(py::init<>())
- .def("f", &A::f);
-
- m.def("call_f", [](A *a) { a->f(); });
-
- // test_alias_delay_initialization2
- // ... unless we explicitly request it, as in this example:
- struct A2 {
- A2() = default;
- A2(const A2&) = delete;
- virtual ~A2() = default;
- virtual void f() { py::print("A2.f()"); }
- };
-
- struct PyA2 : A2 {
- PyA2() { py::print("PyA2.PyA2()"); }
- PyA2(const PyA2&) = delete;
- ~PyA2() override { py::print("PyA2.~PyA2()"); }
- void f() override {
- py::print("PyA2.f()");
- PYBIND11_OVERRIDE(void, A2, f);
- }
- };
-
- py::class_<A2, PyA2>(m, "A2")
- .def(py::init_alias<>())
- .def(py::init([](int) { return new PyA2(); }))
- .def("f", &A2::f);
-
- m.def("call_f", [](A2 *a2) { a2->f(); });
-
- // test_dispatch_issue
- // #159: virtual function dispatch has problems with similar-named functions
- py::class_<Base, DispatchIssue>(m, "DispatchIssue")
- .def(py::init<>())
- .def("dispatch", &Base::dispatch);
-
- m.def("dispatch_issue_go", [](const Base * b) { return b->dispatch(); });
-
- // test_override_ref
- // #392/397: overriding reference-returning functions
- class OverrideTest {
- public:
- struct A { std::string value = "hi"; };
- std::string v;
- A a;
- explicit OverrideTest(const std::string &v) : v{v} {}
- OverrideTest() = default;
- OverrideTest(const OverrideTest&) = delete;
- virtual std::string str_value() { return v; }
- virtual std::string &str_ref() { return v; }
- virtual A A_value() { return a; }
- virtual A &A_ref() { return a; }
- virtual ~OverrideTest() = default;
- };
-
- class PyOverrideTest : public OverrideTest {
- public:
- using OverrideTest::OverrideTest;
- std::string str_value() override { PYBIND11_OVERRIDE(std::string, OverrideTest, str_value); }
- // Not allowed (uncommenting should hit a static_assert failure): we can't get a reference
- // to a python numeric value, since we only copy values in the numeric type caster:
-// std::string &str_ref() override { PYBIND11_OVERRIDE(std::string &, OverrideTest, str_ref); }
- // But we can work around it like this:
- private:
- std::string _tmp;
- std::string str_ref_helper() { PYBIND11_OVERRIDE(std::string, OverrideTest, str_ref); }
- public:
- std::string &str_ref() override { return _tmp = str_ref_helper(); }
-
- A A_value() override { PYBIND11_OVERRIDE(A, OverrideTest, A_value); }
- A &A_ref() override { PYBIND11_OVERRIDE(A &, OverrideTest, A_ref); }
- };
-
- py::class_<OverrideTest::A>(m, "OverrideTest_A")
- .def_readwrite("value", &OverrideTest::A::value);
- py::class_<OverrideTest, PyOverrideTest>(m, "OverrideTest")
- .def(py::init<const std::string &>())
- .def("str_value", &OverrideTest::str_value)
-// .def("str_ref", &OverrideTest::str_ref)
- .def("A_value", &OverrideTest::A_value)
- .def("A_ref", &OverrideTest::A_ref);
-}
-
-
-// Inheriting virtual methods. We do two versions here: the repeat-everything version and the
-// templated trampoline versions mentioned in docs/advanced.rst.
-//
-// These base classes are exactly the same, but we technically need distinct
-// classes for this example code because we need to be able to bind them
-// properly (pybind11, sensibly, doesn't allow us to bind the same C++ class to
-// multiple python classes).
-class A_Repeat {
-#define A_METHODS \
-public: \
- virtual int unlucky_number() = 0; \
- virtual std::string say_something(unsigned times) { \
- std::string s = ""; \
- for (unsigned i = 0; i < times; ++i) \
- s += "hi"; \
- return s; \
- } \
- std::string say_everything() { \
- return say_something(1) + " " + std::to_string(unlucky_number()); \
- }
-A_METHODS
- A_Repeat() = default;
- A_Repeat(const A_Repeat&) = delete;
- virtual ~A_Repeat() = default;
-};
-class B_Repeat : public A_Repeat {
-#define B_METHODS \
-public: \
- int unlucky_number() override { return 13; } \
- std::string say_something(unsigned times) override { \
- return "B says hi " + std::to_string(times) + " times"; \
- } \
- virtual double lucky_number() { return 7.0; }
-B_METHODS
-};
-class C_Repeat : public B_Repeat {
-#define C_METHODS \
-public: \
- int unlucky_number() override { return 4444; } \
- double lucky_number() override { return 888; }
-C_METHODS
-};
-class D_Repeat : public C_Repeat {
-#define D_METHODS // Nothing overridden.
-D_METHODS
-};
-
-// Base classes for templated inheritance trampolines. Identical to the repeat-everything version:
-class A_Tpl {
- A_METHODS;
- A_Tpl() = default;
- A_Tpl(const A_Tpl&) = delete;
- virtual ~A_Tpl() = default;
-};
-class B_Tpl : public A_Tpl { B_METHODS };
-class C_Tpl : public B_Tpl { C_METHODS };
-class D_Tpl : public C_Tpl { D_METHODS };
-
-
-// Inheritance approach 1: each trampoline gets every virtual method (11 in total)
-class PyA_Repeat : public A_Repeat {
-public:
- using A_Repeat::A_Repeat;
- int unlucky_number() override { PYBIND11_OVERRIDE_PURE(int, A_Repeat, unlucky_number, ); }
- std::string say_something(unsigned times) override { PYBIND11_OVERRIDE(std::string, A_Repeat, say_something, times); }
-};
-class PyB_Repeat : public B_Repeat {
-public:
- using B_Repeat::B_Repeat;
- int unlucky_number() override { PYBIND11_OVERRIDE(int, B_Repeat, unlucky_number, ); }
- std::string say_something(unsigned times) override { PYBIND11_OVERRIDE(std::string, B_Repeat, say_something, times); }
- double lucky_number() override { PYBIND11_OVERRIDE(double, B_Repeat, lucky_number, ); }
-};
-class PyC_Repeat : public C_Repeat {
-public:
- using C_Repeat::C_Repeat;
- int unlucky_number() override { PYBIND11_OVERRIDE(int, C_Repeat, unlucky_number, ); }
- std::string say_something(unsigned times) override { PYBIND11_OVERRIDE(std::string, C_Repeat, say_something, times); }
- double lucky_number() override { PYBIND11_OVERRIDE(double, C_Repeat, lucky_number, ); }
-};
-class PyD_Repeat : public D_Repeat {
-public:
- using D_Repeat::D_Repeat;
- int unlucky_number() override { PYBIND11_OVERRIDE(int, D_Repeat, unlucky_number, ); }
- std::string say_something(unsigned times) override { PYBIND11_OVERRIDE(std::string, D_Repeat, say_something, times); }
- double lucky_number() override { PYBIND11_OVERRIDE(double, D_Repeat, lucky_number, ); }
-};
-
-// Inheritance approach 2: templated trampoline classes.
-//
-// Advantages:
-// - we have only 2 (template) class and 4 method declarations (one per virtual method, plus one for
-// any override of a pure virtual method), versus 4 classes and 6 methods (MI) or 4 classes and 11
-// methods (repeat).
-// - Compared to MI, we also don't have to change the non-trampoline inheritance to virtual, and can
-// properly inherit constructors.
-//
-// Disadvantage:
-// - the compiler must still generate and compile 14 different methods (more, even, than the 11
-// required for the repeat approach) instead of the 6 required for MI. (If there was no pure
-// method (or no pure method override), the number would drop down to the same 11 as the repeat
-// approach).
-template <class Base = A_Tpl>
-class PyA_Tpl : public Base {
-public:
- using Base::Base; // Inherit constructors
- int unlucky_number() override { PYBIND11_OVERRIDE_PURE(int, Base, unlucky_number, ); }
- std::string say_something(unsigned times) override { PYBIND11_OVERRIDE(std::string, Base, say_something, times); }
-};
-template <class Base = B_Tpl>
-class PyB_Tpl : public PyA_Tpl<Base> {
-public:
- using PyA_Tpl<Base>::PyA_Tpl; // Inherit constructors (via PyA_Tpl's inherited constructors)
- int unlucky_number() override { PYBIND11_OVERRIDE(int, Base, unlucky_number, ); }
- double lucky_number() override { PYBIND11_OVERRIDE(double, Base, lucky_number, ); }
-};
-// Since C_Tpl and D_Tpl don't declare any new virtual methods, we don't actually need these (we can
-// use PyB_Tpl<C_Tpl> and PyB_Tpl<D_Tpl> for the trampoline classes instead):
-/*
-template <class Base = C_Tpl> class PyC_Tpl : public PyB_Tpl<Base> {
-public:
- using PyB_Tpl<Base>::PyB_Tpl;
-};
-template <class Base = D_Tpl> class PyD_Tpl : public PyC_Tpl<Base> {
-public:
- using PyC_Tpl<Base>::PyC_Tpl;
-};
-*/
-
-void initialize_inherited_virtuals(py::module_ &m) {
- // test_inherited_virtuals
-
- // Method 1: repeat
- py::class_<A_Repeat, PyA_Repeat>(m, "A_Repeat")
- .def(py::init<>())
- .def("unlucky_number", &A_Repeat::unlucky_number)
- .def("say_something", &A_Repeat::say_something)
- .def("say_everything", &A_Repeat::say_everything);
- py::class_<B_Repeat, A_Repeat, PyB_Repeat>(m, "B_Repeat")
- .def(py::init<>())
- .def("lucky_number", &B_Repeat::lucky_number);
- py::class_<C_Repeat, B_Repeat, PyC_Repeat>(m, "C_Repeat")
- .def(py::init<>());
- py::class_<D_Repeat, C_Repeat, PyD_Repeat>(m, "D_Repeat")
- .def(py::init<>());
-
- // test_
- // Method 2: Templated trampolines
- py::class_<A_Tpl, PyA_Tpl<>>(m, "A_Tpl")
- .def(py::init<>())
- .def("unlucky_number", &A_Tpl::unlucky_number)
- .def("say_something", &A_Tpl::say_something)
- .def("say_everything", &A_Tpl::say_everything);
- py::class_<B_Tpl, A_Tpl, PyB_Tpl<>>(m, "B_Tpl")
- .def(py::init<>())
- .def("lucky_number", &B_Tpl::lucky_number);
- py::class_<C_Tpl, B_Tpl, PyB_Tpl<C_Tpl>>(m, "C_Tpl")
- .def(py::init<>());
- py::class_<D_Tpl, C_Tpl, PyB_Tpl<D_Tpl>>(m, "D_Tpl")
- .def(py::init<>());
-
-
- // Fix issue #1454 (crash when acquiring/releasing GIL on another thread in Python 2.7)
- m.def("test_gil", &test_gil);
- m.def("test_gil_from_thread", &test_gil_from_thread);
-};
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tests/test_virtual_functions.py b/3rdParty/pybind11/pybind11-2.6.0/tests/test_virtual_functions.py
deleted file mode 100644
index ae19930164462ebeb7acfb28b8e72798bbc03411..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tests/test_virtual_functions.py
+++ /dev/null
@@ -1,409 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-import env # noqa: F401
-
-m = pytest.importorskip("pybind11_tests.virtual_functions")
-from pybind11_tests import ConstructorStats # noqa: E402
-
-
-def test_override(capture, msg):
- class ExtendedExampleVirt(m.ExampleVirt):
- def __init__(self, state):
- super(ExtendedExampleVirt, self).__init__(state + 1)
- self.data = "Hello world"
-
- def run(self, value):
- print("ExtendedExampleVirt::run(%i), calling parent.." % value)
- return super(ExtendedExampleVirt, self).run(value + 1)
-
- def run_bool(self):
- print("ExtendedExampleVirt::run_bool()")
- return False
-
- def get_string1(self):
- return "override1"
-
- def pure_virtual(self):
- print("ExtendedExampleVirt::pure_virtual(): %s" % self.data)
-
- class ExtendedExampleVirt2(ExtendedExampleVirt):
- def __init__(self, state):
- super(ExtendedExampleVirt2, self).__init__(state + 1)
-
- def get_string2(self):
- return "override2"
-
- ex12 = m.ExampleVirt(10)
- with capture:
- assert m.runExampleVirt(ex12, 20) == 30
- assert (
- capture
- == """
- Original implementation of ExampleVirt::run(state=10, value=20, str1=default1, str2=default2)
- """ # noqa: E501 line too long
- )
-
- with pytest.raises(RuntimeError) as excinfo:
- m.runExampleVirtVirtual(ex12)
- assert (
- msg(excinfo.value)
- == 'Tried to call pure virtual function "ExampleVirt::pure_virtual"'
- )
-
- ex12p = ExtendedExampleVirt(10)
- with capture:
- assert m.runExampleVirt(ex12p, 20) == 32
- assert (
- capture
- == """
- ExtendedExampleVirt::run(20), calling parent..
- Original implementation of ExampleVirt::run(state=11, value=21, str1=override1, str2=default2)
- """ # noqa: E501 line too long
- )
- with capture:
- assert m.runExampleVirtBool(ex12p) is False
- assert capture == "ExtendedExampleVirt::run_bool()"
- with capture:
- m.runExampleVirtVirtual(ex12p)
- assert capture == "ExtendedExampleVirt::pure_virtual(): Hello world"
-
- ex12p2 = ExtendedExampleVirt2(15)
- with capture:
- assert m.runExampleVirt(ex12p2, 50) == 68
- assert (
- capture
- == """
- ExtendedExampleVirt::run(50), calling parent..
- Original implementation of ExampleVirt::run(state=17, value=51, str1=override1, str2=override2)
- """ # noqa: E501 line too long
- )
-
- cstats = ConstructorStats.get(m.ExampleVirt)
- assert cstats.alive() == 3
- del ex12, ex12p, ex12p2
- assert cstats.alive() == 0
- assert cstats.values() == ["10", "11", "17"]
- assert cstats.copy_constructions == 0
- assert cstats.move_constructions >= 0
-
-
-def test_alias_delay_initialization1(capture):
- """`A` only initializes its trampoline class when we inherit from it
-
- If we just create and use an A instance directly, the trampoline initialization is
- bypassed and we only initialize an A() instead (for performance reasons).
- """
-
- class B(m.A):
- def __init__(self):
- super(B, self).__init__()
-
- def f(self):
- print("In python f()")
-
- # C++ version
- with capture:
- a = m.A()
- m.call_f(a)
- del a
- pytest.gc_collect()
- assert capture == "A.f()"
-
- # Python version
- with capture:
- b = B()
- m.call_f(b)
- del b
- pytest.gc_collect()
- assert (
- capture
- == """
- PyA.PyA()
- PyA.f()
- In python f()
- PyA.~PyA()
- """
- )
-
-
-def test_alias_delay_initialization2(capture):
- """`A2`, unlike the above, is configured to always initialize the alias
-
- While the extra initialization and extra class layer has small virtual dispatch
- performance penalty, it also allows us to do more things with the trampoline
- class such as defining local variables and performing construction/destruction.
- """
-
- class B2(m.A2):
- def __init__(self):
- super(B2, self).__init__()
-
- def f(self):
- print("In python B2.f()")
-
- # No python subclass version
- with capture:
- a2 = m.A2()
- m.call_f(a2)
- del a2
- pytest.gc_collect()
- a3 = m.A2(1)
- m.call_f(a3)
- del a3
- pytest.gc_collect()
- assert (
- capture
- == """
- PyA2.PyA2()
- PyA2.f()
- A2.f()
- PyA2.~PyA2()
- PyA2.PyA2()
- PyA2.f()
- A2.f()
- PyA2.~PyA2()
- """
- )
-
- # Python subclass version
- with capture:
- b2 = B2()
- m.call_f(b2)
- del b2
- pytest.gc_collect()
- assert (
- capture
- == """
- PyA2.PyA2()
- PyA2.f()
- In python B2.f()
- PyA2.~PyA2()
- """
- )
-
-
-# PyPy: Reference count > 1 causes call with noncopyable instance
-# to fail in ncv1.print_nc()
-@pytest.mark.xfail("env.PYPY")
-@pytest.mark.skipif(
- not hasattr(m, "NCVirt"), reason="NCVirt does not work on Intel/PGI/NVCC compilers"
-)
-def test_move_support():
- class NCVirtExt(m.NCVirt):
- def get_noncopyable(self, a, b):
- # Constructs and returns a new instance:
- nc = m.NonCopyable(a * a, b * b)
- return nc
-
- def get_movable(self, a, b):
- # Return a referenced copy
- self.movable = m.Movable(a, b)
- return self.movable
-
- class NCVirtExt2(m.NCVirt):
- def get_noncopyable(self, a, b):
- # Keep a reference: this is going to throw an exception
- self.nc = m.NonCopyable(a, b)
- return self.nc
-
- def get_movable(self, a, b):
- # Return a new instance without storing it
- return m.Movable(a, b)
-
- ncv1 = NCVirtExt()
- assert ncv1.print_nc(2, 3) == "36"
- assert ncv1.print_movable(4, 5) == "9"
- ncv2 = NCVirtExt2()
- assert ncv2.print_movable(7, 7) == "14"
- # Don't check the exception message here because it differs under debug/non-debug mode
- with pytest.raises(RuntimeError):
- ncv2.print_nc(9, 9)
-
- nc_stats = ConstructorStats.get(m.NonCopyable)
- mv_stats = ConstructorStats.get(m.Movable)
- assert nc_stats.alive() == 1
- assert mv_stats.alive() == 1
- del ncv1, ncv2
- assert nc_stats.alive() == 0
- assert mv_stats.alive() == 0
- assert nc_stats.values() == ["4", "9", "9", "9"]
- assert mv_stats.values() == ["4", "5", "7", "7"]
- assert nc_stats.copy_constructions == 0
- assert mv_stats.copy_constructions == 1
- assert nc_stats.move_constructions >= 0
- assert mv_stats.move_constructions >= 0
-
-
-def test_dispatch_issue(msg):
- """#159: virtual function dispatch has problems with similar-named functions"""
-
- class PyClass1(m.DispatchIssue):
- def dispatch(self):
- return "Yay.."
-
- class PyClass2(m.DispatchIssue):
- def dispatch(self):
- with pytest.raises(RuntimeError) as excinfo:
- super(PyClass2, self).dispatch()
- assert (
- msg(excinfo.value)
- == 'Tried to call pure virtual function "Base::dispatch"'
- )
-
- p = PyClass1()
- return m.dispatch_issue_go(p)
-
- b = PyClass2()
- assert m.dispatch_issue_go(b) == "Yay.."
-
-
-def test_override_ref():
- """#392/397: overriding reference-returning functions"""
- o = m.OverrideTest("asdf")
-
- # Not allowed (see associated .cpp comment)
- # i = o.str_ref()
- # assert o.str_ref() == "asdf"
- assert o.str_value() == "asdf"
-
- assert o.A_value().value == "hi"
- a = o.A_ref()
- assert a.value == "hi"
- a.value = "bye"
- assert a.value == "bye"
-
-
-def test_inherited_virtuals():
- class AR(m.A_Repeat):
- def unlucky_number(self):
- return 99
-
- class AT(m.A_Tpl):
- def unlucky_number(self):
- return 999
-
- obj = AR()
- assert obj.say_something(3) == "hihihi"
- assert obj.unlucky_number() == 99
- assert obj.say_everything() == "hi 99"
-
- obj = AT()
- assert obj.say_something(3) == "hihihi"
- assert obj.unlucky_number() == 999
- assert obj.say_everything() == "hi 999"
-
- for obj in [m.B_Repeat(), m.B_Tpl()]:
- assert obj.say_something(3) == "B says hi 3 times"
- assert obj.unlucky_number() == 13
- assert obj.lucky_number() == 7.0
- assert obj.say_everything() == "B says hi 1 times 13"
-
- for obj in [m.C_Repeat(), m.C_Tpl()]:
- assert obj.say_something(3) == "B says hi 3 times"
- assert obj.unlucky_number() == 4444
- assert obj.lucky_number() == 888.0
- assert obj.say_everything() == "B says hi 1 times 4444"
-
- class CR(m.C_Repeat):
- def lucky_number(self):
- return m.C_Repeat.lucky_number(self) + 1.25
-
- obj = CR()
- assert obj.say_something(3) == "B says hi 3 times"
- assert obj.unlucky_number() == 4444
- assert obj.lucky_number() == 889.25
- assert obj.say_everything() == "B says hi 1 times 4444"
-
- class CT(m.C_Tpl):
- pass
-
- obj = CT()
- assert obj.say_something(3) == "B says hi 3 times"
- assert obj.unlucky_number() == 4444
- assert obj.lucky_number() == 888.0
- assert obj.say_everything() == "B says hi 1 times 4444"
-
- class CCR(CR):
- def lucky_number(self):
- return CR.lucky_number(self) * 10
-
- obj = CCR()
- assert obj.say_something(3) == "B says hi 3 times"
- assert obj.unlucky_number() == 4444
- assert obj.lucky_number() == 8892.5
- assert obj.say_everything() == "B says hi 1 times 4444"
-
- class CCT(CT):
- def lucky_number(self):
- return CT.lucky_number(self) * 1000
-
- obj = CCT()
- assert obj.say_something(3) == "B says hi 3 times"
- assert obj.unlucky_number() == 4444
- assert obj.lucky_number() == 888000.0
- assert obj.say_everything() == "B says hi 1 times 4444"
-
- class DR(m.D_Repeat):
- def unlucky_number(self):
- return 123
-
- def lucky_number(self):
- return 42.0
-
- for obj in [m.D_Repeat(), m.D_Tpl()]:
- assert obj.say_something(3) == "B says hi 3 times"
- assert obj.unlucky_number() == 4444
- assert obj.lucky_number() == 888.0
- assert obj.say_everything() == "B says hi 1 times 4444"
-
- obj = DR()
- assert obj.say_something(3) == "B says hi 3 times"
- assert obj.unlucky_number() == 123
- assert obj.lucky_number() == 42.0
- assert obj.say_everything() == "B says hi 1 times 123"
-
- class DT(m.D_Tpl):
- def say_something(self, times):
- return "DT says:" + (" quack" * times)
-
- def unlucky_number(self):
- return 1234
-
- def lucky_number(self):
- return -4.25
-
- obj = DT()
- assert obj.say_something(3) == "DT says: quack quack quack"
- assert obj.unlucky_number() == 1234
- assert obj.lucky_number() == -4.25
- assert obj.say_everything() == "DT says: quack 1234"
-
- class DT2(DT):
- def say_something(self, times):
- return "DT2: " + ("QUACK" * times)
-
- def unlucky_number(self):
- return -3
-
- class BT(m.B_Tpl):
- def say_something(self, times):
- return "BT" * times
-
- def unlucky_number(self):
- return -7
-
- def lucky_number(self):
- return -1.375
-
- obj = BT()
- assert obj.say_something(3) == "BTBTBT"
- assert obj.unlucky_number() == -7
- assert obj.lucky_number() == -1.375
- assert obj.say_everything() == "BT -7"
-
-
-def test_issue_1454():
- # Fix issue #1454 (crash when acquiring/releasing GIL on another thread in Python 2.7)
- m.test_gil()
- m.test_gil_from_thread()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/FindCatch.cmake b/3rdParty/pybind11/pybind11-2.6.0/tools/FindCatch.cmake
deleted file mode 100644
index 4d6bffcf6810c5caa2ed424392f3c45216d1356b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/FindCatch.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-# - Find the Catch test framework or download it (single header)
-#
-# This is a quick module for internal use. It assumes that Catch is
-# REQUIRED and that a minimum version is provided (not EXACT). If
-# a suitable version isn't found locally, the single header file
-# will be downloaded and placed in the build dir: PROJECT_BINARY_DIR.
-#
-# This code sets the following variables:
-# CATCH_INCLUDE_DIR - path to catch.hpp
-# CATCH_VERSION - version number
-
-if(NOT Catch_FIND_VERSION)
- message(FATAL_ERROR "A version number must be specified.")
-elseif(Catch_FIND_REQUIRED)
- message(FATAL_ERROR "This module assumes Catch is not required.")
-elseif(Catch_FIND_VERSION_EXACT)
- message(FATAL_ERROR "Exact version numbers are not supported, only minimum.")
-endif()
-
-# Extract the version number from catch.hpp
-function(_get_catch_version)
- file(
- STRINGS "${CATCH_INCLUDE_DIR}/catch.hpp" version_line
- REGEX "Catch v.*"
- LIMIT_COUNT 1)
- if(version_line MATCHES "Catch v([0-9]+)\\.([0-9]+)\\.([0-9]+)")
- set(CATCH_VERSION
- "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}"
- PARENT_SCOPE)
- endif()
-endfunction()
-
-# Download the single-header version of Catch
-function(_download_catch version destination_dir)
- message(STATUS "Downloading catch v${version}...")
- set(url https://github.com/philsquared/Catch/releases/download/v${version}/catch.hpp)
- file(DOWNLOAD ${url} "${destination_dir}/catch.hpp" STATUS status)
- list(GET status 0 error)
- if(error)
- message(FATAL_ERROR "Could not download ${url}")
- endif()
- set(CATCH_INCLUDE_DIR
- "${destination_dir}"
- CACHE INTERNAL "")
-endfunction()
-
-# Look for catch locally
-find_path(
- CATCH_INCLUDE_DIR
- NAMES catch.hpp
- PATH_SUFFIXES catch2)
-if(CATCH_INCLUDE_DIR)
- _get_catch_version()
-endif()
-
-# Download the header if it wasn't found or if it's outdated
-if(NOT CATCH_VERSION OR CATCH_VERSION VERSION_LESS ${Catch_FIND_VERSION})
- if(DOWNLOAD_CATCH)
- _download_catch(${Catch_FIND_VERSION} "${PROJECT_BINARY_DIR}/catch/")
- _get_catch_version()
- else()
- set(CATCH_FOUND FALSE)
- return()
- endif()
-endif()
-
-add_library(Catch2::Catch2 IMPORTED INTERFACE)
-set_property(TARGET Catch2::Catch2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CATCH_INCLUDE_DIR}")
-
-set(CATCH_FOUND TRUE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/FindEigen3.cmake b/3rdParty/pybind11/pybind11-2.6.0/tools/FindEigen3.cmake
deleted file mode 100644
index 98ab43d9e62e293c0c87e44b6f325579991e8732..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/FindEigen3.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-# - Try to find Eigen3 lib
-#
-# This module supports requiring a minimum version, e.g. you can do
-# find_package(Eigen3 3.1.2)
-# to require version 3.1.2 or newer of Eigen3.
-#
-# Once done this will define
-#
-# EIGEN3_FOUND - system has eigen lib with correct version
-# EIGEN3_INCLUDE_DIR - the eigen include directory
-# EIGEN3_VERSION - eigen version
-
-# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
-# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
-# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
-# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
-
-if(NOT Eigen3_FIND_VERSION)
- if(NOT Eigen3_FIND_VERSION_MAJOR)
- set(Eigen3_FIND_VERSION_MAJOR 2)
- endif(NOT Eigen3_FIND_VERSION_MAJOR)
- if(NOT Eigen3_FIND_VERSION_MINOR)
- set(Eigen3_FIND_VERSION_MINOR 91)
- endif(NOT Eigen3_FIND_VERSION_MINOR)
- if(NOT Eigen3_FIND_VERSION_PATCH)
- set(Eigen3_FIND_VERSION_PATCH 0)
- endif(NOT Eigen3_FIND_VERSION_PATCH)
-
- set(Eigen3_FIND_VERSION
- "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
-endif(NOT Eigen3_FIND_VERSION)
-
-macro(_eigen3_check_version)
- file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
-
- string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match
- "${_eigen3_version_header}")
- set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
- string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match
- "${_eigen3_version_header}")
- set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
- string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match
- "${_eigen3_version_header}")
- set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
-
- set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
- if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
- set(EIGEN3_VERSION_OK FALSE)
- else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
- set(EIGEN3_VERSION_OK TRUE)
- endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
-
- if(NOT EIGEN3_VERSION_OK)
-
- message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
- "but at least version ${Eigen3_FIND_VERSION} is required")
- endif(NOT EIGEN3_VERSION_OK)
-endmacro(_eigen3_check_version)
-
-if(EIGEN3_INCLUDE_DIR)
-
- # in cache already
- _eigen3_check_version()
- set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
-
-else(EIGEN3_INCLUDE_DIR)
-
- find_path(
- EIGEN3_INCLUDE_DIR
- NAMES signature_of_eigen3_matrix_library
- PATHS ${CMAKE_INSTALL_PREFIX}/include ${KDE4_INCLUDE_DIR}
- PATH_SUFFIXES eigen3 eigen)
-
- if(EIGEN3_INCLUDE_DIR)
- _eigen3_check_version()
- endif(EIGEN3_INCLUDE_DIR)
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
-
- mark_as_advanced(EIGEN3_INCLUDE_DIR)
-
-endif(EIGEN3_INCLUDE_DIR)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/FindPythonLibsNew.cmake b/3rdParty/pybind11/pybind11-2.6.0/tools/FindPythonLibsNew.cmake
deleted file mode 100644
index 4f5cf00ae2fb00a6362cf5c2c9c07f61b328b24f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/FindPythonLibsNew.cmake
+++ /dev/null
@@ -1,255 +0,0 @@
-# - Find python libraries
-# This module finds the libraries corresponding to the Python interpreter
-# FindPythonInterp provides.
-# This code sets the following variables:
-#
-# PYTHONLIBS_FOUND - have the Python libs been found
-# PYTHON_PREFIX - path to the Python installation
-# PYTHON_LIBRARIES - path to the python library
-# PYTHON_INCLUDE_DIRS - path to where Python.h is found
-# PYTHON_MODULE_EXTENSION - lib extension, e.g. '.so' or '.pyd'
-# PYTHON_MODULE_PREFIX - lib name prefix: usually an empty string
-# PYTHON_SITE_PACKAGES - path to installation site-packages
-# PYTHON_IS_DEBUG - whether the Python interpreter is a debug build
-#
-# Thanks to talljimbo for the patch adding the 'LDVERSION' config
-# variable usage.
-
-#=============================================================================
-# Copyright 2001-2009 Kitware, Inc.
-# Copyright 2012 Continuum Analytics, Inc.
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-# nor the names of their contributors may be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-# Checking for the extension makes sure that `LibsNew` was found and not just `Libs`.
-if(PYTHONLIBS_FOUND AND PYTHON_MODULE_EXTENSION)
- return()
-endif()
-
-if(PythonLibsNew_FIND_QUIETLY)
- set(_pythonlibs_quiet QUIET)
-endif()
-
-if(PythonLibsNew_FIND_REQUIRED)
- set(_pythonlibs_required REQUIRED)
-endif()
-
-# Check to see if the `python` command is present and from a virtual
-# environment, conda, or GHA activation - if it is, try to use that.
-
-if(NOT DEFINED PYTHON_EXECUTABLE)
- if(DEFINED ENV{VIRTUAL_ENV})
- find_program(
- PYTHON_EXECUTABLE python
- PATHS "$ENV{VIRTUAL_ENV}" "$ENV{VIRTUAL_ENV}/bin"
- NO_DEFAULT_PATH)
- elseif(DEFINED ENV{CONDA_PREFIX})
- find_program(
- PYTHON_EXECUTABLE python
- PATHS "$ENV{CONDA_PREFIX}" "$ENV{CONDA_PREFIX}/bin"
- NO_DEFAULT_PATH)
- elseif(DEFINED ENV{pythonLocation})
- find_program(
- PYTHON_EXECUTABLE python
- PATHS "$ENV{pythonLocation}" "$ENV{pythonLocation}/bin"
- NO_DEFAULT_PATH)
- endif()
- if(NOT PYTHON_EXECUTABLE)
- unset(PYTHON_EXECUTABLE)
- endif()
-endif()
-
-# Use the Python interpreter to find the libs.
-if(NOT PythonLibsNew_FIND_VERSION)
- set(PythonLibsNew_FIND_VERSION "")
-endif()
-
-find_package(PythonInterp ${PythonLibsNew_FIND_VERSION} ${_pythonlibs_required}
- ${_pythonlibs_quiet})
-
-if(NOT PYTHONINTERP_FOUND)
- set(PYTHONLIBS_FOUND FALSE)
- set(PythonLibsNew_FOUND FALSE)
- return()
-endif()
-
-# According to https://stackoverflow.com/questions/646518/python-how-to-detect-debug-interpreter
-# testing whether sys has the gettotalrefcount function is a reliable, cross-platform
-# way to detect a CPython debug interpreter.
-#
-# The library suffix is from the config var LDVERSION sometimes, otherwise
-# VERSION. VERSION will typically be like "2.7" on unix, and "27" on windows.
-execute_process(
- COMMAND
- "${PYTHON_EXECUTABLE}" "-c" "from distutils import sysconfig as s;import sys;import struct;
-print('.'.join(str(v) for v in sys.version_info));
-print(sys.prefix);
-print(s.get_python_inc(plat_specific=True));
-print(s.get_python_lib(plat_specific=True));
-print(s.get_config_var('SO') or s.get_config_var('EXT_SUFFIX'));
-print(hasattr(sys, 'gettotalrefcount')+0);
-print(struct.calcsize('@P'));
-print(s.get_config_var('LDVERSION') or s.get_config_var('VERSION'));
-print(s.get_config_var('LIBDIR') or '');
-print(s.get_config_var('MULTIARCH') or '');
-"
- RESULT_VARIABLE _PYTHON_SUCCESS
- OUTPUT_VARIABLE _PYTHON_VALUES
- ERROR_VARIABLE _PYTHON_ERROR_VALUE)
-
-if(NOT _PYTHON_SUCCESS MATCHES 0)
- if(PythonLibsNew_FIND_REQUIRED)
- message(FATAL_ERROR "Python config failure:\n${_PYTHON_ERROR_VALUE}")
- endif()
- set(PYTHONLIBS_FOUND FALSE)
- set(PythonLibsNew_FOUND FALSE)
- return()
-endif()
-
-# Convert the process output into a list
-if(WIN32)
- string(REGEX REPLACE "\\\\" "/" _PYTHON_VALUES ${_PYTHON_VALUES})
-endif()
-string(REGEX REPLACE ";" "\\\\;" _PYTHON_VALUES ${_PYTHON_VALUES})
-string(REGEX REPLACE "\n" ";" _PYTHON_VALUES ${_PYTHON_VALUES})
-list(GET _PYTHON_VALUES 0 _PYTHON_VERSION_LIST)
-list(GET _PYTHON_VALUES 1 PYTHON_PREFIX)
-list(GET _PYTHON_VALUES 2 PYTHON_INCLUDE_DIR)
-list(GET _PYTHON_VALUES 3 PYTHON_SITE_PACKAGES)
-list(GET _PYTHON_VALUES 4 PYTHON_MODULE_EXTENSION)
-list(GET _PYTHON_VALUES 5 PYTHON_IS_DEBUG)
-list(GET _PYTHON_VALUES 6 PYTHON_SIZEOF_VOID_P)
-list(GET _PYTHON_VALUES 7 PYTHON_LIBRARY_SUFFIX)
-list(GET _PYTHON_VALUES 8 PYTHON_LIBDIR)
-list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH)
-
-# Make sure the Python has the same pointer-size as the chosen compiler
-# Skip if CMAKE_SIZEOF_VOID_P is not defined
-if(CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}"))
- if(PythonLibsNew_FIND_REQUIRED)
- math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8")
- math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
- message(FATAL_ERROR "Python config failure: Python is ${_PYTHON_BITS}-bit, "
- "chosen compiler is ${_CMAKE_BITS}-bit")
- endif()
- set(PYTHONLIBS_FOUND FALSE)
- set(PythonLibsNew_FOUND FALSE)
- return()
-endif()
-
-# The built-in FindPython didn't always give the version numbers
-string(REGEX REPLACE "\\." ";" _PYTHON_VERSION_LIST ${_PYTHON_VERSION_LIST})
-list(GET _PYTHON_VERSION_LIST 0 PYTHON_VERSION_MAJOR)
-list(GET _PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR)
-list(GET _PYTHON_VERSION_LIST 2 PYTHON_VERSION_PATCH)
-set(PYTHON_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}")
-
-# Make sure all directory separators are '/'
-string(REGEX REPLACE "\\\\" "/" PYTHON_PREFIX "${PYTHON_PREFIX}")
-string(REGEX REPLACE "\\\\" "/" PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR}")
-string(REGEX REPLACE "\\\\" "/" PYTHON_SITE_PACKAGES "${PYTHON_SITE_PACKAGES}")
-
-if(CMAKE_HOST_WIN32)
- set(PYTHON_LIBRARY "${PYTHON_PREFIX}/libs/python${PYTHON_LIBRARY_SUFFIX}.lib")
-
- # when run in a venv, PYTHON_PREFIX points to it. But the libraries remain in the
- # original python installation. They may be found relative to PYTHON_INCLUDE_DIR.
- if(NOT EXISTS "${PYTHON_LIBRARY}")
- get_filename_component(_PYTHON_ROOT ${PYTHON_INCLUDE_DIR} DIRECTORY)
- set(PYTHON_LIBRARY "${_PYTHON_ROOT}/libs/python${PYTHON_LIBRARY_SUFFIX}.lib")
- endif()
-
- # if we are in MSYS & MINGW, and we didn't find windows python lib, look for system python lib
- if(DEFINED ENV{MSYSTEM}
- AND MINGW
- AND NOT EXISTS "${PYTHON_LIBRARY}")
- if(PYTHON_MULTIARCH)
- set(_PYTHON_LIBS_SEARCH "${PYTHON_LIBDIR}/${PYTHON_MULTIARCH}" "${PYTHON_LIBDIR}")
- else()
- set(_PYTHON_LIBS_SEARCH "${PYTHON_LIBDIR}")
- endif()
- unset(PYTHON_LIBRARY)
- find_library(
- PYTHON_LIBRARY
- NAMES "python${PYTHON_LIBRARY_SUFFIX}"
- PATHS ${_PYTHON_LIBS_SEARCH}
- NO_DEFAULT_PATH)
- endif()
-
- # raise an error if the python libs are still not found.
- if(NOT EXISTS "${PYTHON_LIBRARY}")
- message(FATAL_ERROR "Python libraries not found")
- endif()
-
-else()
- if(PYTHON_MULTIARCH)
- set(_PYTHON_LIBS_SEARCH "${PYTHON_LIBDIR}/${PYTHON_MULTIARCH}" "${PYTHON_LIBDIR}")
- else()
- set(_PYTHON_LIBS_SEARCH "${PYTHON_LIBDIR}")
- endif()
- #message(STATUS "Searching for Python libs in ${_PYTHON_LIBS_SEARCH}")
- # Probably this needs to be more involved. It would be nice if the config
- # information the python interpreter itself gave us were more complete.
- find_library(
- PYTHON_LIBRARY
- NAMES "python${PYTHON_LIBRARY_SUFFIX}"
- PATHS ${_PYTHON_LIBS_SEARCH}
- NO_DEFAULT_PATH)
-
- # If all else fails, just set the name/version and let the linker figure out the path.
- if(NOT PYTHON_LIBRARY)
- set(PYTHON_LIBRARY python${PYTHON_LIBRARY_SUFFIX})
- endif()
-endif()
-
-mark_as_advanced(PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
-
-# We use PYTHON_INCLUDE_DIR, PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the
-# cache entries because they are meant to specify the location of a single
-# library. We now set the variables listed by the documentation for this
-# module.
-set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
-set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
-if(NOT PYTHON_DEBUG_LIBRARY)
- set(PYTHON_DEBUG_LIBRARY "")
-endif()
-set(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
-
-find_package_message(PYTHON "Found PythonLibs: ${PYTHON_LIBRARY}"
- "${PYTHON_EXECUTABLE}${PYTHON_VERSION_STRING}")
-
-set(PYTHONLIBS_FOUND TRUE)
-set(PythonLibsNew_FOUND TRUE)
-
-if(NOT PYTHON_MODULE_PREFIX)
- set(PYTHON_MODULE_PREFIX "")
-endif()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/check-style.sh b/3rdParty/pybind11/pybind11-2.6.0/tools/check-style.sh
deleted file mode 100755
index f7af2a4169744334af0b9c28823e98a502b813be..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/check-style.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# Script to check include/test code for common pybind11 code style errors.
-#
-# This script currently checks for
-#
-# 1. missing space between keyword and parenthesis, e.g.: for(, if(, while(
-# 2. Missing space between right parenthesis and brace, e.g. 'for (...){'
-# 3. opening brace on its own line. It should always be on the same line as the
-# if/while/for/do statement.
-#
-# Invoke as: tools/check-style.sh <filenames>
-#
-
-check_style_errors=0
-IFS=$'\n'
-
-
-found="$(grep '\<\(if\|for\|while\|catch\)(\|){' $@ -rn --color=always)"
-if [ -n "$found" ]; then
- echo -e '\033[31;01mError: found the following coding style problems:\033[0m'
- check_style_errors=1
- echo "$found" | sed -e 's/^/ /'
-fi
-
-found="$(awk '
-function prefix(filename, lineno) {
- return " \033[35m" filename "\033[36m:\033[32m" lineno "\033[36m:\033[0m"
-}
-function mark(pattern, string) { sub(pattern, "\033[01;31m&\033[0m", string); return string }
-last && /^\s*{/ {
- print prefix(FILENAME, FNR-1) mark("\\)\\s*$", last)
- print prefix(FILENAME, FNR) mark("^\\s*{", $0)
- last=""
-}
-{ last = /(if|for|while|catch|switch)\s*\(.*\)\s*$/ ? $0 : "" }
-' $(find include -type f) $@)"
-if [ -n "$found" ]; then
- check_style_errors=1
- echo -e '\033[31;01mError: braces should occur on the same line as the if/while/.. statement. Found issues in the following files:\033[0m'
- echo "$found"
-fi
-
-exit $check_style_errors
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/cmake_uninstall.cmake.in b/3rdParty/pybind11/pybind11-2.6.0/tools/cmake_uninstall.cmake.in
deleted file mode 100644
index 1e5d2bb876d17f24b88b19ddb525d4146869944b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# Source: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake
-
-if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
- message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
-endif()
-
-file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach(file ${files})
- message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
- if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
- exec_program(
- "@CMAKE_COMMAND@" ARGS
- "-E remove \"$ENV{DESTDIR}${file}\""
- OUTPUT_VARIABLE rm_out
- RETURN_VALUE rm_retval)
- if(NOT "${rm_retval}" STREQUAL 0)
- message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
- endif()
- else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
- message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
- endif()
-endforeach()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/libsize.py b/3rdParty/pybind11/pybind11-2.6.0/tools/libsize.py
deleted file mode 100644
index 589c317f0dc2c5fe5a7ad945137d38410d8d5c3e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/libsize.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function, division
-import os
-import sys
-
-# Internal build script for generating debugging test .so size.
-# Usage:
-# python libsize.py file.so save.txt -- displays the size of file.so and, if save.txt exists, compares it to the
-# size in it, then overwrites save.txt with the new size for future runs.
-
-if len(sys.argv) != 3:
- sys.exit("Invalid arguments: usage: python libsize.py file.so save.txt")
-
-lib = sys.argv[1]
-save = sys.argv[2]
-
-if not os.path.exists(lib):
- sys.exit("Error: requested file ({}) does not exist".format(lib))
-
-libsize = os.path.getsize(lib)
-
-print("------", os.path.basename(lib), "file size:", libsize, end="")
-
-if os.path.exists(save):
- with open(save) as sf:
- oldsize = int(sf.readline())
-
- if oldsize > 0:
- change = libsize - oldsize
- if change == 0:
- print(" (no change)")
- else:
- print(" (change of {:+} bytes = {:+.2%})".format(change, change / oldsize))
-else:
- print()
-
-with open(save, "w") as sf:
- sf.write(str(libsize))
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11Common.cmake b/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11Common.cmake
deleted file mode 100644
index d9317d03a4b2b6892a0f46b6e67fb3db3f1f4fe2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11Common.cmake
+++ /dev/null
@@ -1,387 +0,0 @@
-#[======================================================[.rst
-
-Adds the following targets::
-
- pybind11::pybind11 - link to headers and pybind11
- pybind11::module - Adds module links
- pybind11::embed - Adds embed links
- pybind11::lto - Link time optimizations (manual selection)
- pybind11::thin_lto - Link time optimizations (manual selection)
- pybind11::python_link_helper - Adds link to Python libraries
- pybind11::python2_no_register - Avoid warning/error with Python 2 + C++14/7
- pybind11::windows_extras - MSVC bigobj and mp for building multithreaded
- pybind11::opt_size - avoid optimizations that increase code size
-
-Adds the following functions::
-
- pybind11_strip(target) - strip target after building on linux/macOS
- pybind11_find_import(module) - See if a module is installed.
-
-#]======================================================]
-
-# CMake 3.10 has an include_guard command, but we can't use that yet
-if(TARGET pybind11::lto)
- return()
-endif()
-
-# If we are in subdirectory mode, all IMPORTED targets must be GLOBAL. If we
-# are in CONFIG mode, they should be "normal" targets instead.
-# In CMake 3.11+ you can promote a target to global after you create it,
-# which might be simpler than this check.
-get_property(
- is_config
- TARGET pybind11::headers
- PROPERTY IMPORTED)
-if(NOT is_config)
- set(optional_global GLOBAL)
-endif()
-
-# --------------------- Shared targets ----------------------------
-
-# Build an interface library target:
-add_library(pybind11::pybind11 IMPORTED INTERFACE ${optional_global})
-set_property(
- TARGET pybind11::pybind11
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::headers)
-
-# Build a module target:
-add_library(pybind11::module IMPORTED INTERFACE ${optional_global})
-set_property(
- TARGET pybind11::module
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11)
-
-# Build an embed library target:
-add_library(pybind11::embed IMPORTED INTERFACE ${optional_global})
-set_property(
- TARGET pybind11::embed
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11)
-
-# ----------------------- no register ----------------------
-
-# Workaround for Python 2.7 and C++17 (C++14 as a warning) incompatibility
-# This adds the flags -Wno-register and -Wno-deprecated-register if the compiler
-# is Clang 3.9+ or AppleClang and the compile language is CXX, or /wd5033 for MSVC (all languages,
-# since MSVC didn't recognize COMPILE_LANGUAGE until CMake 3.11+).
-
-add_library(pybind11::python2_no_register INTERFACE IMPORTED ${optional_global})
-set(clang_4plus
- "$<AND:$<CXX_COMPILER_ID:Clang>,$<NOT:$<VERSION_LESS:$<CXX_COMPILER_VERSION>,3.9>>>")
-set(no_register "$<OR:${clang_4plus},$<CXX_COMPILER_ID:AppleClang>>")
-
-if(MSVC AND CMAKE_VERSION VERSION_LESS 3.11)
- set(cxx_no_register "${no_register}")
-else()
- set(cxx_no_register "$<AND:$<COMPILE_LANGUAGE:CXX>,${no_register}>")
-endif()
-
-set(msvc "$<CXX_COMPILER_ID:MSVC>")
-
-set_property(
- TARGET pybind11::python2_no_register
- PROPERTY INTERFACE_COMPILE_OPTIONS
- "$<${cxx_no_register}:-Wno-register;-Wno-deprecated-register>" "$<${msvc}:/wd5033>")
-
-# --------------------------- link helper ---------------------------
-
-add_library(pybind11::python_link_helper IMPORTED INTERFACE ${optional_global})
-
-if(CMAKE_VERSION VERSION_LESS 3.13)
- # In CMake 3.11+, you can set INTERFACE properties via the normal methods, and
- # this would be simpler.
- set_property(
- TARGET pybind11::python_link_helper
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES "$<$<PLATFORM_ID:Darwin>:-undefined dynamic_lookup>")
-else()
- # link_options was added in 3.13+
- # This is safer, because you are ensured the deduplication pass in CMake will not consider
- # these separate and remove one but not the other.
- set_property(
- TARGET pybind11::python_link_helper
- APPEND
- PROPERTY INTERFACE_LINK_OPTIONS "$<$<PLATFORM_ID:Darwin>:LINKER:-undefined,dynamic_lookup>")
-endif()
-
-# ------------------------ Windows extras -------------------------
-
-add_library(pybind11::windows_extras IMPORTED INTERFACE ${optional_global})
-
-if(MSVC)
- # /MP enables multithreaded builds (relevant when there are many files), /bigobj is
- # needed for bigger binding projects due to the limit to 64k addressable sections
- set_property(
- TARGET pybind11::windows_extras
- APPEND
- PROPERTY INTERFACE_COMPILE_OPTIONS /bigobj)
-
- if(CMAKE_VERSION VERSION_LESS 3.11)
- set_property(
- TARGET pybind11::windows_extras
- APPEND
- PROPERTY INTERFACE_COMPILE_OPTIONS $<$<NOT:$<CONFIG:Debug>>:/MP>)
- else()
- # Only set these options for C++ files. This is important so that, for
- # instance, projects that include other types of source files like CUDA
- # .cu files don't get these options propagated to nvcc since that would
- # cause the build to fail.
- set_property(
- TARGET pybind11::windows_extras
- APPEND
- PROPERTY INTERFACE_COMPILE_OPTIONS $<$<NOT:$<CONFIG:Debug>>:$<$<COMPILE_LANGUAGE:CXX>:/MP>>)
- endif()
-endif()
-
-# ----------------------- Optimize binary size --------------------------
-
-add_library(pybind11::opt_size IMPORTED INTERFACE ${optional_global})
-
-if(MSVC)
- set(PYBIND11_OPT_SIZE /Os)
-else()
- set(PYBIND11_OPT_SIZE -Os)
-endif()
-
-set_property(
- TARGET pybind11::opt_size
- APPEND
- PROPERTY INTERFACE_COMPILE_OPTIONS $<$<CONFIG:Release>:${PYBIND11_OPT_SIZE}>
- $<$<CONFIG:MinSizeRel>:${PYBIND11_OPT_SIZE}>
- $<$<CONFIG:RelWithDebInfo>:${PYBIND11_OPT_SIZE}>)
-
-# ----------------------- Legacy option --------------------------
-
-# Warn or error if old variable name used
-if(PYBIND11_CPP_STANDARD)
- string(REGEX MATCH [[..$]] VAL "${PYBIND11_CPP_STANDARD}")
- if(CMAKE_CXX_STANDARD)
- if(NOT CMAKE_CXX_STANDARD STREQUAL VAL)
- message(WARNING "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} does not match "
- "PYBIND11_CPP_STANDARD=${PYBIND11_CPP_STANDARD}, "
- "please remove PYBIND11_CPP_STANDARD from your cache")
- endif()
- else()
- set(supported_standards 11 14 17 20)
- if("${VAL}" IN_LIST supported_standards)
- message(WARNING "USE -DCMAKE_CXX_STANDARD=${VAL} instead of PYBIND11_CPP_STANDARD")
- set(CMAKE_CXX_STANDARD
- ${VAL}
- CACHE STRING "From PYBIND11_CPP_STANDARD")
- else()
- message(FATAL_ERROR "PYBIND11_CPP_STANDARD should be replaced with CMAKE_CXX_STANDARD "
- "(last two chars: ${VAL} not understood as a valid CXX std)")
- endif()
- endif()
-endif()
-
-# --------------------- Python specifics -------------------------
-
-# Check to see which Python mode we are in, new, old, or no python
-if(PYBIND11_NOPYTHON)
- set(_pybind11_nopython ON)
-elseif(
- PYBIND11_FINDPYTHON
- OR Python_FOUND
- OR Python2_FOUND
- OR Python3_FOUND)
- # New mode
- include("${CMAKE_CURRENT_LIST_DIR}/pybind11NewTools.cmake")
-
-else()
-
- # Classic mode
- include("${CMAKE_CURRENT_LIST_DIR}/pybind11Tools.cmake")
-
-endif()
-
-# --------------------- pybind11_find_import -------------------------------
-
-if(NOT _pybind11_nopython)
- # Check to see if modules are importable. Use REQUIRED to force an error if
- # one of the modules is not found. <package_name>_FOUND will be set if the
- # package was found (underscores replace dashes if present). QUIET will hide
- # the found message, and VERSION will require a minimum version. A successful
- # find will cache the result.
- function(pybind11_find_import PYPI_NAME)
- # CMake variables need underscores (PyPI doesn't care)
- string(REPLACE "-" "_" NORM_PYPI_NAME "${PYPI_NAME}")
-
- # Return if found previously
- if(${NORM_PYPI_NAME}_FOUND)
- return()
- endif()
-
- set(options "REQUIRED;QUIET")
- set(oneValueArgs "VERSION")
- cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "" ${ARGN})
-
- if(ARG_REQUIRED)
- set(status_level FATAL_ERROR)
- else()
- set(status_level WARNING)
- endif()
-
- execute_process(
- COMMAND
- ${${_Python}_EXECUTABLE} -c
- "from pkg_resources import get_distribution; print(get_distribution('${PYPI_NAME}').version)"
- RESULT_VARIABLE RESULT_PRESENT
- OUTPUT_VARIABLE PKG_VERSION
- ERROR_QUIET)
-
- string(STRIP "${PKG_VERSION}" PKG_VERSION)
-
- # If a result is present, this failed
- if(RESULT_PRESENT)
- set(${NORM_PYPI_NAME}_FOUND
- ${NORM_PYPI_NAME}-NOTFOUND
- CACHE INTERNAL "")
- # Always warn or error
- message(
- ${status_level}
- "Missing: ${PYPI_NAME} ${ARG_VERSION}\nTry: ${${_Python}_EXECUTABLE} -m pip install ${PYPI_NAME}"
- )
- else()
- if(ARG_VERSION AND PKG_VERSION VERSION_LESS ARG_VERSION)
- message(
- ${status_level}
- "Version incorrect: ${PYPI_NAME} ${PKG_VERSION} found, ${ARG_VERSION} required - try upgrading"
- )
- else()
- set(${NORM_PYPI_NAME}_FOUND
- YES
- CACHE INTERNAL "")
- set(${NORM_PYPI_NAME}_VERSION
- ${PKG_VERSION}
- CACHE INTERNAL "")
- endif()
- if(NOT ARG_QUIET)
- message(STATUS "Found ${PYPI_NAME} ${PKG_VERSION}")
- endif()
- endif()
- if(NOT ARG_VERSION OR (NOT PKG_VERSION VERSION_LESS ARG_VERSION))
- # We have successfully found a good version, cache to avoid calling again.
- endif()
- endfunction()
-endif()
-
-# --------------------- LTO -------------------------------
-
-include(CheckCXXCompilerFlag)
-
-# Checks whether the given CXX/linker flags can compile and link a cxx file.
-# cxxflags and linkerflags are lists of flags to use. The result variable is a
-# unique variable name for each set of flags: the compilation result will be
-# cached base on the result variable. If the flags work, sets them in
-# cxxflags_out/linkerflags_out internal cache variables (in addition to
-# ${result}).
-function(_pybind11_return_if_cxx_and_linker_flags_work result cxxflags linkerflags cxxflags_out
- linkerflags_out)
- set(CMAKE_REQUIRED_LIBRARIES ${linkerflags})
- check_cxx_compiler_flag("${cxxflags}" ${result})
- if(${result})
- set(${cxxflags_out}
- "${cxxflags}"
- PARENT_SCOPE)
- set(${linkerflags_out}
- "${linkerflags}"
- PARENT_SCOPE)
- endif()
-endfunction()
-
-function(_pybind11_generate_lto target prefer_thin_lto)
- if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
- set(cxx_append "")
- set(linker_append "")
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT APPLE)
- # Clang Gold plugin does not support -Os; append -O3 to MinSizeRel builds to override it
- set(linker_append ";$<$<CONFIG:MinSizeRel>:-O3>")
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- set(cxx_append ";-fno-fat-lto-objects")
- endif()
-
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND prefer_thin_lto)
- _pybind11_return_if_cxx_and_linker_flags_work(
- HAS_FLTO_THIN "-flto=thin${cxx_append}" "-flto=thin${linker_append}"
- PYBIND11_LTO_CXX_FLAGS PYBIND11_LTO_LINKER_FLAGS)
- endif()
-
- if(NOT HAS_FLTO_THIN)
- _pybind11_return_if_cxx_and_linker_flags_work(
- HAS_FLTO "-flto${cxx_append}" "-flto${linker_append}" PYBIND11_LTO_CXX_FLAGS
- PYBIND11_LTO_LINKER_FLAGS)
- endif()
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
- # Intel equivalent to LTO is called IPO
- _pybind11_return_if_cxx_and_linker_flags_work(HAS_INTEL_IPO "-ipo" "-ipo"
- PYBIND11_LTO_CXX_FLAGS PYBIND11_LTO_LINKER_FLAGS)
- elseif(MSVC)
- # cmake only interprets libraries as linker flags when they start with a - (otherwise it
- # converts /LTCG to \LTCG as if it was a Windows path). Luckily MSVC supports passing flags
- # with - instead of /, even if it is a bit non-standard:
- _pybind11_return_if_cxx_and_linker_flags_work(HAS_MSVC_GL_LTCG "/GL" "-LTCG"
- PYBIND11_LTO_CXX_FLAGS PYBIND11_LTO_LINKER_FLAGS)
- endif()
-
- # Enable LTO flags if found, except for Debug builds
- if(PYBIND11_LTO_CXX_FLAGS)
- # CONFIG takes multiple values in CMake 3.19+, until then we have to use OR
- set(is_debug "$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>")
- set(not_debug "$<NOT:${is_debug}>")
- set(cxx_lang "$<COMPILE_LANGUAGE:CXX>")
- if(MSVC AND CMAKE_VERSION VERSION_LESS 3.11)
- set(genex "${not_debug}")
- else()
- set(genex "$<AND:${not_debug},${cxx_lang}>")
- endif()
- set_property(
- TARGET ${target}
- APPEND
- PROPERTY INTERFACE_COMPILE_OPTIONS "$<${genex}:${PYBIND11_LTO_CXX_FLAGS}>")
- if(CMAKE_PROJECT_NAME STREQUAL "pybind11")
- message(STATUS "${target} enabled")
- endif()
- else()
- if(CMAKE_PROJECT_NAME STREQUAL "pybind11")
- message(STATUS "${target} disabled (not supported by the compiler and/or linker)")
- endif()
- endif()
-
- if(PYBIND11_LTO_LINKER_FLAGS)
- if(CMAKE_VERSION VERSION_LESS 3.11)
- set_property(
- TARGET ${target}
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES "$<${not_debug}:${PYBIND11_LTO_LINKER_FLAGS}>")
- else()
- set_property(
- TARGET ${target}
- APPEND
- PROPERTY INTERFACE_LINK_OPTIONS "$<${not_debug}:${PYBIND11_LTO_LINKER_FLAGS}>")
- endif()
- endif()
-endfunction()
-
-add_library(pybind11::lto IMPORTED INTERFACE ${optional_global})
-_pybind11_generate_lto(pybind11::lto FALSE)
-
-add_library(pybind11::thin_lto IMPORTED INTERFACE ${optional_global})
-_pybind11_generate_lto(pybind11::thin_lto TRUE)
-
-# ---------------------- pybind11_strip -----------------------------
-
-function(pybind11_strip target_name)
- # Strip unnecessary sections of the binary on Linux/macOS
- if(CMAKE_STRIP)
- if(APPLE)
- set(x_opt -x)
- endif()
-
- add_custom_command(
- TARGET ${target_name}
- POST_BUILD
- COMMAND ${CMAKE_STRIP} ${x_opt} $<TARGET_FILE:${target_name}>)
- endif()
-endfunction()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11Config.cmake.in b/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11Config.cmake.in
deleted file mode 100644
index 9808f3d255732385cf607aa4b7270fc6d596bce2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11Config.cmake.in
+++ /dev/null
@@ -1,232 +0,0 @@
-#[=============================================================================[.rst:
-
-pybind11Config.cmake
-####################
-
-Exported variables
-==================
-
-This module sets the following variables in your project:
-
-``pybind11_FOUND``
- true if pybind11 and all required components found on the system
-``pybind11_VERSION``
- pybind11 version in format Major.Minor.Release
-``pybind11_VERSION_TYPE``
- pybind11 version type (dev, release)
-``pybind11_INCLUDE_DIRS``
- Directories where pybind11 and python headers are located.
-``pybind11_INCLUDE_DIR``
- Directory where pybind11 headers are located.
-``pybind11_DEFINITIONS``
- Definitions necessary to use pybind11, namely USING_pybind11.
-``pybind11_LIBRARIES``
- Compile flags and python libraries (as needed) to link against.
-``pybind11_LIBRARY``
- Empty.
-
-Available components: None
-
-
-Exported targets
-================
-
-If pybind11 is found, this module defines the following ``IMPORTED``
-interface library targets:
-
-``pybind11::module``
- for extension modules.
-``pybind11::embed``
- for embedding the Python interpreter.
-
-Python headers, libraries (as needed by platform), and the C++ standard
-are attached to the target.
-
-Advanced targets are also supplied - these are primary for users building
-complex applications, and they are available in all modes:
-
-``pybind11::headers``
- Just the pybind11 headers and minimum compile requirements.
-``pybind11::pybind11``
- Python headers too.
-``pybind11::python_link_helper``
- Just the "linking" part of ``pybind11:module``, for CMake < 3.15.
-``pybind11::python2_no_register``
- Quiets the warning/error when mixing C++14+ and Python 2, also included in ``pybind11::module``.
-``pybind11::thin_lto``
- An alternative to ``INTERPROCEDURAL_OPTIMIZATION``.
-``pybind11::lto``
- An alternative to ``INTERPROCEDURAL_OPTIMIZATION`` (also avoids thin LTO on clang).
-``pybind11::windows_extras``
- Adds bigobj and mp for MSVC.
-
-Modes
-=====
-
-There are two modes provided; classic, which is built on the old Python
-discovery packages in CMake, or the new FindPython mode, which uses FindPython
-from 3.12+ forward (3.15+ _highly_ recommended).
-
-New FindPython mode
-^^^^^^^^^^^^^^^^^^^
-
-To activate this mode, either call ``find_package(Python COMPONENTS Interpreter Development)``
-before finding this package, or set the ``PYBIND11_FINDPYTHON`` variable to ON. In this mode,
-you can either use the basic targets, or use the FindPython tools:
-
-.. code-block:: cmake
-
- find_package(Python COMPONENTS Interpreter Development)
- find_package(pybind11 CONFIG)
-
- # pybind11 method:
- pybind11_add_module(MyModule1 src1.cpp)
-
- # Python method:
- Python_add_library(MyModule2 src2.cpp)
- target_link_libraries(MyModule2 pybind11::headers)
- set_target_properties(MyModule2 PROPERTIES
- INTERPROCEDURAL_OPTIMIZATION ON
- CXX__VISIBILITY_PRESET ON
- VISIBLITY_INLINES_HIDDEN ON)
-
-If you build targets yourself, you may be interested in stripping the output
-for reduced size; this is the one other feature that the helper function gives you.
-
-Classic mode
-^^^^^^^^^^^^
-
-Set PythonLibsNew variables to influence python detection and
-CMAKE_CXX_STANDARD to influence standard setting.
-
-.. code-block:: cmake
-
- find_package(pybind11 CONFIG REQUIRED)
-
- # Create an extension module
- add_library(mylib MODULE main.cpp)
- target_link_libraries(mylib PUBLIC pybind11::module)
-
- # Or embed the Python interpreter into an executable
- add_executable(myexe main.cpp)
- target_link_libraries(myexe PUBLIC pybind11::embed)
-
-
-Hints
-=====
-
-The following variables can be set to guide the search for this package:
-
-``pybind11_DIR``
- CMake variable, set to directory containing this Config file.
-``CMAKE_PREFIX_PATH``
- CMake variable, set to root directory of this package.
-``PATH``
- Environment variable, set to bin directory of this package.
-``CMAKE_DISABLE_FIND_PACKAGE_pybind11``
- CMake variable, disables ``find_package(pybind11)`` when not ``REQUIRED``,
- perhaps to force internal build.
-
-Commands
-========
-
-pybind11_add_module
-^^^^^^^^^^^^^^^^^^^
-
-This module defines the following commands to assist with creating Python modules:
-
-.. code-block:: cmake
-
- pybind11_add_module(<target>
- [STATIC|SHARED|MODULE]
- [THIN_LTO] [OPT_SIZE] [NO_EXTRAS] [WITHOUT_SOBAI]
- <files>...
- )
-
-Add a module and setup all helpers. You can select the type of the library; the
-default is ``MODULE``. There are several options:
-
-``OPT_SIZE``
- Optimize for size, even if the ``CMAKE_BUILD_TYPE`` is not ``RelSize``.
-``THIN_LTO``
- Use thin TLO instead of regular if there's a choice (pybind11's selection
- is disabled if ``CMAKE_INTERPROCEDURAL_OPTIMIZATIONS`` is set).
-``WITHOUT_SOABI``
- Disable the SOABI component (``PYBIND11_NEWPYTHON`` mode only).
-``NO_EXTRAS``
- Disable all extras, exit immediately after making the module.
-
-pybind11_strip
-^^^^^^^^^^^^^^
-
-.. code-block:: cmake
-
- pybind11_strip(<target>)
-
-Strip a target after building it (linux/macOS), called by ``pybind11_add_module``.
-
-pybind11_extension
-^^^^^^^^^^^^^^^^^^
-
-.. code-block:: cmake
-
- pybind11_extension(<target>)
-
-Sets the Python extension name correctly for Python on your platform, called by
-``pybind11_add_module``.
-
-pybind11_find_import(module)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. code-block:: cmake
-
- pybind11_find_import(<module> [VERSION <number>] [REQUIRED] [QUIET])
-
-See if a module is installed. Use the registered name (the one on PyPI). You
-can specify a ``VERSION``, and you can specify ``REQUIRED`` or ``QUIET``. Only available if
-``NOPYTHON`` mode is not active. Sets ``module_VERSION`` and ``module_FOUND``. Caches the
-result once a valid install is found.
-
-Suggested usage
-===============
-
-Using ``find_package`` with version info is not recommended except for release versions.
-
-.. code-block:: cmake
-
- find_package(pybind11 CONFIG)
- find_package(pybind11 2.0 EXACT CONFIG REQUIRED)
-
-#]=============================================================================]
-@PACKAGE_INIT@
-
-# Location of pybind11/pybind11.h
-set(pybind11_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
-
-set(pybind11_LIBRARY "")
-set(pybind11_DEFINITIONS USING_pybind11)
-set(pybind11_VERSION_TYPE "@pybind11_VERSION_TYPE@")
-
-check_required_components(pybind11)
-
-if(TARGET pybind11::python_link_helper)
- # This has already been setup elsewhere, such as with a previous call or
- # add_subdirectory
- return()
-endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/pybind11Targets.cmake")
-
-# Easier to use / remember
-add_library(pybind11::headers IMPORTED INTERFACE)
-set_target_properties(pybind11::headers PROPERTIES INTERFACE_LINK_LIBRARIES
- pybind11::pybind11_headers)
-
-include("${CMAKE_CURRENT_LIST_DIR}/pybind11Common.cmake")
-
-if(NOT pybind11_FIND_QUIETLY)
- message(
- STATUS
- "Found pybind11: ${pybind11_INCLUDE_DIR} (found version \"${pybind11_VERSION}\" ${pybind11_VERSION_TYPE})"
- )
-endif()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11NewTools.cmake b/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11NewTools.cmake
deleted file mode 100644
index bc9fa18690ea2574ed686fe60ea39f5fa18b27a0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11NewTools.cmake
+++ /dev/null
@@ -1,242 +0,0 @@
-# tools/pybind11NewTools.cmake -- Build system for the pybind11 modules
-#
-# Copyright (c) 2020 Wenzel Jakob <wenzel@inf.ethz.ch> and Henry Schreiner
-#
-# All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-get_property(
- is_config
- TARGET pybind11::headers
- PROPERTY IMPORTED)
-
-if(pybind11_FIND_QUIETLY)
- set(_pybind11_quiet QUIET)
-endif()
-
-if(CMAKE_VERSION VERSION_LESS 3.12)
- message(FATAL_ERROR "You cannot use the new FindPython module with CMake < 3.12")
-endif()
-
-if(NOT Python_FOUND
- AND NOT Python3_FOUND
- AND NOT Python2_FOUND)
- if(NOT DEFINED Python_FIND_IMPLEMENTATIONS)
- set(Python_FIND_IMPLEMENTATIONS CPython PyPy)
- endif()
-
- # GitHub Actions like activation
- if(NOT DEFINED Python_ROOT_DIR AND DEFINED ENV{pythonLocation})
- set(Python_ROOT_DIR "$ENV{pythonLocation}")
- endif()
-
- find_package(Python REQUIRED COMPONENTS Interpreter Development ${_pybind11_quiet})
-
- # If we are in submodule mode, export the Python targets to global targets.
- # If this behavior is not desired, FindPython _before_ pybind11.
- if(NOT is_config)
- set_property(TARGET Python::Python PROPERTY IMPORTED_GLOBAL TRUE)
- set_property(TARGET Python::Interpreter PROPERTY IMPORTED_GLOBAL TRUE)
- if(TARGET Python::Module)
- set_property(TARGET Python::Module PROPERTY IMPORTED_GLOBAL TRUE)
- endif()
- endif()
-endif()
-
-if(Python_FOUND)
- set(_Python
- Python
- CACHE INTERNAL "" FORCE)
-elseif(Python3_FOUND AND NOT Python2_FOUND)
- set(_Python
- Python3
- CACHE INTERNAL "" FORCE)
-elseif(Python2_FOUND AND NOT Python3_FOUND)
- set(_Python
- Python2
- CACHE INTERNAL "" FORCE)
-else()
- message(AUTHOR_WARNING "Python2 and Python3 both present, pybind11 in "
- "PYBIND11_NOPYTHON mode (manually activate to silence warning)")
- set(_pybind11_nopython ON)
- return()
-endif()
-
-if(PYBIND11_MASTER_PROJECT)
- if(${_Python}_INTERPRETER_ID MATCHES "PyPy")
- message(STATUS "PyPy ${${_Python}_PyPy_VERSION} (Py ${${_Python}_VERSION})")
- else()
- message(STATUS "${_Python} ${${_Python}_VERSION}")
- endif()
-endif()
-
-# If a user finds Python, they may forget to include the Interpreter component
-# and the following two steps require it. It is highly recommended by CMake
-# when finding development libraries anyway, so we will require it.
-if(NOT DEFINED ${_Python}_EXECUTABLE)
- message(
- FATAL_ERROR
- "${_Python} was found without the Interpreter component. Pybind11 requires this component.")
-
-endif()
-
-if(NOT DEFINED PYTHON_IS_DEBUG)
- # Debug check - see https://stackoverflow.com/questions/646518/python-how-to-detect-debug-Interpreter
- execute_process(
- COMMAND "${${_Python}_EXECUTABLE}" "-c"
- "import sys; sys.exit(hasattr(sys, 'gettotalrefcount'))"
- RESULT_VARIABLE _PYTHON_IS_DEBUG)
- set(PYTHON_IS_DEBUG
- "${_PYTHON_IS_DEBUG}"
- CACHE INTERNAL "Python debug status")
-endif()
-
-# Get the suffix - SO is deprecated, should use EXT_SUFFIX, but this is
-# required for PyPy3 (as of 7.3.1)
-if(NOT DEFINED PYTHON_MODULE_EXTENSION)
- execute_process(
- COMMAND "${${_Python}_EXECUTABLE}" "-c"
- "from distutils import sysconfig; print(sysconfig.get_config_var('SO'))"
- OUTPUT_VARIABLE _PYTHON_MODULE_EXTENSION
- ERROR_VARIABLE _PYTHON_MODULE_EXTENSION_ERR
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- if(_PYTHON_MODULE_EXTENSION STREQUAL "")
- message(
- FATAL_ERROR "pybind11 could not query the module file extension, likely the 'distutils'"
- "package is not installed. Full error message:\n${_PYTHON_MODULE_EXTENSION_ERR}")
- endif()
-
- # This needs to be available for the pybind11_extension function
- set(PYTHON_MODULE_EXTENSION
- "${_PYTHON_MODULE_EXTENSION}"
- CACHE INTERNAL "")
-endif()
-
-# Python debug libraries expose slightly different objects before 3.8
-# https://docs.python.org/3.6/c-api/intro.html#debugging-builds
-# https://stackoverflow.com/questions/39161202/how-to-work-around-missing-pymodule-create2-in-amd64-win-python35-d-lib
-if(PYTHON_IS_DEBUG)
- set_property(
- TARGET pybind11::pybind11
- APPEND
- PROPERTY INTERFACE_COMPILE_DEFINITIONS Py_DEBUG)
-endif()
-
-# Check on every access - since Python2 and Python3 could have been used - do nothing in that case.
-
-if(DEFINED ${_Python}_INCLUDE_DIRS)
- set_property(
- TARGET pybind11::pybind11
- APPEND
- PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${${_Python}_INCLUDE_DIRS}>)
-endif()
-
-if(DEFINED ${_Python}_VERSION AND ${_Python}_VERSION VERSION_LESS 3)
- set_property(
- TARGET pybind11::pybind11
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::python2_no_register)
-endif()
-
-# In CMake 3.18+, you can find these separately, so include an if
-if(TARGET ${_Python}::${_Python})
- set_property(
- TARGET pybind11::embed
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES ${_Python}::${_Python})
-endif()
-
-# CMake 3.15+ has this
-if(TARGET ${_Python}::Module)
- set_property(
- TARGET pybind11::module
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES ${_Python}::Module)
-else()
- set_property(
- TARGET pybind11::module
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::python_link_helper)
-endif()
-
-# WITHOUT_SOABI and WITH_SOABI will disable the custom extension handling used by pybind11.
-# WITH_SOABI is passed on to python_add_library.
-function(pybind11_add_module target_name)
- cmake_parse_arguments(PARSE_ARGV 1 ARG
- "STATIC;SHARED;MODULE;THIN_LTO;OPT_SIZE;NO_EXTRAS;WITHOUT_SOABI" "" "")
-
- if(ARG_ADD_LIBRARY_STATIC)
- set(type STATIC)
- elseif(ARG_ADD_LIBRARY_SHARED)
- set(type SHARED)
- else()
- set(type MODULE)
- endif()
-
- if("${_Python}" STREQUAL "Python")
- python_add_library(${target_name} ${type} ${ARG_UNPARSED_ARGUMENTS})
- elseif("${_Python}" STREQUAL "Python3")
- python3_add_library(${target_name} ${type} ${ARG_UNPARSED_ARGUMENTS})
- elseif("${_Python}" STREQUAL "Python2")
- python2_add_library(${target_name} ${type} ${ARG_UNPARSED_ARGUMENTS})
- else()
- message(FATAL_ERROR "Cannot detect FindPython version: ${_Python}")
- endif()
-
- target_link_libraries(${target_name} PRIVATE pybind11::headers)
-
- if(type STREQUAL "MODULE")
- target_link_libraries(${target_name} PRIVATE pybind11::module)
- else()
- target_link_libraries(${target_name} PRIVATE pybind11::embed)
- endif()
-
- if(MSVC)
- target_link_libraries(${target_name} PRIVATE pybind11::windows_extras)
- endif()
-
- if(DEFINED ${_Python}_VERSION AND ${_Python}_VERSION VERSION_LESS 3)
- target_link_libraries(${target_name} PRIVATE pybind11::python2_no_register)
- endif()
-
- set_target_properties(${target_name} PROPERTIES CXX_VISIBILITY_PRESET "hidden"
- CUDA_VISIBILITY_PRESET "hidden")
-
- # If we don't pass a WITH_SOABI or WITHOUT_SOABI, use our own default handling of extensions
- if("${type}" STREQUAL "MODULE" AND (NOT ARG_WITHOUT_SOABI OR NOT "WITH_SOABI" IN_LIST
- ARG_UNPARSED_ARGUMENTS))
- pybind11_extension(${target_name})
- endif()
-
- if(ARG_NO_EXTRAS)
- return()
- endif()
-
- if(NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
- if(ARG_THIN_LTO)
- target_link_libraries(${target_name} PRIVATE pybind11::thin_lto)
- else()
- target_link_libraries(${target_name} PRIVATE pybind11::lto)
- endif()
- endif()
-
- if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo)
- # Strip unnecessary sections of the binary on Linux/macOS
- pybind11_strip(${target_name})
- endif()
-
- if(MSVC)
- target_link_libraries(${target_name} PRIVATE pybind11::windows_extras)
- endif()
-
- if(ARG_OPT_SIZE)
- target_link_libraries(${target_name} PRIVATE pybind11::opt_size)
- endif()
-endfunction()
-
-function(pybind11_extension name)
- # The extension is precomputed
- set_target_properties(${name} PROPERTIES PREFIX "" SUFFIX "${PYTHON_MODULE_EXTENSION}")
-
-endfunction()
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11Tools.cmake b/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11Tools.cmake
deleted file mode 100644
index f6ee9788d3b0b820b2ea2c4c86bcd76e9b34e9c3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/pybind11Tools.cmake
+++ /dev/null
@@ -1,196 +0,0 @@
-# tools/pybind11Tools.cmake -- Build system for the pybind11 modules
-#
-# Copyright (c) 2020 Wenzel Jakob <wenzel.jakob@epfl.ch>
-#
-# All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Built-in in CMake 3.5+
-include(CMakeParseArguments)
-
-if(pybind11_FIND_QUIETLY)
- set(_pybind11_quiet QUIET)
-endif()
-
-# If this is the first run, PYTHON_VERSION can stand in for PYBIND11_PYTHON_VERSION
-if(NOT DEFINED PYBIND11_PYTHON_VERSION AND DEFINED PYTHON_VERSION)
- message(WARNING "Set PYBIND11_PYTHON_VERSION to search for a specific version, not "
- "PYTHON_VERSION (which is an output). Assuming that is what you "
- "meant to do and continuing anyway.")
- set(PYBIND11_PYTHON_VERSION
- "${PYTHON_VERSION}"
- CACHE STRING "Python version to use for compiling modules")
- unset(PYTHON_VERSION)
- unset(PYTHON_VERSION CACHE)
-else()
- # If this is set as a normal variable, promote it, otherwise, make an empty cache variable.
- set(PYBIND11_PYTHON_VERSION
- "${PYBIND11_PYTHON_VERSION}"
- CACHE STRING "Python version to use for compiling modules")
-endif()
-
-# A user can set versions manually too
-set(Python_ADDITIONAL_VERSIONS
- "3.9;3.8;3.7;3.6;3.5;3.4"
- CACHE INTERNAL "")
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})
-list(REMOVE_AT CMAKE_MODULE_PATH -1)
-
-# Cache variables so pybind11_add_module can be used in parent projects
-set(PYTHON_INCLUDE_DIRS
- ${PYTHON_INCLUDE_DIRS}
- CACHE INTERNAL "")
-set(PYTHON_LIBRARIES
- ${PYTHON_LIBRARIES}
- CACHE INTERNAL "")
-set(PYTHON_MODULE_PREFIX
- ${PYTHON_MODULE_PREFIX}
- CACHE INTERNAL "")
-set(PYTHON_MODULE_EXTENSION
- ${PYTHON_MODULE_EXTENSION}
- CACHE INTERNAL "")
-set(PYTHON_VERSION_MAJOR
- ${PYTHON_VERSION_MAJOR}
- CACHE INTERNAL "")
-set(PYTHON_VERSION_MINOR
- ${PYTHON_VERSION_MINOR}
- CACHE INTERNAL "")
-set(PYTHON_VERSION
- ${PYTHON_VERSION}
- CACHE INTERNAL "")
-set(PYTHON_IS_DEBUG
- "${PYTHON_IS_DEBUG}"
- CACHE INTERNAL "")
-
-if(PYBIND11_MASTER_PROJECT)
- if(PYTHON_MODULE_EXTENSION MATCHES "pypy")
- if(NOT DEFINED PYPY_VERSION)
- execute_process(
- COMMAND ${PYTHON_EXECUTABLE} -c
- [=[import sys; sys.stdout.write(".".join(map(str, sys.pypy_version_info[:3])))]=]
- OUTPUT_VARIABLE pypy_version)
- set(PYPY_VERSION
- ${pypy_version}
- CACHE INTERNAL "")
- endif()
- message(STATUS "PYPY ${PYPY_VERSION} (Py ${PYTHON_VERSION})")
- else()
- message(STATUS "PYTHON ${PYTHON_VERSION}")
- endif()
-endif()
-
-# Only add Python for build - must be added during the import for config since it has to be re-discovered.
-set_property(
- TARGET pybind11::pybind11
- APPEND
- PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${PYTHON_INCLUDE_DIRS}>)
-
-# Python debug libraries expose slightly different objects before 3.8
-# https://docs.python.org/3.6/c-api/intro.html#debugging-builds
-# https://stackoverflow.com/questions/39161202/how-to-work-around-missing-pymodule-create2-in-amd64-win-python35-d-lib
-if(PYTHON_IS_DEBUG)
- set_property(
- TARGET pybind11::pybind11
- APPEND
- PROPERTY INTERFACE_COMPILE_DEFINITIONS Py_DEBUG)
-endif()
-
-set_property(
- TARGET pybind11::module
- APPEND
- PROPERTY
- INTERFACE_LINK_LIBRARIES pybind11::python_link_helper
- "$<$<OR:$<PLATFORM_ID:Windows>,$<PLATFORM_ID:Cygwin>>:$<BUILD_INTERFACE:${PYTHON_LIBRARIES}>>")
-
-if(PYTHON_VERSION VERSION_LESS 3)
- set_property(
- TARGET pybind11::pybind11
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::python2_no_register)
-endif()
-
-set_property(
- TARGET pybind11::embed
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11 $<BUILD_INTERFACE:${PYTHON_LIBRARIES}>)
-
-function(pybind11_extension name)
- # The prefix and extension are provided by FindPythonLibsNew.cmake
- set_target_properties(${name} PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}"
- SUFFIX "${PYTHON_MODULE_EXTENSION}")
-endfunction()
-
-# Build a Python extension module:
-# pybind11_add_module(<name> [MODULE | SHARED] [EXCLUDE_FROM_ALL]
-# [NO_EXTRAS] [THIN_LTO] [OPT_SIZE] source1 [source2 ...])
-#
-function(pybind11_add_module target_name)
- set(options "MODULE;SHARED;EXCLUDE_FROM_ALL;NO_EXTRAS;SYSTEM;THIN_LTO;OPT_SIZE")
- cmake_parse_arguments(ARG "${options}" "" "" ${ARGN})
-
- if(ARG_MODULE AND ARG_SHARED)
- message(FATAL_ERROR "Can't be both MODULE and SHARED")
- elseif(ARG_SHARED)
- set(lib_type SHARED)
- else()
- set(lib_type MODULE)
- endif()
-
- if(ARG_EXCLUDE_FROM_ALL)
- set(exclude_from_all EXCLUDE_FROM_ALL)
- else()
- set(exclude_from_all "")
- endif()
-
- add_library(${target_name} ${lib_type} ${exclude_from_all} ${ARG_UNPARSED_ARGUMENTS})
-
- target_link_libraries(${target_name} PRIVATE pybind11::module)
-
- if(ARG_SYSTEM)
- message(
- STATUS
- "Warning: this does not have an effect - use NO_SYSTEM_FROM_IMPORTED if using imported targets"
- )
- endif()
-
- pybind11_extension(${target_name})
-
- # -fvisibility=hidden is required to allow multiple modules compiled against
- # different pybind versions to work properly, and for some features (e.g.
- # py::module_local). We force it on everything inside the `pybind11`
- # namespace; also turning it on for a pybind module compilation here avoids
- # potential warnings or issues from having mixed hidden/non-hidden types.
- set_target_properties(${target_name} PROPERTIES CXX_VISIBILITY_PRESET "hidden"
- CUDA_VISIBILITY_PRESET "hidden")
-
- if(ARG_NO_EXTRAS)
- return()
- endif()
-
- if(NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
- if(ARG_THIN_LTO)
- target_link_libraries(${target_name} PRIVATE pybind11::thin_lto)
- else()
- target_link_libraries(${target_name} PRIVATE pybind11::lto)
- endif()
- endif()
-
- if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo)
- pybind11_strip(${target_name})
- endif()
-
- if(MSVC)
- target_link_libraries(${target_name} PRIVATE pybind11::windows_extras)
- endif()
-
- if(ARG_OPT_SIZE)
- target_link_libraries(${target_name} PRIVATE pybind11::opt_size)
- endif()
-endfunction()
-
-# Provide general way to call common Python commands in "common" file.
-set(_Python
- PYTHON
- CACHE INTERNAL "" FORCE)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/pyproject.toml b/3rdParty/pybind11/pybind11-2.6.0/tools/pyproject.toml
deleted file mode 100644
index 8fe2f47af9a18ad9f272357023d09f78aefebe2d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/pyproject.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools>=42", "wheel"]
-build-backend = "setuptools.build_meta"
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/setup_global.py.in b/3rdParty/pybind11/pybind11-2.6.0/tools/setup_global.py.in
deleted file mode 100644
index 4cf040b2d8102bc9220f4858114b217750173923..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/setup_global.py.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Setup script for pybind11-global (in the sdist or in tools/setup_global.py in the repository)
-# This package is targeted for easy use from CMake.
-
-import contextlib
-import glob
-import os
-import re
-import shutil
-import subprocess
-import sys
-import tempfile
-
-# Setuptools has to be before distutils
-from setuptools import setup
-
-from distutils.command.install_headers import install_headers
-
-class InstallHeadersNested(install_headers):
- def run(self):
- headers = self.distribution.headers or []
- for header in headers:
- # Remove pybind11/include/
- short_header = header.split("/", 2)[-1]
-
- dst = os.path.join(self.install_dir, os.path.dirname(short_header))
- self.mkpath(dst)
- (out, _) = self.copy_file(header, dst)
- self.outfiles.append(out)
-
-
-main_headers = glob.glob("pybind11/include/pybind11/*.h")
-detail_headers = glob.glob("pybind11/include/pybind11/detail/*.h")
-cmake_files = glob.glob("pybind11/share/cmake/pybind11/*.cmake")
-headers = main_headers + detail_headers
-
-cmdclass = {"install_headers": InstallHeadersNested}
-$extra_cmd
-
-# This will _not_ affect installing from wheels,
-# only building wheels or installing from SDist.
-# Primarily intended on Windows, where this is sometimes
-# customized (for example, conda-forge uses Library/)
-base = os.environ.get("PYBIND11_GLOBAL_PREFIX", "")
-
-# Must have a separator
-if base and not base.endswith("/"):
- base += "/"
-
-setup(
- name="pybind11_global",
- version="$version",
- packages=[],
- headers=headers,
- data_files=[
- (base + "share/cmake/pybind11", cmake_files),
- (base + "include/pybind11", main_headers),
- (base + "include/pybind11/detail", detail_headers),
- ],
- cmdclass=cmdclass,
-)
diff --git a/3rdParty/pybind11/pybind11-2.6.0/tools/setup_main.py.in b/3rdParty/pybind11/pybind11-2.6.0/tools/setup_main.py.in
deleted file mode 100644
index 2231a08fdc1d4f0c9a0241e744d99bef486270bf..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.6.0/tools/setup_main.py.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Setup script (in the sdist or in tools/setup_main.py in the repository)
-
-from setuptools import setup
-
-cmdclass = {}
-$extra_cmd
-
-setup(
- name="pybind11",
- version="$version",
- download_url='https://github.com/pybind/pybind11/tarball/v$version',
- packages=[
- "pybind11",
- "pybind11.include.pybind11",
- "pybind11.include.pybind11.detail",
- "pybind11.share.cmake.pybind11",
- ],
- package_data={
- "pybind11": ["py.typed", "*.pyi"],
- "pybind11.include.pybind11": ["*.h"],
- "pybind11.include.pybind11.detail": ["*.h"],
- "pybind11.share.cmake.pybind11": ["*.cmake"],
- },
- extras_require={
- "global": ["pybind11_global==$version"]
- },
- entry_points={
- "console_scripts": [
- "pybind11-config = pybind11.__main__:main",
- ]
- },
- cmdclass=cmdclass
-)
diff --git a/CMake/Sanitizers.cmake b/CMake/Sanitizers.cmake
index 6f16207fefbc2f9ca72f065950b242a4333d442e..ea37a66a1ed7d4416a5fbe54afc2390e168d848b 100644
--- a/CMake/Sanitizers.cmake
+++ b/CMake/Sanitizers.cmake
@@ -52,6 +52,7 @@ function(enable_sanitizers project_name)
"${LIST_OF_SANITIZERS}"
STREQUAL
"")
+ message(STATUS "Enabling sanitizers: ${LIST_OF_SANITIZERS}")
target_compile_options(${project_name} INTERFACE -fsanitize=${LIST_OF_SANITIZERS})
target_link_options(${project_name} INTERFACE -fsanitize=${LIST_OF_SANITIZERS})
endif()
diff --git a/CMake/VirtualFluidsMacros.cmake b/CMake/VirtualFluidsMacros.cmake
index 4fd163b2cc1b53fe461ef482d906f4cb1255a76c..2bf2a979e6bbed32fc229e99739c79b601b007f2 100644
--- a/CMake/VirtualFluidsMacros.cmake
+++ b/CMake/VirtualFluidsMacros.cmake
@@ -246,8 +246,8 @@ function(vf_add_library)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(${library_name} PRIVATE ${CMAKE_BINARY_DIR})
target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR})
- target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/gpu)
- target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/cpu)
+ target_include_directories(${library_name} PUBLIC ${VF_SRC_DIR}/gpu)
+ target_include_directories(${library_name} PUBLIC ${VF_SRC_DIR}/cpu)
if(BUILD_VF_GPU)
target_include_directories(${library_name} PRIVATE "${VF_THIRD_DIR}/cuda_samples/")
diff --git a/CMake/compilerflags/GNU.cmake b/CMake/compilerflags/GNU.cmake
index 8d54b52a434719a1e99aa705b121593973f3375a..cf77b2228e1ac470f064db71c8f8e87f33902f04 100644
--- a/CMake/compilerflags/GNU.cmake
+++ b/CMake/compilerflags/GNU.cmake
@@ -17,10 +17,10 @@ if(NOT BUILD_VF_INCLUDE_WHAT_YOU_USE) # optimization flag '-funroll-all-loops' i
endif()
# gcov
-if (BUILD_VF_COVERAGE)
- list(APPEND CS_COMPILER_FLAGS_CXX "--coverage")
- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " --coverage")
-endif()
+# According to https://gcovr.com/en/stable/cookbook.html#out-of-source-builds-with-cmake
+# This flags are used if cmake is called with -DCMAKE_BUILD_TYPE=PROFILE
+set(CMAKE_C_FLAGS_PROFILE --coverage)
+set(CMAKE_CXX_FLAGS_PROFILE --coverage)
#############################################################################################################
# warnings
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d0dbf22fd98c2f6ac0cb417b2fe900f775bfa55..d82fe2b93c5103beb6a960ea4bd29914f0d982c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,6 @@ option(BUILD_VF_UNIT_TESTS "Build VirtualFluids unit tests" OFF)
option(BUILD_VF_CLANG_TIDY "Add the clang tidy checks to the targets" OFF)
option(BUILD_VF_INCLUDE_WHAT_YOU_USE "Add IWYU to the targets" OFF)
option(BUILD_VF_CPPCHECK "Add cppcheck to the targets" OFF)
-option(BUILD_VF_COVERAGE "Add the -coverage compiler flag." OFF)
option(BUILD_CUDA_LTO "Enables the cuda link optimization." OFF)
@@ -92,9 +91,12 @@ include(${VF_CMAKE_DIR}/Cache.cmake)
include(CMakePrintHelpers)
include(${VF_CMAKE_DIR}/VirtualFluidsMacros.cmake)
-IF( BUILD_VF_DOUBLE_ACCURACY )
+if(BUILD_VF_DOUBLE_ACCURACY)
list(APPEND VF_COMPILER_DEFINITION VF_DOUBLE_ACCURACY)
-ENDIF()
+ message(STATUS "Configure VirtualFluids with double precision")
+else()
+ message(STATUS "Configure VirtualFluids with single precision")
+endif()
# set gpu features
if(BUILD_VF_GPU)
@@ -219,9 +221,18 @@ if(BUILD_VF_GPU)
endif()
if (BUILD_VF_PYTHON_BINDINGS)
- add_subdirectory(${VF_THIRD_DIR}/pybind11/pybind11-2.6.0)
+ set(pybind_version "v2.10.4")
+ set(pybind_url "https://github.com/pybind/pybind11")
+ message(STATUS "Fetching pybind: ${pybind_version}")
+ FetchContent_Declare(
+ pybind11
+ GIT_REPOSITORY ${pybind_url}
+ GIT_TAG ${pybind_version}
+ )
+
+ FetchContent_MakeAvailable(pybind11)
add_subdirectory(pythonbindings)
endif()
-vf_load_user_apps()
\ No newline at end of file
+vf_load_user_apps()
diff --git a/Containers/Ubuntu20_04.Dockerfile b/Containers/Ubuntu20_04.Dockerfile
index 97bce073bfd825e0afec97dace698ce28aca6139..c2eea15613787d8f60b835cbb4beec9b0d3893a4 100644
--- a/Containers/Ubuntu20_04.Dockerfile
+++ b/Containers/Ubuntu20_04.Dockerfile
@@ -18,6 +18,10 @@
FROM nvidia/cuda:11.3.1-devel-ubuntu20.04
+# timezone
+ARG TZ
+ENV TZ="$TZ"
+
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y \
diff --git a/Containers/Ubuntu22_04.Dockerfile b/Containers/Ubuntu22_04.Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..eff34a26937107a7f5612a598306e83f22de3ab8
--- /dev/null
+++ b/Containers/Ubuntu22_04.Dockerfile
@@ -0,0 +1,46 @@
+# VirtualFluids Development Image:
+# Ubuntu 22.04
+
+FROM nvidia/cuda:12.1.1-devel-ubuntu22.04
+
+# timezone
+ARG TZ
+ENV TZ="$TZ"
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+ apt-get install -y \
+ git wget unzip software-properties-common \
+ build-essential g++-12 gcc-12 gdb \
+ ccache \
+ ninja-build \
+ openmpi-bin \
+ libopenmpi-dev \
+ libomp-15-dev \
+ clang-15 \
+ clang-format-15 \
+ clang-tidy-15 \
+ clang-tools-15 \
+ python3.11 \
+ python3-pip \
+ python3.11-dev \
+ cppcheck \
+ clangd-12 \
+ && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100 \
+ && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 \
+ && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-15 100 \
+ && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 100 \
+ && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 100 \
+ && update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-12 100 \
+ && pip3 install \
+ cmake==3.26.3 \
+ setuptools \
+ wheel \
+ scikit-build \
+ pyvista \
+ numpy \
+ ansible \
+ 'jinja2<3.1' \
+ gcovr==6.0 \
+ lizard==1.17.10
+
diff --git a/MANIFEST.in b/MANIFEST.in
index adafcf99560acd9da79aa060194df8263b6e77e0..196bdc09019d6028792a565d0776e2c267d3c15a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include pythonbindings/*/bindings*
\ No newline at end of file
+include pythonbindings/*/*.cpython*
\ No newline at end of file
diff --git a/Python/SlurmTests/poiseuille/result_collector.py b/Python/SlurmTests/poiseuille/result_collector.py
index 06efa481c8c010647531426f2af2bec2c2d7eaee..ed374b7d6dc8a32c46716c4648fc8ba35cbb9b4c 100644
--- a/Python/SlurmTests/poiseuille/result_collector.py
+++ b/Python/SlurmTests/poiseuille/result_collector.py
@@ -1,73 +1,73 @@
-from typing import Collection, List
+# from typing import Collection, List
-import pyvista as pv
-from poiseuille.analytical import PoiseuilleSettings, poiseuille_at_heights
-from vtk_utilities import vertical_column_from_mesh, get_values_from_indices
-from SlurmTests.poiseuille.settings import Scaling
+# import pyvista as pv
+# from poiseuille.analytical import PoiseuilleSettings, poiseuille_at_heights
+# from vtk_utilities import vertical_column_from_mesh, get_values_from_indices
+# from SlurmTests.poiseuille.settings import Scaling
-def get_output_file_name(output_folder, runtime_params):
- timesteps = runtime_params.number_of_timesteps
- file_name = f"{output_folder}/mq/mq{timesteps}/mq0_{timesteps}.bin.vtu"
+# def get_output_file_name(output_folder, runtime_params):
+# timesteps = runtime_params.number_of_timesteps
+# file_name = f"{output_folder}/mq/mq{timesteps}/mq0_{timesteps}.bin.vtu"
- return file_name
+# return file_name
-def get_mesh_for_last_timestep(output_folder, runtime_params):
- file_name_of_last_timestep = get_output_file_name(output_folder, runtime_params)
- mesh_of_last_timestep = pv.read(file_name_of_last_timestep)
- return mesh_of_last_timestep
+# def get_mesh_for_last_timestep(output_folder, runtime_params):
+# file_name_of_last_timestep = get_output_file_name(output_folder, runtime_params)
+# mesh_of_last_timestep = pv.read(file_name_of_last_timestep)
+# return mesh_of_last_timestep
-def get_heights_from_indices(mesh, indices):
- return [mesh.points[index][2] for index in indices]
+# def get_heights_from_indices(mesh, indices):
+# return [mesh.points[index][2] for index in indices]
-def get_heights(output_folder, runtime_params):
- mesh_of_last_timestep = get_mesh_for_last_timestep(output_folder, runtime_params)
- column_indices = vertical_column_from_mesh(mesh_of_last_timestep)
- heights = get_heights_from_indices(mesh_of_last_timestep, column_indices)
- return heights
+# def get_heights(output_folder, runtime_params):
+# mesh_of_last_timestep = get_mesh_for_last_timestep(output_folder, runtime_params)
+# column_indices = vertical_column_from_mesh(mesh_of_last_timestep)
+# heights = get_heights_from_indices(mesh_of_last_timestep, column_indices)
+# return heights
-def get_numerical_results(runtime_params, output_folder):
- mesh_of_last_timestep = get_mesh_for_last_timestep(output_folder, runtime_params)
- velocities_in_x_direction = mesh_of_last_timestep.get_array("Vx")
- column_indices = vertical_column_from_mesh(mesh_of_last_timestep)
- numerical_results = get_values_from_indices(velocities_in_x_direction, column_indices)
+# def get_numerical_results(runtime_params, output_folder):
+# mesh_of_last_timestep = get_mesh_for_last_timestep(output_folder, runtime_params)
+# velocities_in_x_direction = mesh_of_last_timestep.get_array("Vx")
+# column_indices = vertical_column_from_mesh(mesh_of_last_timestep)
+# numerical_results = get_values_from_indices(velocities_in_x_direction, column_indices)
- return numerical_results
+# return numerical_results
-def get_analytical_results(grid_params, physical_params, kernel, height_values):
- channel_height = grid_params.number_of_nodes_per_direction[2]
- settings = get_analytical_poiseuille_settings(channel_height, physical_params, kernel)
- max_grid_height = channel_height * grid_params.node_distance
- adjusted_height_values = [value / max_grid_height * channel_height for value in height_values]
- analytical_results = poiseuille_at_heights(settings, adjusted_height_values)
- return analytical_results
+# def get_analytical_results(grid_params, physical_params, kernel, height_values):
+# channel_height = grid_params.number_of_nodes_per_direction[2]
+# settings = get_analytical_poiseuille_settings(channel_height, physical_params, kernel)
+# max_grid_height = channel_height * grid_params.node_distance
+# adjusted_height_values = [value / max_grid_height * channel_height for value in height_values]
+# analytical_results = poiseuille_at_heights(settings, adjusted_height_values)
+# return analytical_results
-def get_analytical_poiseuille_settings(height, physical_params, kernel):
- settings = PoiseuilleSettings()
- settings.height = height
- settings.viscosity = physical_params.lattice_viscosity
- settings.density = 1
- settings.force = kernel.forcing_in_x1
+# def get_analytical_poiseuille_settings(height, physical_params, kernel):
+# settings = PoiseuilleSettings()
+# settings.height = height
+# settings.viscosity = physical_params.lattice_viscosity
+# settings.density = 1
+# settings.force = kernel.forcing_in_x1
- return settings
+# return settings
-def collect_results() -> (List[List[float]], List[List[float]]):
- analytical_results = []
- numerical_results = []
+# def collect_results() -> (List[List[float]], List[List[float]]):
+# analytical_results = []
+# numerical_results = []
- for simulation_run in range(0, 3):
- output_folder = f"output-{simulation_run}"
- grid_params, physical_params, runtime_params, kernel = Scaling.configuration_for_scale_level(simulation_run)
- heights = get_heights(output_folder, runtime_params)
- analytical_results.append(
- get_analytical_results(grid_params, physical_params, kernel, heights))
- numerical_results.append(get_numerical_results(runtime_params, output_folder))
+# for simulation_run in range(0, 3):
+# output_folder = f"output-{simulation_run}"
+# grid_params, physical_params, runtime_params, kernel = Scaling.configuration_for_scale_level(simulation_run)
+# heights = get_heights(output_folder, runtime_params)
+# analytical_results.append(
+# get_analytical_results(grid_params, physical_params, kernel, heights))
+# numerical_results.append(get_numerical_results(runtime_params, output_folder))
- return analytical_results, numerical_results
+# return analytical_results, numerical_results
diff --git a/Python/actuator_line/actuator_line.py b/Python/actuator_line/actuator_line.py
index d0589f402456e8ffe8320ce7f780738aef22fbe4..b8e7efb59673c3b3c9206bfda535bdd1f85e451d 100644
--- a/Python/actuator_line/actuator_line.py
+++ b/Python/actuator_line/actuator_line.py
@@ -104,8 +104,8 @@ length = np.array([6,4,1])*boundary_layer_height
dx = boundary_layer_height/nodes_per_height
dt = dx * mach / (np.sqrt(3) * velocity)
velocity_ratio = dx/dt
-velocity_LB = velocity / velocity_ratio # LB units
-viscosity_LB = viscosity / (velocity_ratio * dx) # LB units
+velocity_LB = velocity / velocity_ratio # LB units
+viscosity_LB = viscosity / (velocity_ratio * dx) # LB units
pressure_gradient = u_star * u_star / boundary_layer_height
pressure_gradient_LB = pressure_gradient * (dt*dt)/dx
@@ -142,7 +142,7 @@ tm_factory.read_config_file(config)
grid_scaling_factory = gpu.GridScalingFactory()
grid_scaling_factory.set_scaling_factory(gpu.GridScaling.ScaleCompressible)
-grid_builder.add_coarse_grid(0.0, 0.0, 0.0, *length, dx)
+grid_builder.add_coarse_grid(0.0, 0.0, 0.0, length[0], length[1], length[2], dx)
grid_builder.set_periodic_boundary_condition(not read_precursor, True, False)
grid_builder.build_grids(False)
@@ -162,7 +162,7 @@ bc_factory.set_slip_boundary_condition(gpu.SlipBC.SlipBounceBack)
bc_factory.set_pressure_boundary_condition(gpu.PressureBC.OutflowNonReflective)
if read_precursor:
bc_factory.set_precursor_boundary_condition(gpu.PrecursorBC.DistributionsPrecursor if use_distributions else gpu.PrecursorBC.VelocityPrecursor)
-para.set_outflow_pressure_correction_factor(0.0);
+para.set_outflow_pressure_correction_factor(0.0)
#%%
# don't use python init functions, they are very slow! Just kept as an example.
# Define lambda in bindings and set it here.
@@ -176,7 +176,7 @@ para.set_outflow_pressure_correction_factor(0.0);
para.set_initial_condition_perturbed_log_law(u_star, z0, length[0], length[2], boundary_layer_height, velocity_ratio)
#%%
-turb_pos = np.array([3,3,3])*turbine_diameter
+turb_pos = np.array([3, 3, 3])*turbine_diameter
epsilon = 1.5*dx
density = 1.225
level = 0
@@ -185,7 +185,7 @@ n_blade_nodes = 32
omega = 1
blade_radii = np.arange(n_blade_nodes, dtype=np.float32)/(0.5*turbine_diameter)
alm = gpu.ActuatorFarm(n_blades, density, n_blade_nodes, epsilon, level, dt, dx, True)
-alm.add_turbine(turb_pos[0],turb_pos[1],turb_pos[2], turbine_diameter, omega, 0, 0, blade_radii)
+alm.add_turbine(turb_pos[0], turb_pos[1], turb_pos[2], turbine_diameter, omega, 0, 0, blade_radii)
para.add_actuator(alm)
#%%
planar_average_probe = gpu.probes.PlanarAverageProbe("horizontalPlanes", para.get_output_path(), 0, int(t_start_tmp_averaging/dt), int(t_averaging/dt) , int(t_start_out_probe/dt), int(t_out_probe/dt), 'z')
diff --git a/Python/boundary_layer/boundary_layer.py b/Python/boundary_layer/boundary_layer.py
index 25b3cd895f8a3a80f9fd6438e00d3e924fc13779..0ebdbb43894e6bdae55cca1f788a33c3739fb0c6 100644
--- a/Python/boundary_layer/boundary_layer.py
+++ b/Python/boundary_layer/boundary_layer.py
@@ -116,7 +116,7 @@ logger.vf_log_info(f"viscosity [10^8 dx^2/dt] = {viscosity_LB*1e8}")
logger.vf_log_info(f"u* /(dx/dt) = {u_star*dt/dx}")
logger.vf_log_info(f"dpdx = {pressure_gradient}")
logger.vf_log_info(f"dpdx /(dx/dt^2) = {pressure_gradient_LB}")
-
+
#%%
#%%
@@ -136,6 +136,8 @@ para.set_timestep_start_out(int(t_start_out/dt))
para.set_timestep_out(int(t_out/dt))
para.set_timestep_end(int(t_end/dt))
para.set_is_body_force(config.get_bool_value("bodyForce"))
+para.set_devices(np.arange(10))
+para.set_max_dev(communicator.get_number_of_process())
#%%
tm_factory = gpu.TurbulenceModelFactory(para)
tm_factory.read_config_file(config)
@@ -161,13 +163,7 @@ bc_factory.set_pressure_boundary_condition(gpu.PressureBC.OutflowNonReflective)
bc_factory.set_precursor_boundary_condition(gpu.PrecursorBC.DistributionsPrecursor if use_distributions else gpu.PrecursorBC.VelocityPrecursor)
para.set_outflow_pressure_correction_factor(0.0);
#%%
-def init_func(coord_x, coord_y, coord_z):
- return [
- 0.0,
- (u_star/0.4 * np.log(np.maximum(coord_z,z0)/z0) + 2.0*np.sin(np.pi*16*coord_x/length[0])*np.sin(np.pi*8*coord_z/boundary_layer_height)/(np.square(coord_z/boundary_layer_height)+1)) * dt / dx,
- 2.0*np.sin(np.pi*16.*coord_x/length[0])*np.sin(np.pi*8.*coord_z/boundary_layer_height)/(np.square(coord_z/boundary_layer_height)+1.) * dt / dx,
- 8.0*u_star/0.4*(np.sin(np.pi*8.0*coord_y/boundary_layer_height)*np.sin(np.pi*8.0*coord_z/boundary_layer_height)+np.sin(np.pi*8.0*coord_x/length[0]))/(np.square(length[2]/2.0-coord_z)+1.) * dt / dx]
-para.set_initial_condition(init_func)
+para.set_initial_condition_perturbed_log_law(u_star, z0, length[0], length[2], boundary_layer_height, dx/dx)
#%%
planar_average_probe = gpu.probes.PlanarAverageProbe("horizontalPlanes", para.get_output_path(), 0, int(t_start_tmp_averaging/dt), int(t_averaging/dt) , int(t_start_out_probe/dt), int(t_out_probe/dt), 'z')
diff --git a/Python/poiseuille/test_poiseuille_l2.py b/Python/poiseuille/test_poiseuille_l2.py
index 818cba40e115945c60e4fa2ac96b3b6b5ab0bba8..f863991364974ffd9a02e9ebb212c83e1182be42 100644
--- a/Python/poiseuille/test_poiseuille_l2.py
+++ b/Python/poiseuille/test_poiseuille_l2.py
@@ -32,153 +32,154 @@ r"""
! \author Sven Marcus, Henry Korb
=======================================================================================
"""
-import os
-import shutil
-import unittest
-import matplotlib.pyplot as plt
-import numpy as np
-import pyvista as pv
-from pyfluids import cpu
-from scipy import stats
+# import os
+# import shutil
+# import unittest
-from errors import normalized_l2_error
-from poiseuille.analytical import poiseuille_at_heights, PoiseuilleSettings
-from poiseuille.simulation import run_simulation
-from vtk_utilities import vertical_column_from_mesh, get_values_from_indices
+# import matplotlib.pyplot as plt
+# import numpy as np
+# import pyvista as pv
+# from pyfluids import cpu
+# from scipy import stats
+# from errors import normalized_l2_error
+# from poiseuille.analytical import poiseuille_at_heights, PoiseuilleSettings
+# from poiseuille.simulation import run_simulation
+# from vtk_utilities import vertical_column_from_mesh, get_values_from_indices
-class TestPoiseuilleFlow(unittest.TestCase):
- node_distances = [1, 0.5, 0.25]
- number_of_nodes = [16, 32, 64]
- number_of_timesteps = [2_500_000, 5_000_000, 10_000_000]
- forcings = [1e-9, 5e-10, 2.5e-10]
- viscosities = [1e-3, 2e-3, 4e-3]
- def zipped_settings(self):
- return zip(self.node_distances,
- self.number_of_nodes,
- self.number_of_timesteps,
- self.forcings,
- self.viscosities)
+# class TestPoiseuilleFlow(unittest.TestCase):
+# node_distances = [1, 0.5, 0.25]
+# number_of_nodes = [16, 32, 64]
+# number_of_timesteps = [2_500_000, 5_000_000, 10_000_000]
+# forcings = [1e-9, 5e-10, 2.5e-10]
+# viscosities = [1e-3, 2e-3, 4e-3]
- def test_poiseuille_flow(self):
- self.skipTest("This test is not implemented correctly yet")
- plt.ion()
+# def zipped_settings(self):
+# return zip(self.node_distances,
+# self.number_of_nodes,
+# self.number_of_timesteps,
+# self.forcings,
+# self.viscosities)
- physical_params = cpu.parameters.PhysicalParameters()
+# def test_poiseuille_flow(self):
+# self.skipTest("This test is not implemented correctly yet")
+# plt.ion()
- runtime_params = cpu.parameters.RuntimeParameters()
- runtime_params.number_of_threads = os.cpu_count()
- runtime_params.timestep_log_interval = 10000
+# physical_params = cpu.parameters.PhysicalParameters()
- kernel = cpu.kernel.LBMKernel(cpu.kernel.KernelType.CompressibleCumulantFourthOrderViscosity)
- kernel.use_forcing = True
+# runtime_params = cpu.parameters.RuntimeParameters()
+# runtime_params.number_of_threads = os.cpu_count()
+# runtime_params.timestep_log_interval = 10000
- normalized_l2_errors = []
- for delta_x, nodes, timesteps, forcing, viscosity in self.zipped_settings():
- physical_params.lattice_viscosity = viscosity
- runtime_params.number_of_timesteps = timesteps
- kernel.forcing_in_x1 = forcing
+# kernel = cpu.kernel.LBMKernel(cpu.kernel.KernelType.CompressibleCumulantFourthOrderViscosity)
+# kernel.use_forcing = True
- grid_params = create_grid_params_with_nodes_in_column(nodes, delta_x)
- l2_error = get_l2_error_for_simulation(grid_params, physical_params, runtime_params, kernel)
- normalized_l2_errors.append(l2_error)
+# normalized_l2_errors = []
+# for delta_x, nodes, timesteps, forcing, viscosity in self.zipped_settings():
+# physical_params.lattice_viscosity = viscosity
+# runtime_params.number_of_timesteps = timesteps
+# kernel.forcing_in_x1 = forcing
- nodes_as_log = [np.log10(node) for node in self.number_of_nodes]
- l2_norms_as_log = [np.log10(l2) for l2 in normalized_l2_errors]
- res = stats.linregress(nodes_as_log, l2_norms_as_log)
+# grid_params = create_grid_params_with_nodes_in_column(nodes, delta_x)
+# l2_error = get_l2_error_for_simulation(grid_params, physical_params, runtime_params, kernel)
+# normalized_l2_errors.append(l2_error)
- plt.xscale("log")
- plt.yscale("log")
- plt.plot(self.number_of_nodes, [np.power(10, res.intercept + res.slope * node) for node in nodes_as_log], 'r-')
- plt.plot(self.number_of_nodes, normalized_l2_errors, "x:")
- plt.show()
+# nodes_as_log = [np.log10(node) for node in self.number_of_nodes]
+# l2_norms_as_log = [np.log10(l2) for l2 in normalized_l2_errors]
+# res = stats.linregress(nodes_as_log, l2_norms_as_log)
- print(normalized_l2_errors)
- self.assertAlmostEqual(res.slope, -2, places=2)
+# plt.xscale("log")
+# plt.yscale("log")
+# plt.plot(self.number_of_nodes, [np.power(10, res.intercept + res.slope * node) for node in nodes_as_log], 'r-')
+# plt.plot(self.number_of_nodes, normalized_l2_errors, "x:")
+# plt.show()
+# print(normalized_l2_errors)
+# self.assertAlmostEqual(res.slope, -2, places=2)
-def get_l2_error_for_simulation(grid_params, physical_params, runtime_params, kernel):
- output_folder = "./output"
- run_simulation_with_settings(grid_params, physical_params, runtime_params, kernel, output_folder)
- heights = get_heights(output_folder, runtime_params)
- numerical_results = get_numerical_results(runtime_params, output_folder)
- analytical_results = get_analytical_results(grid_params, physical_params, kernel, heights)
+# def get_l2_error_for_simulation(grid_params, physical_params, runtime_params, kernel):
+# output_folder = "./output"
+# run_simulation_with_settings(grid_params, physical_params, runtime_params, kernel, output_folder)
+# heights = get_heights(output_folder, runtime_params)
- plt.plot(heights, numerical_results)
- plt.plot(heights, analytical_results)
- plt.legend(["numerical", "analytical"])
- plt.show()
+# numerical_results = get_numerical_results(runtime_params, output_folder)
+# analytical_results = get_analytical_results(grid_params, physical_params, kernel, heights)
- return normalized_l2_error(analytical_results, numerical_results)
+# plt.plot(heights, numerical_results)
+# plt.plot(heights, analytical_results)
+# plt.legend(["numerical", "analytical"])
+# plt.show()
+# return normalized_l2_error(analytical_results, numerical_results)
-def run_simulation_with_settings(grid_params, physical_params, runtime_params, kernel, output_folder):
- shutil.rmtree(output_folder, ignore_errors=True)
- run_simulation(physical_params, grid_params, runtime_params, kernel)
+# def run_simulation_with_settings(grid_params, physical_params, runtime_params, kernel, output_folder):
+# shutil.rmtree(output_folder, ignore_errors=True)
+# run_simulation(physical_params, grid_params, runtime_params, kernel)
-def get_heights(output_folder, runtime_params):
- mesh_of_last_timestep = get_mesh_for_last_timestep(output_folder, runtime_params)
- column_indices = vertical_column_from_mesh(mesh_of_last_timestep)
- heights = get_heights_from_indices(mesh_of_last_timestep, column_indices)
- return heights
+# def get_heights(output_folder, runtime_params):
+# mesh_of_last_timestep = get_mesh_for_last_timestep(output_folder, runtime_params)
+# column_indices = vertical_column_from_mesh(mesh_of_last_timestep)
+# heights = get_heights_from_indices(mesh_of_last_timestep, column_indices)
+# return heights
-def get_numerical_results(runtime_params, output_folder):
- mesh_of_last_timestep = get_mesh_for_last_timestep(output_folder, runtime_params)
- velocities_in_x_direction = mesh_of_last_timestep.get_array("Vx")
- column_indices = vertical_column_from_mesh(mesh_of_last_timestep)
- numerical_results = get_values_from_indices(velocities_in_x_direction, column_indices)
- return numerical_results
+# def get_numerical_results(runtime_params, output_folder):
+# mesh_of_last_timestep = get_mesh_for_last_timestep(output_folder, runtime_params)
+# velocities_in_x_direction = mesh_of_last_timestep.get_array("Vx")
+# column_indices = vertical_column_from_mesh(mesh_of_last_timestep)
+# numerical_results = get_values_from_indices(velocities_in_x_direction, column_indices)
+# return numerical_results
-def get_analytical_results(grid_params, physical_params, kernel, height_values):
- channel_height = grid_params.number_of_nodes_per_direction[2]
- settings = get_analytical_poiseuille_settings(channel_height, physical_params, kernel)
- max_grid_height = channel_height * grid_params.node_distance
- adjusted_height_values = [value / max_grid_height * channel_height for value in height_values]
- analytical_results = poiseuille_at_heights(settings, adjusted_height_values)
- return analytical_results
+# def get_analytical_results(grid_params, physical_params, kernel, height_values):
+# channel_height = grid_params.number_of_nodes_per_direction[2]
+# settings = get_analytical_poiseuille_settings(channel_height, physical_params, kernel)
+# max_grid_height = channel_height * grid_params.node_distance
+# adjusted_height_values = [value / max_grid_height * channel_height for value in height_values]
+# analytical_results = poiseuille_at_heights(settings, adjusted_height_values)
+# return analytical_results
-def get_mesh_for_last_timestep(output_folder, runtime_params):
- file_name_of_last_timestep = get_output_file_name(output_folder, runtime_params)
- mesh_of_last_timestep = pv.read(file_name_of_last_timestep)
- return mesh_of_last_timestep
+# def get_mesh_for_last_timestep(output_folder, runtime_params):
+# file_name_of_last_timestep = get_output_file_name(output_folder, runtime_params)
+# mesh_of_last_timestep = pv.read(file_name_of_last_timestep)
+# return mesh_of_last_timestep
-def get_analytical_poiseuille_settings(height, physical_params, kernel):
- settings = PoiseuilleSettings()
- settings.height = height
- settings.viscosity = physical_params.lattice_viscosity
- settings.density = 1
- settings.force = kernel.forcing_in_x1
- return settings
+# def get_analytical_poiseuille_settings(height, physical_params, kernel):
+# settings = PoiseuilleSettings()
+# settings.height = height
+# settings.viscosity = physical_params.lattice_viscosity
+# settings.density = 1
+# settings.force = kernel.forcing_in_x1
+# return settings
-def get_output_file_name(output_folder, runtime_params):
- timesteps = runtime_params.number_of_timesteps
- file_name = f"{output_folder}/mq/mq{timesteps}/mq0_{timesteps}.bin.vtu"
- return file_name
+# def get_output_file_name(output_folder, runtime_params):
+# timesteps = runtime_params.number_of_timesteps
+# file_name = f"{output_folder}/mq/mq{timesteps}/mq0_{timesteps}.bin.vtu"
+# return file_name
-def get_heights_from_indices(mesh, indices):
- return [mesh.points[index][2] for index in indices]
+# def get_heights_from_indices(mesh, indices):
+# return [mesh.points[index][2] for index in indices]
-def create_grid_params_with_nodes_in_column(nodes_in_column, delta_x):
- grid_params = cpu.parameters.GridParameters()
- grid_params.node_distance = delta_x
- grid_params.number_of_nodes_per_direction = [1, 1, nodes_in_column]
- grid_params.blocks_per_direction = [1, 1, 8]
- grid_params.periodic_boundary_in_x1 = True
- grid_params.periodic_boundary_in_x2 = True
- grid_params.periodic_boundary_in_x3 = False
- return grid_params
+# def create_grid_params_with_nodes_in_column(nodes_in_column, delta_x):
+# grid_params = cpu.parameters.GridParameters()
+# grid_params.node_distance = delta_x
+# grid_params.number_of_nodes_per_direction = [1, 1, nodes_in_column]
+# grid_params.blocks_per_direction = [1, 1, 8]
+# grid_params.periodic_boundary_in_x1 = True
+# grid_params.periodic_boundary_in_x2 = True
+# grid_params.periodic_boundary_in_x3 = False
+
+# return grid_params
diff --git a/Python/requirements.txt b/Python/requirements.txt
index 8628634d1b85ebc0b07328d563d479f35641be97..355bb47d748f0b593ed07da186d956d4a5cf48a1 100644
--- a/Python/requirements.txt
+++ b/Python/requirements.txt
@@ -4,20 +4,19 @@ cycler==0.10.0
imageio==2.9.0
iniconfig==1.1.1
kiwisolver==1.3.1
-matplotlib==3.3.3
+matplotlib==3.7.1
meshio==4.3.8
-numpy==1.19.5
+numpy==1.24.0
packaging==20.8
-Pillow==8.1.0
+Pillow==9.5.0
pluggy==0.13.1
py==1.10.0
pyparsing==2.4.7
pytest==6.2.1
python-dateutil==2.8.1
-pyvista==0.28.1
-scipy==1.6.1
+pyvista==0.39.1
+scipy==1.10
scooby==0.5.6
six==1.15.0
toml==0.10.2
-transforms3d==0.3.1
-vtk==9.0.1
+transforms3d==0.4.1
diff --git a/apps/cpu/AcousticPulse/ap.cpp b/apps/cpu/AcousticPulse/ap.cpp
index 77ddfbf626e25b8c5d17d438255e37b4977dbddd..ac69eee6d2d158a2ea8eea27da8bf968b92f5f06 100644
--- a/apps/cpu/AcousticPulse/ap.cpp
+++ b/apps/cpu/AcousticPulse/ap.cpp
@@ -179,9 +179,9 @@ void run()
}
//set connectors
- //SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetInterpolationProcessor());
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
- //dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iProcessor)->setBulkViscosity(nuLB, bulckViscosity);
+ //SPtr<Interpolator> iProcessor(new CompressibleOffsetInterpolator());
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
+ //dynamicPointerCast<CompressibleOffsetMomentsInterpolator>(iProcessor)->setBulkViscosity(nuLB, bulckViscosity);
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
UBLOG(logINFO, "SetConnectorsBlockVisitor:start");
diff --git a/apps/cpu/BoxBenchmark/bb.cpp b/apps/cpu/BoxBenchmark/bb.cpp
index 7d5c0ec2f4fdf4627b87a32727925f62a3bc89e9..0f0c7d6c1ddd066f36f95d8f87be7afae3ddf2c8 100644
--- a/apps/cpu/BoxBenchmark/bb.cpp
+++ b/apps/cpu/BoxBenchmark/bb.cpp
@@ -130,7 +130,7 @@ void run(string configname)
ppblocks.reset();
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
//SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//grid->accept(setConnsVisitor);
@@ -192,7 +192,7 @@ void run(string configname)
rcp.restart((int)restartStep);
grid->setTimeStep(restartStep);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/ConvectionOfVortex/cov.cpp b/apps/cpu/ConvectionOfVortex/cov.cpp
index baa136d6a3a96e1e4ce86ce187f116e2c560530c..bfe29fc9bb6c18782212f8cb9a080d1815b8c6a1 100644
--- a/apps/cpu/ConvectionOfVortex/cov.cpp
+++ b/apps/cpu/ConvectionOfVortex/cov.cpp
@@ -164,15 +164,15 @@ void run()
ppblocks.reset();
//set connectors
- //SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetInterpolationProcessor());
- //SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
- //dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iProcessor)->setBulkOmegaToOmega(true);
- //SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetSquarePressureInterpolationProcessor());
+ //SPtr<Interpolator> iProcessor(new CompressibleOffsetInterpolator());
+ //SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
+ //dynamicPointerCast<CompressibleOffsetMomentsInterpolator>(iProcessor)->setBulkOmegaToOmega(true);
+ //SPtr<Interpolator> iProcessor(new CompressibleOffsetSquarePressureInterpolator());
OneDistributionSetConnectorsBlockVisitor setConnsVisitor(comm);
grid->accept(setConnsVisitor);
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
SetInterpolationConnectorsBlockVisitor setInterConnsVisitor(comm, nuLB, iProcessor);
grid->accept(setInterConnsVisitor);
diff --git a/apps/cpu/CouetteFlow/cflow.cpp b/apps/cpu/CouetteFlow/cflow.cpp
index e81c3bb008948814d79577311498dbfd5f1a76f2..112c0c96bd3c9bde56c3ef53f0047569fec031b2 100644
--- a/apps/cpu/CouetteFlow/cflow.cpp
+++ b/apps/cpu/CouetteFlow/cflow.cpp
@@ -243,7 +243,7 @@ void bflow(string configname)
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
//SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, k, iProcessor);
//grid->accept(setConnsVisitor);
diff --git a/apps/cpu/DHIT/dhit.cpp b/apps/cpu/DHIT/dhit.cpp
index 850a531a9ac490ed195ad17ce298ca5cf027151a..e06db26b8706bad1f94fec432868daabea8d1cce 100644
--- a/apps/cpu/DHIT/dhit.cpp
+++ b/apps/cpu/DHIT/dhit.cpp
@@ -117,7 +117,7 @@ void run(string configname)
ppblocks.reset();
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/DLR-F16-Porous/f16.cpp b/apps/cpu/DLR-F16-Porous/f16.cpp
index 7ddd135b2996c794e2802e235fdedc2a3013cdf3..791c1c926dbdf86bf1c2f1634288696248cdb305 100644
--- a/apps/cpu/DLR-F16-Porous/f16.cpp
+++ b/apps/cpu/DLR-F16-Porous/f16.cpp
@@ -656,8 +656,8 @@ void run(string configname)
////////////////////////////////////////////////////////////////////////////
}
////set connectors
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
- dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iProcessor)->setBulkViscosity(nuLB, bulckViscosity);
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
+ dynamicPointerCast<CompressibleOffsetMomentsInterpolator>(iProcessor)->setBulkViscosity(nuLB, bulckViscosity);
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/DLR-F16-Solid/f16.cpp b/apps/cpu/DLR-F16-Solid/f16.cpp
index 328da5dc54b5a2db751eb71ad1ce8810cb471470..2a9893ef28efba2ee163e6e9d8c62ffadd68568a 100644
--- a/apps/cpu/DLR-F16-Solid/f16.cpp
+++ b/apps/cpu/DLR-F16-Solid/f16.cpp
@@ -634,8 +634,8 @@ void run(string configname)
}
////set connectors
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
- dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iProcessor)->setBulkViscosity(nuLB, bulckViscosity);
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
+ dynamicPointerCast<CompressibleOffsetMomentsInterpolator>(iProcessor)->setBulkViscosity(nuLB, bulckViscosity);
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/DLR-F16/f16.cpp b/apps/cpu/DLR-F16/f16.cpp
index 2bbc1b8ed63be110d4b6ccc98cdcdb88337d4760..17fef2d15f4026d4b7035a896d78664350f6b86c 100644
--- a/apps/cpu/DLR-F16/f16.cpp
+++ b/apps/cpu/DLR-F16/f16.cpp
@@ -978,8 +978,8 @@ void run(string configname)
////set connectors
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
@@ -1101,7 +1101,7 @@ void run(string configname)
////////////////////////////////////////////////////////////////////////////
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/FallingSphere/FallingSphere.cpp b/apps/cpu/FallingSphere/FallingSphere.cpp
index ba837fcf15b32a65983b633c768aea6250a976a7..4b1a1825551f38359428f8b6f60dff08abadf042 100644
--- a/apps/cpu/FallingSphere/FallingSphere.cpp
+++ b/apps/cpu/FallingSphere/FallingSphere.cpp
@@ -11,6 +11,8 @@ using namespace std;
int main(int argc, char *argv[])
{
+ Sleep(30000);
+
std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
int myid = comm->getProcessID();
@@ -24,7 +26,7 @@ int main(int argc, char *argv[])
double g_maxX2 = 1;
double g_maxX3 = 10;
- int blockNX[3] = { 16, 16, 16 };
+ int blockNX[3] = { 32, 32, 32 };
double dx = 1./32.;
double d_part = 0.25;
@@ -54,7 +56,7 @@ int main(int argc, char *argv[])
grid->setDeltaX(dx);
grid->setBlockNX(blockNX[0], blockNX[1], blockNX[2]);
- string outputPath = "f:/temp/FallingSpheresTest";
+ string outputPath = "f:/temp/FallingSpheresTestMPI";
UbSystem::makeDirectory(outputPath);
UbSystem::makeDirectory(outputPath + "/liggghts");
@@ -68,12 +70,6 @@ int main(int argc, char *argv[])
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
- SPtr<SimulationObserver> ppblocks =
- make_shared <WriteBlocksSimulationObserver>(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath,
- WbWriterVtkXmlBinary::getInstance(), comm);
- ppblocks->update(0);
- ppblocks.reset();
-
double dx2 = 2.0 * dx;
GbCuboid3DPtr wallZmin(
new GbCuboid3D(g_minX1 - dx2, g_minX2 - dx2, g_minX3 - dx2, g_maxX1 + dx2, g_maxX2 + dx2, g_minX3));
@@ -85,47 +81,39 @@ int main(int argc, char *argv[])
SPtr<D3Q27Interactor> wallZminInt(new D3Q27Interactor(wallZmin, grid, noSlipBC, Interactor3D::SOLID));
SPtr<D3Q27Interactor> wallZmaxInt(new D3Q27Interactor(wallZmax, grid, noSlipBC, Interactor3D::SOLID));
- InteractorsHelper intHelper(grid, metisVisitor, true);
- intHelper.addInteractor(wallZminInt);
- intHelper.addInteractor(wallZmaxInt);
- intHelper.selectBlocks();
-
- SetKernelBlockVisitor kernelVisitor(kernel, nuLB, 1e9, 1e9);
- grid->accept(kernelVisitor);
-
- intHelper.setBC();
- InitDistributionsBlockVisitor initVisitor;
- grid->accept(initVisitor);
+ SPtr<SimulationObserver> ppblocks = make_shared<WriteBlocksSimulationObserver>(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm);
+ ppblocks->update(0);
+ MPI_Comm mpi_comm = *(MPI_Comm *)(comm->getNativeCommunicator());
+ LiggghtsCouplingWrapper wrapper(argv, mpi_comm);
SPtr<UbScheduler> lScheduler = make_shared<UbScheduler>(1);
string inFile1 = "d:/Projects/VirtualFluids_Develop/apps/cpu/FallingSphere/in.lbdem";
string inFile2 = "d:/Projects/VirtualFluids_Develop/apps/cpu/FallingSphere/in2.lbdem";
- MPI_Comm mpi_comm = *(MPI_Comm*)(comm->getNativeCommunicator());
- LiggghtsCouplingWrapper wrapper(argv, mpi_comm);
-
-
// SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(r_p, 1.480, 2060, r_p/dx);
- //SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(r_p, LBMUnitConverter::AIR_20C, r_p / dx);
+ // SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(r_p, LBMUnitConverter::AIR_20C, r_p / dx);
SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(r_p, 0.1, 1000, r_p / dx, 0.01);
std::cout << units->toString() << std::endl;
double v_frac = 0.1;
- double dt_phys = units->getFactorTimeLbToW();
+ double dt_phys = units->getFactorTimeLbToW();
int demSubsteps = 10;
- double dt_dem = dt_phys / (double)demSubsteps;
- int vtkSteps = 100;
- string demOutDir = outputPath;
+ double dt_dem = dt_phys / (double)demSubsteps;
+ int vtkSteps = 100;
+ string demOutDir = outputPath;
wrapper.execCommand("echo none");
wrapper.setVariable("d_part", d_part);
- //wrapper.setVariable("r_part", d_part/2.);
- //wrapper.setVariable("v_frac", v_frac);
+ // wrapper.setVariable("r_part", d_part/2.);
+ // wrapper.setVariable("v_frac", v_frac);
+
+ wrapper.execFile((char *)inFile1.c_str());
+
+ SPtr<LiggghtsCouplingSimulationObserver> lcSimulationObserver = make_shared<LiggghtsCouplingSimulationObserver>(grid, lScheduler, comm, wrapper, demSubsteps, units);
+ SPtr<Grid3DVisitor> partVisitor = make_shared<LiggghtsPartitioningGridVisitor>((g_maxX1 - g_minX1) / dx, (g_maxX2 - g_minX2) / dx, (g_maxX3 - g_minX3) / dx, wrapper.lmp);
- wrapper.execFile((char*)inFile1.c_str());
-
//// set timestep and output directory
wrapper.setVariable("t_step", dt_dem);
wrapper.setVariable("dmp_stp", vtkSteps * demSubsteps);
@@ -133,9 +121,22 @@ int main(int argc, char *argv[])
wrapper.execFile((char *)inFile2.c_str());
wrapper.runUpto(demSubsteps - 1);
-
- SPtr<LiggghtsCouplingSimulationObserver> lcSimulationObserver =
- make_shared<LiggghtsCouplingSimulationObserver>(grid, lScheduler, comm, wrapper, demSubsteps, units);
+
+ InteractorsHelper intHelper(grid, partVisitor, false);
+ intHelper.addInteractor(wallZminInt);
+ intHelper.addInteractor(wallZmaxInt);
+ intHelper.selectBlocks();
+
+ ppblocks->update(1);
+ ppblocks.reset();
+
+ SetKernelBlockVisitor kernelVisitor(kernel, nuLB, 1e9, 1e9);
+ grid->accept(kernelVisitor);
+
+ intHelper.setBC();
+
+ InitDistributionsBlockVisitor initVisitor;
+ grid->accept(initVisitor);
// boundary conditions grid
{
@@ -158,6 +159,9 @@ int main(int argc, char *argv[])
new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(),
SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ int numOfThreads = 1;
+ omp_set_num_threads(numOfThreads);
+
int endTime = 3000; //20;
SPtr<Simulation> simulation(new Simulation(grid, lScheduler, endTime));
simulation->addSimulationObserver(lcSimulationObserver);
diff --git a/apps/cpu/FallingSphere/in.lbdem b/apps/cpu/FallingSphere/in.lbdem
index b47a85c997fce75ba082490b305bbe9b55caeb25..5d0cfb511774c5270918f4e7007224d36080232c 100644
--- a/apps/cpu/FallingSphere/in.lbdem
+++ b/apps/cpu/FallingSphere/in.lbdem
@@ -11,7 +11,7 @@ communicate single vel yes
boundary f f f
newton off
-processors * * 1
+processors 1 1 *
region box block 0. 1. 0. 1. 0. 10. units box
create_box 1 box
@@ -42,7 +42,7 @@ fix xwalls2 all wall/gran model hertz tangential history primitive type 1 xplane
fix ywalls1 all wall/gran model hertz tangential history primitive type 1 yplane 0.
fix ywalls2 all wall/gran model hertz tangential history primitive type 1 yplane 1.
fix zwalls1 all wall/gran model hertz tangential history primitive type 1 zplane 0.
-fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zplane 2.
+fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zplane 10.
create_atoms 1 single 0.5 0.5 9.75
#create_atoms 1 single 0.38 0.05 0.05
diff --git a/apps/cpu/FlowAroundCylinder/cylinder.cfg b/apps/cpu/FlowAroundCylinder/cylinder.cfg
index 97ece40e65d4ffe47a75e5377db49bd0018bbff6..1869a668ad6a8a456a5b131234c082b05d9b17be 100644
--- a/apps/cpu/FlowAroundCylinder/cylinder.cfg
+++ b/apps/cpu/FlowAroundCylinder/cylinder.cfg
@@ -1,8 +1,8 @@
-pathOut = d:/temp/cylinder_test_naming
+pathOut = ./output/FlowAroundCylinder
numOfThreads = 8
availMem = 15e9
-refineLevel = 0
+refineLevel = 1
blockNx = 25 41 41
uLB = 0.001
#dx = 0.005
diff --git a/apps/cpu/FlowAroundCylinder/cylinder.cpp b/apps/cpu/FlowAroundCylinder/cylinder.cpp
index f8c2ac4674a7bfa98d42c0be4ebf20365f579695..5956a48a8bdf08d11047400f25302005d080d872 100644
--- a/apps/cpu/FlowAroundCylinder/cylinder.cpp
+++ b/apps/cpu/FlowAroundCylinder/cylinder.cpp
@@ -291,12 +291,13 @@ void run(string configname)
}
//set connectors
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetMomentsInterpolator());
//SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nueLB, iProcessor);
OneDistributionSetConnectorsBlockVisitor setConnsVisitor(comm);
grid->accept(setConnsVisitor);
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
+ // SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor_old());
SetInterpolationConnectorsBlockVisitor setInterConnsVisitor(comm, nueLB, iProcessor);
grid->accept(setInterConnsVisitor);
diff --git a/apps/cpu/Hagen_Poiseuille_flow/pflow.cpp b/apps/cpu/Hagen_Poiseuille_flow/pflow.cpp
index 074e8c3aa9b338fa00db0718862d20c7e99f5e55..5d5e47fddeecaf06b3b23590833ff2dc12d610fb 100644
--- a/apps/cpu/Hagen_Poiseuille_flow/pflow.cpp
+++ b/apps/cpu/Hagen_Poiseuille_flow/pflow.cpp
@@ -553,8 +553,8 @@ void pflowdp(string configname)
//////////////////////////////////////
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
@@ -657,7 +657,7 @@ void pflowdp(string configname)
grid->setTimeStep(restartStep);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Hagen_Poiseuille_flow2/pflow2.cpp b/apps/cpu/Hagen_Poiseuille_flow2/pflow2.cpp
index 40bf20ecabe23637b6271edd6ac6c4fd951f4760..f298d697f554f002f42438955ecbb3a3308ed219 100644
--- a/apps/cpu/Hagen_Poiseuille_flow2/pflow2.cpp
+++ b/apps/cpu/Hagen_Poiseuille_flow2/pflow2.cpp
@@ -194,7 +194,7 @@ void pflowdp(string configname)
//////////////////////////////////////
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
@@ -280,7 +280,7 @@ void pflowdp(string configname)
grid->accept(bcVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/HerschelBulkleyModel/hbflow.cpp b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
index 83686a88495ef5fc2a3ce8529453f2d59d30dab7..6abe6b5c55ce3fb3c54d5dd169a06b47026b9b3e 100644
--- a/apps/cpu/HerschelBulkleyModel/hbflow.cpp
+++ b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
@@ -290,7 +290,7 @@ void bflow(string configname)
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
//SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, k, iProcessor);
//grid->accept(setConnsVisitor);
diff --git a/apps/cpu/InterfaceTest/itest.cpp b/apps/cpu/InterfaceTest/itest.cpp
index face949bd7d68c8d4fe94d7e32dc728b7818f42f..723802f6d3160dd79c28c2347ed311d360020d77 100644
--- a/apps/cpu/InterfaceTest/itest.cpp
+++ b/apps/cpu/InterfaceTest/itest.cpp
@@ -94,9 +94,9 @@ void run()
ppblocks.reset();
//set connectors
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
- dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iProcessor)->setBulkOmegaToOmega(true);
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetMomentsInterpolator());
+ dynamicPointerCast<CompressibleOffsetMomentsInterpolator>(iProcessor)->setBulkOmegaToOmega(true);
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
UBLOG(logINFO, "SetConnectorsBlockVisitor:start");
diff --git a/apps/cpu/JetBreakup/CMakeLists.txt b/apps/cpu/JetBreakup/CMakeLists.txt
index b5bb536cf0c0b4820953ade37b1b5ccca265d7f2..162e9c959fc27171e3f0d7e1df5e62eb6ff7ef87 100644
--- a/apps/cpu/JetBreakup/CMakeLists.txt
+++ b/apps/cpu/JetBreakup/CMakeLists.txt
@@ -3,4 +3,4 @@
########################################################
PROJECT(JetBreakup)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} MultiphaseFlow FILES JetBreakup.cpp )
\ No newline at end of file
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} MultiphaseFlow NonNewtonianFluids FILES JetBreakup.cpp )
\ No newline at end of file
diff --git a/apps/cpu/JetBreakup/JetBreakup.cpp b/apps/cpu/JetBreakup/JetBreakup.cpp
index f4b74ca379edaf8840cb6875ca0ff9fc7f296509..9a1331995657a7a7e43eeb948134c154061c431b 100644
--- a/apps/cpu/JetBreakup/JetBreakup.cpp
+++ b/apps/cpu/JetBreakup/JetBreakup.cpp
@@ -2,14 +2,13 @@
#include <memory>
#include <string>
-#include "VirtualFluids.h"
#include "MultiphaseFlow/MultiphaseFlow.h"
+#include "VirtualFluids.h"
using namespace std;
void setInflowBC(real x1, real x2, real x3, real radius, int dir)
{
-
}
void run(string configname)
@@ -24,20 +23,20 @@ void run(string configname)
config.load(configname);
string pathname = config.getValue<string>("pathname");
- //string pathGeo = config.getValue<string>("pathGeo");
- //string geoFile = config.getValue<string>("geoFile");
+ // string pathGeo = config.getValue<string>("pathGeo");
+ // string geoFile = config.getValue<string>("geoFile");
int numOfThreads = config.getValue<int>("numOfThreads");
vector<int> blocknx = config.getVector<int>("blocknx");
- //vector<double> boundingBox = config.getVector<double>("boundingBox");
- // vector<double> length = config.getVector<double>("length");
+ // vector<double> boundingBox = config.getVector<double>("boundingBox");
+ // vector<double> length = config.getVector<double>("length");
real U_LB = config.getValue<real>("U_LB");
// double uF2 = config.getValue<double>("uF2");
- //double nuL = config.getValue<double>("nuL");
- //double nuG = config.getValue<double>("nuG");
- //double densityRatio = config.getValue<double>("densityRatio");
- //double sigma = config.getValue<double>("sigma");
+ // double nuL = config.getValue<double>("nuL");
+ // double nuG = config.getValue<double>("nuG");
+ // double densityRatio = config.getValue<double>("densityRatio");
+ // double sigma = config.getValue<double>("sigma");
int interfaceWidth = config.getValue<int>("interfaceWidth");
- //double D = config.getValue<double>("D");
+ // double D = config.getValue<double>("D");
real theta = config.getValue<real>("contactAngle");
real D_LB = config.getValue<real>("D_LB");
real phiL = config.getValue<real>("phi_L");
@@ -48,24 +47,21 @@ void run(string configname)
real endTime = config.getValue<real>("endTime");
real outTime = config.getValue<real>("outTime");
real availMem = config.getValue<real>("availMem");
- //int refineLevel = config.getValue<int>("refineLevel");
- //double Re = config.getValue<double>("Re");
-
+ // int refineLevel = config.getValue<int>("refineLevel");
+ // double Re = config.getValue<double>("Re");
+
bool logToFile = config.getValue<bool>("logToFile");
real restartStep = config.getValue<real>("restartStep");
real cpStart = config.getValue<real>("cpStart");
real cpStep = config.getValue<real>("cpStep");
bool newStart = config.getValue<bool>("newStart");
-
-
int caseN = config.getValue<int>("case");
SPtr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
int myid = comm->getProcessID();
- if (myid == 0)
- UBLOG(logINFO, "Jet Breakup: Start!");
+ if (myid == 0) UBLOG(logINFO, "Jet Breakup: Start!");
if (logToFile) {
#if defined(__unix__)
@@ -84,25 +80,25 @@ void run(string configname)
// Sleep(30000);
- real rho_h=0, rho_l=0, r_rho=0, mu_h=0, /*mu_l,*/ Uo=0, D=0, sigma=0;
+ real rho_h = 0, rho_l = 0, r_rho = 0, mu_h = 0, /*mu_l,*/ Uo = 0, D = 0, sigma = 0;
switch (caseN) {
- case 1:
- //density of heavy fluid (kg/m^3)
- rho_h = 848;
- //density of light fluid (kg/m^3)
+ case 1:
+ // density of heavy fluid (kg/m^3)
+ rho_h = 848;
+ // density of light fluid (kg/m^3)
rho_l = 34.5;
- //density ratio
+ // density ratio
r_rho = rho_h / rho_l;
- //dynamic viscosity of heavy fluid (Pa � s)
+ // dynamic viscosity of heavy fluid (Pa � s)
mu_h = 2.87e-3;
- //dynamic viscosity of light fluid (Pa � s)
- //mu_l = 1.97e-5;
- //velocity (m/s)
+ // dynamic viscosity of light fluid (Pa � s)
+ // mu_l = 1.97e-5;
+ // velocity (m/s)
Uo = 100;
- //diameter of jet (m)
+ // diameter of jet (m)
D = 0.0001;
- //surface tension (N/m)
+ // surface tension (N/m)
sigma = 0.03;
break;
case 2:
@@ -115,7 +111,7 @@ void run(string configname)
// dynamic viscosity of heavy fluid (Pa � s)
mu_h = 2.87e-3;
// dynamic viscosity of light fluid (Pa � s)
- //mu_l = 1.84e-5;
+ // mu_l = 1.84e-5;
// velocity (m/s)
Uo = 200;
// diameter of jet (m)
@@ -133,14 +129,14 @@ void run(string configname)
// dynamic viscosity of heavy fluid (Pa � s)
mu_h = 2.87e-3;
// dynamic viscosity of light fluid (Pa � s)
- //mu_l = 1.84e-5;
+ // mu_l = 1.84e-5;
// velocity (m/s)
Uo = 200;
// diameter of jet (m)
D = 0.0001;
// surface tension (N/m)
sigma = 0.03;
- break;
+ break;
}
real Re = rho_h * Uo * D / mu_h;
@@ -149,14 +145,15 @@ void run(string configname)
real dx = D / D_LB;
real nu_h = U_LB * D_LB / Re;
real nu_l = nu_h;
+ nu_h *= 100;
real rho_h_LB = 1;
- //surface tension
+ // surface tension
real sigma_LB = rho_h_LB * U_LB * U_LB * D_LB / We;
// LBMReal dLB = 0; // = length[1] / dx;
real rhoLB = 0.0;
- //LBMReal nuLB = nu_l; //(uLB*dLB) / Re;
+ // LBMReal nuLB = nu_l; //(uLB*dLB) / Re;
real beta = 12.0 * sigma_LB / interfaceWidth;
real kappa = 1.5 * interfaceWidth * sigma_LB;
@@ -177,6 +174,19 @@ void run(string configname)
UBLOG(logINFO, "path = " << pathname);
}
+ // bounding box
+ real g_minX1 = 0;
+ real g_minX2 = 0;
+ real g_minX3 = 0;
+
+ // double g_maxX1 = 8.0*D;
+ // double g_maxX2 = 2.5*D;
+ // double g_maxX3 = 2.5*D;
+
+ real g_maxX1 = 2.0 * D;
+ real g_maxX2 = 2.5 * D;
+ real g_maxX3 = 2.5 * D;
+
SPtr<LBMUnitConverter> conv(new LBMUnitConverter());
// const int baseLevel = 0;
@@ -188,8 +198,10 @@ void run(string configname)
// kernel = SPtr<LBMKernel>(new MultiphaseTwoPhaseFieldsCumulantLBMKernel());
// kernel = SPtr<LBMKernel>(new MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel());
// kernel = SPtr<LBMKernel>(new MultiphaseTwoPhaseFieldsPressureFilterLBMKernel());
- //kernel = SPtr<LBMKernel>(new MultiphasePressureFilterLBMKernel());
- kernel = SPtr<LBMKernel>(new MultiphaseSimpleVelocityBaseExternalPressureLBMKernel());
+ // kernel = SPtr<LBMKernel>(new MultiphasePressureFilterLBMKernel());
+ // kernel = SPtr<LBMKernel>(new MultiphaseSimpleVelocityBaseExternalPressureLBMKernel());
+ kernel = make_shared<MultiphaseScaleDistributionLBMKernel>();
+ //kernel = make_shared<MultiphaseSharpInterfaceLBMKernel>();
kernel->setWithForcing(true);
kernel->setForcingX1(0.0);
@@ -208,7 +220,8 @@ void run(string configname)
kernel->setMultiphaseModelParameters(beta, kappa);
kernel->setContactAngle(theta);
kernel->setInterfaceWidth(interfaceWidth);
- //dynamicPointerCast<MultiphasePressureFilterLBMKernel>(kernel)->setPhaseFieldBC(0.0);
+ // dynamicPointerCast<MultiphasePressureFilterLBMKernel>(kernel)->setPhaseFieldBC(0.0);
+ kernel->setSigma(sigma);
SPtr<BCSet> bcProc(new BCSet());
// BCSetPtr bcProc(new ThinWallBCSet());
@@ -221,8 +234,7 @@ void run(string configname)
// grid->setPeriodicX3(true);
grid->setGhostLayerWidth(2);
- SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(
- comm, MetisPartitioningGridVisitor::LevelBased, DIR_MMM, MetisPartitioner::RECURSIVE));
+ SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, DIR_MMM, MetisPartitioner::RECURSIVE));
//////////////////////////////////////////////////////////////////////////
// restart
@@ -240,25 +252,26 @@ void run(string configname)
// BC Adapter
//////////////////////////////////////////////////////////////////////////////
mu::Parser fctF1;
- // fctF1.SetExpr("vy1*(1-((x1-x0)^2+(x3-z0)^2)/(R^2))");
- // fctF1.SetExpr("vy1*(1-(sqrt((x1-x0)^2+(x3-z0)^2)/R))^0.1");
- fctF1.SetExpr("vy1");
- fctF1.DefineConst("vy1", 0.0);
- fctF1.DefineConst("R", 8.0);
- fctF1.DefineConst("x0", 0.0);
- fctF1.DefineConst("z0", 0.0);
- // SPtr<BC> velBCF1(
- // new MultiphaseVelocityBC(false, true, false, fctF1, phiH, 0.0, BCFunction::INFCONST));
+ // u_actual(r) = U_max * (4 / (D^2) * (R^2 - r^2))
+ fctF1.SetExpr("vx1*(1-((x2-y0)^2+(x3-z0)^2)/(R^2))");
+ // fctF1.SetExpr("vx1*(1-(sqrt((x2-y0)^2+(x3-z0)^2))/(R))");
+ // fctF1.SetExpr("vy1*(1-(sqrt((x2-x0)^2+(x3-z0)^2)/R))^0.1");
+ // fctF1.SetExpr("vx1");
+ //fctF1.DefineConst("vx1", 0);
+ fctF1.DefineConst("vx1", U_LB);
+ fctF1.DefineConst("R", 0.5 * D);
+ fctF1.DefineConst("y0", (g_minX2 + g_maxX2) / 2);
+ fctF1.DefineConst("z0", (g_minX3 + g_maxX3) / 2);
+ SPtr<BC> velBCF1(new MultiphaseVelocityBC(true, false, false, fctF1, phiH, 0.0, BCFunction::INFCONST));
mu::Parser fctF2;
- fctF2.SetExpr("vy1");
- fctF2.DefineConst("vy1", U_LB);
+ fctF2.SetExpr("vx1");
+ fctF2.DefineConst("vx1", U_LB);
- real startTime = 1;
- SPtr<BC> velBCF1(
- new MultiphaseVelocityBC(true, false, false, fctF1, phiH, 0.0, startTime));
- SPtr<BC> velBCF2(
- new MultiphaseVelocityBC(true, false, false, fctF2, phiH, startTime, endTime));
+ // real startTime = 1;
+ // SPtr<BC> velBCF1(new MultiphaseVelocityBC(true, false, false, fctF1, phiH, 0.0, startTime));
+ // SPtr<BC> velBCF2(new MultiphaseVelocityBC(true, false, false, fctF2, phiH, startTime, endTime));
+ SPtr<BC> velBCF2(new MultiphaseVelocityBC(true, false, false, fctF2, phiH*0.2, 0.0, BCFunction::INFCONST));
SPtr<BC> noSlipBC(new NoSlipBC());
noSlipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNoSlipBCStrategy()));
@@ -279,15 +292,17 @@ void run(string configname)
fctvel_F2_init.DefineConst("U", 0);
velBCF1->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
+ velBCF2->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
bcVisitor.addBC(noSlipBC);
- bcVisitor.addBC(denBC); // Ohne das BB?
+ // bcVisitor.addBC(denBC); // Ohne das BB?
bcVisitor.addBC(velBCF1);
+ bcVisitor.addBC(velBCF2);
- //SPtr<D3Q27Interactor> inflowF1Int;
- //SPtr<D3Q27Interactor> cylInt;
+ // SPtr<D3Q27Interactor> inflowF1Int;
+ // SPtr<D3Q27Interactor> cylInt;
SPtr<D3Q27Interactor> inflowInt;
@@ -295,54 +310,31 @@ void run(string configname)
// if (newStart) {
- // bounding box
- real g_minX1 = 0;
- real g_minX2 = 0;
- real g_minX3 = 0;
-
- //double g_maxX1 = 8.0*D;
- //double g_maxX2 = 2.5*D;
- //double g_maxX3 = 2.5*D;
-
- real g_maxX1 = 1.0 * D; // 8.0 * D;
- real g_maxX2 = 2.0 * D;
- real g_maxX3 = 2.0 * D;
-
// geometry
SPtr<GbObject3D> gridCube(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3));
- if (myid == 0)
- GbSystem3D::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube",
- WbWriterVtkXmlBinary::getInstance());
-
- //if (myid == 0)
- // UBLOG(logINFO, "Read geoFile:start");
- //SPtr<GbTriFaceMesh3D> cylinder = make_shared<GbTriFaceMesh3D>();
- //cylinder->readMeshFromSTLFileBinary(pathGeo + "/" + geoFile, false);
- //GbSystem3D::writeGeoObject(cylinder.get(), pathname + "/geo/Stlgeo", WbWriterVtkXmlBinary::getInstance());
- //if (myid == 0)
- // UBLOG(logINFO, "Read geoFile:stop");
- // inflow
- // GbCuboid3DPtr geoInflowF1(new GbCuboid3D(g_minX1, g_minX2 - 0.5 * dx, g_minX3, g_maxX1, g_minX2 - 1.0 *
- // dx, g_maxX3));
- //GbCuboid3DPtr geoInflowF1(new GbCuboid3D(g_minX1 * 0.5 - dx, g_minX2 - dx, g_minX3 * 0.5 - dx,
- // g_maxX1 * 0.5 + dx, g_minX2, g_maxX3 * 0.5 + dx));
- //if (myid == 0)
- // GbSystem3D::writeGeoObject(geoInflowF1.get(), pathname + "/geo/geoInflowF1",
- // WbWriterVtkXmlASCII::getInstance());
+ if (myid == 0) GbSystem3D::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
- GbCylinder3DPtr geoInflow(new GbCylinder3D(g_minX1 - 2.0*dx, g_maxX2 / 2.0, g_maxX3 / 2.0, g_minX1,
- g_maxX2 / 2.0,
- g_maxX3 / 2.0, D / 2.0));
- if (myid == 0)
- GbSystem3D::writeGeoObject(geoInflow.get(), pathname + "/geo/geoInflow",
- WbWriterVtkXmlASCII::getInstance());
+ // if (myid == 0)
+ // UBLOG(logINFO, "Read geoFile:start");
+ // SPtr<GbTriFaceMesh3D> cylinder = make_shared<GbTriFaceMesh3D>();
+ // cylinder->readMeshFromSTLFileBinary(pathGeo + "/" + geoFile, false);
+ // GbSystem3D::writeGeoObject(cylinder.get(), pathname + "/geo/Stlgeo", WbWriterVtkXmlBinary::getInstance());
+ // if (myid == 0)
+ // UBLOG(logINFO, "Read geoFile:stop");
+ // inflow
+ // GbCuboid3DPtr geoInflowF1(new GbCuboid3D(g_minX1, g_minX2 - 0.5 * dx, g_minX3, g_maxX1, g_minX2 - 1.0 *
+ // dx, g_maxX3));
+ // GbCuboid3DPtr geoInflowF1(new GbCuboid3D(g_minX1 * 0.5 - dx, g_minX2 - dx, g_minX3 * 0.5 - dx,
+ // g_maxX1 * 0.5 + dx, g_minX2, g_maxX3 * 0.5 + dx));
+ // if (myid == 0)
+ // GbSystem3D::writeGeoObject(geoInflowF1.get(), pathname + "/geo/geoInflowF1",
+ // WbWriterVtkXmlASCII::getInstance());
- GbCylinder3DPtr geoSolid(new GbCylinder3D(g_minX1 - 2.0 * dx, g_maxX2 / 2.0, g_maxX3 / 2.0, g_minX1-dx,
- g_maxX2 / 2.0, g_maxX3 / 2.0, 1.5*D / 2.0));
- if (myid == 0)
- GbSystem3D::writeGeoObject(geoSolid.get(), pathname + "/geo/geoSolid",
- WbWriterVtkXmlASCII::getInstance());
+ GbCylinder3DPtr geoInflow(new GbCylinder3D(g_minX1 - 2.0 * dx, g_maxX2 / 2.0, g_maxX3 / 2.0, g_minX1, g_maxX2 / 2.0, g_maxX3 / 2.0, D / 2.0));
+ if (myid == 0) GbSystem3D::writeGeoObject(geoInflow.get(), pathname + "/geo/geoInflow", WbWriterVtkXmlASCII::getInstance());
+ GbCylinder3DPtr geoSolid(new GbCylinder3D(g_minX1 - 2.0 * dx, g_maxX2 / 2.0, g_maxX3 / 2.0, g_minX1 - dx, g_maxX2 / 2.0, g_maxX3 / 2.0, 1.5 * D / 2.0));
+ if (myid == 0) GbSystem3D::writeGeoObject(geoSolid.get(), pathname + "/geo/geoSolid", WbWriterVtkXmlASCII::getInstance());
// GbCylinder3DPtr cylinder2(
// new GbCylinder3D(0.0, g_minX2 - 2.0 * dx / 2.0, 0.0, 0.0, g_minX2 + 4.0 * dx, 0.0, 8.0+2.0*dx));
@@ -352,8 +344,8 @@ void run(string configname)
// outflow
// GbCuboid3DPtr geoOutflow(new GbCuboid3D(-1.0, -1, -1.0, 121.0, 1.0, 121.0)); // For JetBreakup (Original)
// GbCuboid3DPtr geoOutflow(new GbCuboid3D(g_minX1, g_maxX2 - 40 * dx, g_minX3, g_maxX1, g_maxX2, g_maxX3));
- GbCuboid3DPtr geoOutflow(new GbCuboid3D(g_maxX1, g_minX2 - 2.0*dx, g_minX3 - 2.0*dx, g_maxX1 + 2.0*dx, g_maxX2 + 2.0*dx, g_maxX3));
- if (myid == 0) GbSystem3D::writeGeoObject(geoOutflow.get(), pathname + "/geo/geoOutflow", WbWriterVtkXmlASCII::getInstance());
+ GbCuboid3DPtr geoOutflow(new GbCuboid3D(g_maxX1, g_minX2 - 2.0 * dx, g_minX3 - 2.0 * dx, g_maxX1 + 2.0 * dx, g_maxX2 + 2.0 * dx, g_maxX3));
+ if (myid == 0) GbSystem3D::writeGeoObject(geoOutflow.get(), pathname + "/geo/geoOutflow", WbWriterVtkXmlASCII::getInstance());
// double blockLength = blocknx[0] * dx;
@@ -371,11 +363,10 @@ void run(string configname)
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
- SPtr<WriteBlocksSimulationObserver> ppblocks(new WriteBlocksSimulationObserver(
- grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
+ SPtr<WriteBlocksSimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- //SPtr<Interactor3D> tubes(new D3Q27TriFaceMeshInteractor(cylinder, grid, noSlipBC,
- // Interactor3D::SOLID, Interactor3D::POINTS));
+ // SPtr<Interactor3D> tubes(new D3Q27TriFaceMeshInteractor(cylinder, grid, noSlipBC,
+ // Interactor3D::SOLID, Interactor3D::POINTS));
// inflowF1Int =
// SPtr<D3Q27Interactor>(new D3Q27Interactor(cylinder1, grid, noSlipBC, Interactor3D::SOLID));
@@ -384,64 +375,55 @@ void run(string configname)
SPtr<D3Q27Interactor> outflowInt(new D3Q27Interactor(geoOutflow, grid, denBC, Interactor3D::SOLID));
// Create boundary conditions geometry
- GbCuboid3DPtr wallXmin(
- new GbCuboid3D(g_minX1 - 2.0*dx, g_minX2 - 2.0*dx, g_minX3 - 2.0*dx, g_minX1, g_maxX2 + 2.0*dx, g_maxX3));
+ GbCuboid3DPtr wallXmin(new GbCuboid3D(g_minX1 - 2.0 * dx, g_minX2 - 2.0 * dx, g_minX3 - 2.0 * dx, g_minX1, g_maxX2 + 2.0 * dx, g_maxX3));
GbSystem3D::writeGeoObject(wallXmin.get(), pathname + "/geo/wallXmin", WbWriterVtkXmlASCII::getInstance());
- GbCuboid3DPtr wallXmax(
- new GbCuboid3D(g_maxX1, g_minX2 - 2.0*dx, g_minX3 - 2.0*dx, g_maxX1 + 2.0*dx, g_maxX2 + 2.0*dx, g_maxX3));
+ GbCuboid3DPtr wallXmax(new GbCuboid3D(g_maxX1, g_minX2 - 2.0 * dx, g_minX3 - 2.0 * dx, g_maxX1 + 2.0 * dx, g_maxX2 + 2.0 * dx, g_maxX3));
GbSystem3D::writeGeoObject(wallXmax.get(), pathname + "/geo/wallXmax", WbWriterVtkXmlASCII::getInstance());
- GbCuboid3DPtr wallZmin(
- new GbCuboid3D(g_minX1 - 2.0*dx, g_minX2 - 2.0*dx, g_minX3 - 2.0*dx, g_maxX1 + 2.0*dx, g_maxX2 + 2.0*dx, g_minX3));
+ GbCuboid3DPtr wallZmin(new GbCuboid3D(g_minX1 - 2.0 * dx, g_minX2 - 2.0 * dx, g_minX3 - 2.0 * dx, g_maxX1 + 2.0 * dx, g_maxX2 + 2.0 * dx, g_minX3));
GbSystem3D::writeGeoObject(wallZmin.get(), pathname + "/geo/wallZmin", WbWriterVtkXmlASCII::getInstance());
- GbCuboid3DPtr wallZmax(
- new GbCuboid3D(g_minX1 - 2.0*dx, g_minX2 - 2.0*dx, g_maxX3, g_maxX1 + 2.0*dx, g_maxX2 + 2.0*dx, g_maxX3 + 2.0*dx));
+ GbCuboid3DPtr wallZmax(new GbCuboid3D(g_minX1 - 2.0 * dx, g_minX2 - 2.0 * dx, g_maxX3, g_maxX1 + 2.0 * dx, g_maxX2 + 2.0 * dx, g_maxX3 + 2.0 * dx));
GbSystem3D::writeGeoObject(wallZmax.get(), pathname + "/geo/wallZmax", WbWriterVtkXmlASCII::getInstance());
- GbCuboid3DPtr wallYmin(
- new GbCuboid3D(g_minX1 - 2.0*dx, g_minX2 - 2.0*dx, g_minX3 - 2.0*dx, g_maxX1 + 2.0*dx, g_minX2, g_maxX3));
+ GbCuboid3DPtr wallYmin(new GbCuboid3D(g_minX1 - 2.0 * dx, g_minX2 - 2.0 * dx, g_minX3 - 2.0 * dx, g_maxX1 + 2.0 * dx, g_minX2, g_maxX3));
GbSystem3D::writeGeoObject(wallYmin.get(), pathname + "/geo/wallYmin", WbWriterVtkXmlASCII::getInstance());
- GbCuboid3DPtr wallYmax(
- new GbCuboid3D(g_minX1 - 2.0*dx, g_maxX2, g_minX3 - 2.0*dx, g_maxX1 + 2.0*dx, g_maxX2 + 2.0*dx, g_maxX3));
+ GbCuboid3DPtr wallYmax(new GbCuboid3D(g_minX1 - 2.0 * dx, g_maxX2, g_minX3 - 2.0 * dx, g_maxX1 + 2.0 * dx, g_maxX2 + 2.0 * dx, g_maxX3));
GbSystem3D::writeGeoObject(wallYmax.get(), pathname + "/geo/wallYmax", WbWriterVtkXmlASCII::getInstance());
// Add boundary conditions to grid generator
- SPtr<D3Q27Interactor> wallXminInt(
- new D3Q27Interactor(wallXmin, grid, noSlipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallXmaxInt(
- new D3Q27Interactor(wallXmax, grid, noSlipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallZminInt(
- new D3Q27Interactor(wallZmin, grid, noSlipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallZmaxInt(
- new D3Q27Interactor(wallZmax, grid, noSlipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallYminInt(
- new D3Q27Interactor(wallYmin, grid, noSlipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallYmaxInt(
- new D3Q27Interactor(wallYmax, grid, noSlipBC, Interactor3D::SOLID));
-
- //cylInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(cylinder1, grid, velBCF1, Interactor3D::SOLID));
- //cylInt->addBC(velBCF2);
- // SPtr<D3Q27Interactor> cyl2Int(new D3Q27Interactor(cylinder2, grid, noSlipBC,
- // Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallXminInt(new D3Q27Interactor(wallXmin, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallXmaxInt(new D3Q27Interactor(wallXmax, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallZminInt(new D3Q27Interactor(wallZmin, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallZmaxInt(new D3Q27Interactor(wallZmax, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallYminInt(new D3Q27Interactor(wallYmin, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallYmaxInt(new D3Q27Interactor(wallYmax, grid, noSlipBC, Interactor3D::SOLID));
+
+ // cylInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(cylinder1, grid, velBCF1, Interactor3D::SOLID));
+ // cylInt->addBC(velBCF2);
+ // SPtr<D3Q27Interactor> cyl2Int(new D3Q27Interactor(cylinder2, grid, noSlipBC,
+ // Interactor3D::SOLID));
inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, velBCF1, Interactor3D::SOLID));
- inflowInt->addBC(velBCF2);
+ // inflowInt->addBC(velBCF2);
+
+ GbCylinder3DPtr geoAirInflow(new GbCylinder3D(g_minX1 - 2.0 * dx, g_maxX2 / 2.0, g_maxX3 / 2.0, g_minX1, g_maxX2 / 2.0, g_maxX3 / 2.0, D * 0.9 / 2.0));
+ if (myid == 0) GbSystem3D::writeGeoObject(geoAirInflow.get(), pathname + "/geo/geoAirInflow", WbWriterVtkXmlASCII::getInstance());
+ SPtr<D3Q27Interactor> inflowAirInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoAirInflow, grid, velBCF2, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> solidInt =
- SPtr<D3Q27Interactor>(new D3Q27Interactor(geoSolid, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> solidInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoSolid, grid, noSlipBC, Interactor3D::SOLID));
InteractorsHelper intHelper(grid, metisVisitor, true);
- //intHelper.addInteractor(cylInt);
- //intHelper.addInteractor(tubes);
- intHelper.addInteractor(outflowInt);
- // intHelper.addInteractor(cyl2Int);
+ // intHelper.addInteractor(cylInt);
+ // intHelper.addInteractor(tubes);
+ // intHelper.addInteractor(outflowInt);
+ // intHelper.addInteractor(cyl2Int);
intHelper.addInteractor(wallXminInt);
- //intHelper.addInteractor(wallXmaxInt);
+ intHelper.addInteractor(wallXmaxInt);
intHelper.addInteractor(wallZminInt);
intHelper.addInteractor(wallZmaxInt);
intHelper.addInteractor(wallYminInt);
intHelper.addInteractor(wallYmaxInt);
- intHelper.addInteractor(inflowInt);
- //intHelper.addInteractor(solidInt);
+ //intHelper.addInteractor(inflowInt);
+ intHelper.addInteractor(inflowAirInt);
intHelper.selectBlocks();
@@ -450,13 +432,10 @@ void run(string configname)
unsigned long long numberOfBlocks = (unsigned long long)grid->getNumberOfBlocks();
int ghostLayer = 3;
- unsigned long long numberOfNodesPerBlock =
- (unsigned long long)(blocknx[0]) * (unsigned long long)(blocknx[1]) * (unsigned long long)(blocknx[2]);
+ unsigned long long numberOfNodesPerBlock = (unsigned long long)(blocknx[0]) * (unsigned long long)(blocknx[1]) * (unsigned long long)(blocknx[2]);
unsigned long long numberOfNodes = numberOfBlocks * numberOfNodesPerBlock;
- unsigned long long numberOfNodesPerBlockWithGhostLayer =
- numberOfBlocks * (blocknx[0] + ghostLayer) * (blocknx[1] + ghostLayer) * (blocknx[2] + ghostLayer);
- real needMemAll =
- real(numberOfNodesPerBlockWithGhostLayer * (27 * sizeof(real) + sizeof(int) + sizeof(float) * 4));
+ unsigned long long numberOfNodesPerBlockWithGhostLayer = numberOfBlocks * (blocknx[0] + ghostLayer) * (blocknx[1] + ghostLayer) * (blocknx[2] + ghostLayer);
+ real needMemAll = real(numberOfNodesPerBlockWithGhostLayer * (27 * sizeof(real) + sizeof(int) + sizeof(float) * 4));
real needMem = needMemAll / real(comm->getNumberOfProcesses());
if (myid == 0) {
@@ -478,31 +457,44 @@ void run(string configname)
grid->accept(kernelVisitor);
- //if (refineLevel > 0) {
- // SetUndefinedNodesBlockVisitor undefNodesVisitor;
- // grid->accept(undefNodesVisitor);
- //}
+ // if (refineLevel > 0) {
+ // SetUndefinedNodesBlockVisitor undefNodesVisitor;
+ // grid->accept(undefNodesVisitor);
+ // }
intHelper.setBC();
// initialization of distributions
- //mu::Parser fct1;
- //fct1.SetExpr("phiL");
- //fct1.DefineConst("phiL", phiL);
- real x1c = 0; // (g_maxX1 - g_minX1-1)/2; //
- real x2c = (g_maxX2 - g_minX2)/2;
- real x3c = (g_maxX3 - g_minX3)/2;
-
+ // mu::Parser fct1;
+ // fct1.SetExpr("phiL");
+ // fct1.DefineConst("phiL", phiL);
+ real x1c = 0; // (g_maxX1 - g_minX1-1)/2; //
+ real x2c = (g_minX2 + g_maxX2) / 2;
+ real x3c = (g_minX3 + g_maxX3) / 2;
+
mu::Parser fct1;
- fct1.SetExpr("0.5-0.5*tanh(2*(sqrt((x1-x1c)^2+(x2-x2c)^2+(x3-x3c)^2)-radius)/interfaceThickness)");
+ fct1.SetExpr("(0.5-0.5*tanh(2*(sqrt((x1/radius-x1c)^2+(x2-x2c)^2+(x3-x3c)^2)-radius)/interfaceThickness))-(0.5-0.5*tanh(2*(sqrt((x1/radius-x1c)^2+(x2-x2c)^2+(x3-x3c)^2)-radius2)/interfaceThickness))");
+ //fct1.SetExpr("x1 < 4*dx ? (0.5-0.5*tanh(2*(1-4*dx)*(sqrt((x2-x2c)^2+(x3-x3c)^2)-radius)/interfaceThickness)) : 0");
fct1.DefineConst("x1c", x1c);
fct1.DefineConst("x2c", x2c);
fct1.DefineConst("x3c", x3c);
- fct1.DefineConst("radius", 0.5*D);
- fct1.DefineConst("interfaceThickness", interfaceWidth*dx);
+ fct1.DefineConst("dx", dx);
+ fct1.DefineConst("radius", 0.5 * D /* + 2. * dx*/);
+ fct1.DefineConst("radius2", D/4.);
+ fct1.DefineConst("interfaceThickness", interfaceWidth * dx);
+
+ mu::Parser fct2;
+ // fct1.SetExpr("0.5-0.5*tanh(2*(sqrt((x1/radius-x1c)^2+(x2-x2c)^2+(x3-x3c)^2)-radius)/interfaceThickness)");
+ fct2.SetExpr("x1 < 4*dx ? (0.5-0.5*tanh(2*(1-4*dx)*(sqrt((x2-x2c)^2+(x3-x3c)^2)-radius)/interfaceThickness)) : 0");
+ fct2.DefineConst("x1c", x1c);
+ fct2.DefineConst("x2c", x2c);
+ fct2.DefineConst("x3c", x3c);
+ fct2.DefineConst("dx", dx);
+ fct2.DefineConst("radius", 0.5 * D /* + 2. * dx*/);
+ fct2.DefineConst("interfaceThickness", interfaceWidth * dx);
MultiphaseVelocityFormInitDistributionsBlockVisitor initVisitor;
- initVisitor.setPhi(fct1);
+ //initVisitor.setPhi(fct1);
grid->accept(initVisitor);
///////////////////////////////////////////////////////////////////////////////////////////
//{
@@ -549,22 +541,19 @@ void run(string configname)
// boundary conditions grid
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<WriteBoundaryConditionsSimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(
- grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
+ SPtr<WriteBoundaryConditionsSimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
ppgeo->update(0);
ppgeo.reset();
}
- if (myid == 0)
- UBLOG(logINFO, "Preprocess - end");
+ if (myid == 0) UBLOG(logINFO, "Preprocess - end");
} else {
rcp->restart((int)restartStep);
grid->setTimeStep(restartStep);
- if (myid == 0)
- UBLOG(logINFO, "Restart - end");
+ if (myid == 0) UBLOG(logINFO, "Restart - end");
}
-
+
// TwoDistributionsSetConnectorsBlockVisitor setConnsVisitor(comm);
// grid->accept(setConnsVisitor);
@@ -572,25 +561,26 @@ void run(string configname)
grid->accept(bcVisitor);
- ThreeDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
- //TwoDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
+ // ThreeDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
+ TwoDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
grid->accept(setConnsVisitor);
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
real t_ast, t;
t_ast = 7.19;
- t = (int)(t_ast/(U_LB/(D_LB)));
- visSch->addSchedule(t,t,t); //t=7.19
- SPtr<WriteMultiphaseQuantitiesSimulationObserver> pp(new WriteMultiphaseQuantitiesSimulationObserver(
- grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
+ t = (int)(t_ast / (U_LB / (D_LB)));
+ visSch->addSchedule(t, t, t); // t=7.19
+ // SPtr<WriteMultiphaseQuantitiesSimulationObserver> pp(new WriteMultiphaseQuantitiesSimulationObserver(
+ // grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
+ SPtr<WriteSharpInterfaceQuantitiesSimulationObserver> pp(new WriteSharpInterfaceQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
pp->update(0);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
SPtr<NUPSCounterSimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
- SPtr<UbScheduler> timeBCSch(new UbScheduler(1, startTime, startTime));
- auto timeDepBC = make_shared<TimeDependentBCSimulationObserver>(TimeDependentBCSimulationObserver(grid, timeBCSch));
- timeDepBC->addInteractor(inflowInt);
+ // SPtr<UbScheduler> timeBCSch(new UbScheduler(1, startTime, startTime));
+ // auto timeDepBC = make_shared<TimeDependentBCSimulationObserver>(TimeDependentBCSimulationObserver(grid, timeBCSch));
+ // timeDepBC->addInteractor(inflowInt);
#ifdef _OPENMP
omp_set_num_threads(numOfThreads);
@@ -600,14 +590,12 @@ void run(string configname)
SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
simulation->addSimulationObserver(npr);
simulation->addSimulationObserver(pp);
- simulation->addSimulationObserver(timeDepBC);
+ // simulation->addSimulationObserver(timeDepBC);
simulation->addSimulationObserver(rcp);
- if (myid == 0)
- UBLOG(logINFO, "Simulation-start");
+ if (myid == 0) UBLOG(logINFO, "Simulation-start");
simulation->run();
- if (myid == 0)
- UBLOG(logINFO, "Simulation-end");
+ if (myid == 0) UBLOG(logINFO, "Simulation-end");
} catch (std::exception &e) {
cerr << e.what() << endl << flush;
} catch (std::string &s) {
diff --git a/apps/cpu/LaminarTubeFlow/ltf.cpp b/apps/cpu/LaminarTubeFlow/ltf.cpp
index c70c2c19e7a02129ff00f8ca3bd0d7e53894831c..315bee6f263b3d5395499c0ed925c3790d7bfcdf 100644
--- a/apps/cpu/LaminarTubeFlow/ltf.cpp
+++ b/apps/cpu/LaminarTubeFlow/ltf.cpp
@@ -311,7 +311,7 @@ void run(string configname)
OneDistributionSetConnectorsBlockVisitor setConnsVisitor(comm);
grid->accept(setConnsVisitor);
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
SetInterpolationConnectorsBlockVisitor setInterConnsVisitor(comm, nuLB, iProcessor);
grid->accept(setInterConnsVisitor);
diff --git a/apps/cpu/Multiphase/Multiphase (Droplet Test).cpp.backup b/apps/cpu/Multiphase/Multiphase (Droplet Test).cpp.backup
index 533fb619c2bb82783b99110894079594b5ddba47..b783a354fd39f66ba82383f2387daf92ecbde758 100644
--- a/apps/cpu/Multiphase/Multiphase (Droplet Test).cpp.backup
+++ b/apps/cpu/Multiphase/Multiphase (Droplet Test).cpp.backup
@@ -370,8 +370,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -420,8 +420,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/Multiphase (Jet breakup on Phoenix).cpp.backup b/apps/cpu/Multiphase/Multiphase (Jet breakup on Phoenix).cpp.backup
index 954d4b539411adb36ea47724ab612fcd8d70be87..ebf91e6cb54f1a067535ae512f85e706a2d88980 100644
--- a/apps/cpu/Multiphase/Multiphase (Jet breakup on Phoenix).cpp.backup
+++ b/apps/cpu/Multiphase/Multiphase (Jet breakup on Phoenix).cpp.backup
@@ -396,8 +396,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -446,8 +446,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/backup/CumulantKernel-Before Cumulant modifications.cpp b/apps/cpu/Multiphase/backup/CumulantKernel-Before Cumulant modifications.cpp
index 860a1f1128fb161ee502bf8e1989748722a7941b..a667643c51186f3494d4e80018c482494ed8af30 100644
--- a/apps/cpu/Multiphase/backup/CumulantKernel-Before Cumulant modifications.cpp
+++ b/apps/cpu/Multiphase/backup/CumulantKernel-Before Cumulant modifications.cpp
@@ -1,6 +1,6 @@
#include "MultiphaseCumulantLBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include <math.h>
#include <omp.h>
diff --git a/apps/cpu/Multiphase/backup/Multiphase (Droplet Test).cpp b/apps/cpu/Multiphase/backup/Multiphase (Droplet Test).cpp
index 3362f66d5b07d1b94fd6c2623af58011ae425905..e6efac95353e04e93aae0a9dfcde0422259a2832 100644
--- a/apps/cpu/Multiphase/backup/Multiphase (Droplet Test).cpp
+++ b/apps/cpu/Multiphase/backup/Multiphase (Droplet Test).cpp
@@ -370,8 +370,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -420,8 +420,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/backup/Multiphase (Final before automation).cpp b/apps/cpu/Multiphase/backup/Multiphase (Final before automation).cpp
index 5ed66edace35c61fa3244c445fa479db13ccec8f..61d37660015ae6b6134e6d30c83010f75ec362e6 100644
--- a/apps/cpu/Multiphase/backup/Multiphase (Final before automation).cpp
+++ b/apps/cpu/Multiphase/backup/Multiphase (Final before automation).cpp
@@ -474,8 +474,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -524,8 +524,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/backup/Multiphase (Flow Focusing).cpp b/apps/cpu/Multiphase/backup/Multiphase (Flow Focusing).cpp
index a6355a2aa56e0bd85d919250e750427df7662284..32548c12b0d559928bf789cd2187cb180213dc65 100644
--- a/apps/cpu/Multiphase/backup/Multiphase (Flow Focusing).cpp
+++ b/apps/cpu/Multiphase/backup/Multiphase (Flow Focusing).cpp
@@ -448,8 +448,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -498,8 +498,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/backup/Multiphase (Jet breakup on Phoenix).cpp b/apps/cpu/Multiphase/backup/Multiphase (Jet breakup on Phoenix).cpp
index 954d4b539411adb36ea47724ab612fcd8d70be87..ebf91e6cb54f1a067535ae512f85e706a2d88980 100644
--- a/apps/cpu/Multiphase/backup/Multiphase (Jet breakup on Phoenix).cpp
+++ b/apps/cpu/Multiphase/backup/Multiphase (Jet breakup on Phoenix).cpp
@@ -396,8 +396,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -446,8 +446,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/backup/Multiphase (T-Junction).cpp b/apps/cpu/Multiphase/backup/Multiphase (T-Junction).cpp
index 1af6f9a19754035d1e4cc1466d80fa0d77de52c7..93844c4a2f9068debe7759943efb3243da923703 100644
--- a/apps/cpu/Multiphase/backup/Multiphase (T-Junction).cpp
+++ b/apps/cpu/Multiphase/backup/Multiphase (T-Junction).cpp
@@ -376,8 +376,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -426,8 +426,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/backup/Multiphase (Thermal).cpp b/apps/cpu/Multiphase/backup/Multiphase (Thermal).cpp
index 51ba4463a32740f8b2e07391d1ab174ccb9e7095..68e07b43c2cfff23affee121f9d8b39997d0fd8d 100644
--- a/apps/cpu/Multiphase/backup/Multiphase (Thermal).cpp
+++ b/apps/cpu/Multiphase/backup/Multiphase (Thermal).cpp
@@ -417,8 +417,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -467,8 +467,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/backup/Multiphase (Tube).cpp b/apps/cpu/Multiphase/backup/Multiphase (Tube).cpp
index 7e6dfd24a1ba90420891de57a7ba399d5c860e7d..492a906b816129de271189ab8d35fe1a4d180b56 100644
--- a/apps/cpu/Multiphase/backup/Multiphase (Tube).cpp
+++ b/apps/cpu/Multiphase/backup/Multiphase (Tube).cpp
@@ -305,8 +305,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -352,8 +352,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/backup/Multiphase.cpp b/apps/cpu/Multiphase/backup/Multiphase.cpp
index 8b09c15f4f5eb829ca37fce160bbb86ebb92f19d..b029e35277729803df53fb0d79d025863e21719b 100644
--- a/apps/cpu/Multiphase/backup/Multiphase.cpp
+++ b/apps/cpu/Multiphase/backup/Multiphase.cpp
@@ -643,8 +643,8 @@ void run(string configname)
grid->accept(initVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
//ConnectorFactoryPtr factory(new Block3DConnectorFactory());
//ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, factory);
@@ -693,8 +693,8 @@ void run(string configname)
//grid->accept(bcVisitor);
//set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/Multiphase/backup/MultiphaseCumulantLBMKernel (New VBased).cpp b/apps/cpu/Multiphase/backup/MultiphaseCumulantLBMKernel (New VBased).cpp
index 1cdf5905cbac12297fc3ab9c759cda726673c508..a0bfe97ba310a8858225b5c344f425121ddd2585 100644
--- a/apps/cpu/Multiphase/backup/MultiphaseCumulantLBMKernel (New VBased).cpp
+++ b/apps/cpu/Multiphase/backup/MultiphaseCumulantLBMKernel (New VBased).cpp
@@ -1,6 +1,6 @@
#include "MultiphaseCumulantLBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include <math.h>
#include <omp.h>
diff --git a/apps/cpu/Multiphase/backup/MultiphaseCumulantLBMKernel (Original Final).cpp b/apps/cpu/Multiphase/backup/MultiphaseCumulantLBMKernel (Original Final).cpp
index 498d91ff8fb8e0a7ae19000225d82a2d7e757387..c0dcd4d0cf26a41da3ff36195d7d6efeabfe016d 100644
--- a/apps/cpu/Multiphase/backup/MultiphaseCumulantLBMKernel (Original Final).cpp
+++ b/apps/cpu/Multiphase/backup/MultiphaseCumulantLBMKernel (Original Final).cpp
@@ -1,6 +1,6 @@
#include "MultiphaseCumulantLBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include <math.h>
#include <omp.h>
diff --git a/apps/cpu/MultiphaseDropletTest/CMakeLists.txt b/apps/cpu/MultiphaseDropletTest/CMakeLists.txt
index b70fdf8fb1e93807e7812988374b28a4f9a969b4..c48e517aaad9ff75f6245101ae0a433a2bd49886 100644
--- a/apps/cpu/MultiphaseDropletTest/CMakeLists.txt
+++ b/apps/cpu/MultiphaseDropletTest/CMakeLists.txt
@@ -1,3 +1,3 @@
PROJECT(MultiphaseDropletTest)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} MultiphaseFlow FILES droplet.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} MultiphaseFlow NonNewtonianFluids FILES droplet.cpp )
diff --git a/apps/cpu/MultiphaseDropletTest/droplet.cpp b/apps/cpu/MultiphaseDropletTest/droplet.cpp
index eaa3e550f873113bf2ffdeba4ed8a962ccae5046..32b6f8cfb904226029f6acf27e7c84d9a5c5deaa 100644
--- a/apps/cpu/MultiphaseDropletTest/droplet.cpp
+++ b/apps/cpu/MultiphaseDropletTest/droplet.cpp
@@ -9,6 +9,7 @@
#include "VirtualFluids.h"
#include "MultiphaseFlow/MultiphaseFlow.h"
+#include "NonNewtonianFluids/NonNewtonianFluids.h"
using namespace std;
@@ -141,12 +142,19 @@ void run(string configname)
//const int baseLevel = 0;
+
+ SPtr<Rheology> thix = Rheology::getInstance();
+ thix->setYieldStress(0);
+
SPtr<LBMKernel> kernel;
//kernel = SPtr<LBMKernel>(new MultiphaseScratchCumulantLBMKernel());
// kernel = SPtr<LBMKernel>(new MultiphaseCumulantLBMKernel());
//kernel = SPtr<LBMKernel>(new MultiphaseTwoPhaseFieldsPressureFilterLBMKernel());
- kernel = SPtr<LBMKernel>(new MultiphasePressureFilterLBMKernel());
+ //kernel = SPtr<LBMKernel>(new MultiphasePressureFilterLBMKernel());
+ //kernel = make_shared< MultiphaseScaleDistributionLBMKernel>();
+ //kernel = SPtr<LBMKernel>(new MultiphaseSharpInterfaceLBMKernel());
+ kernel = make_shared<MultiphaseSharpInterfaceLBMKernel>();
mu::Parser fgr;
fgr.SetExpr("-(rho-rho_l)*g_y");
@@ -287,12 +295,14 @@ void run(string configname)
intHelper.setBC();
// initialization of distributions
- real x1c = 2.5 * D; // (g_maxX1 - g_minX1-1)/2; //
+ real x1c = 1.5;//
+ //2.5 * D; // (g_maxX1 - g_minX1-1)/2; //
real x2c = 12.5 * D; //(g_maxX2 - g_minX2-1)/2;
- real x3c = 1.5; //2.5 * D; //(g_maxX3 - g_minX3-1)/2;
+ real x3c = 2.5 * D;
+ //1.5; // 2.5 * D; //(g_maxX3 - g_minX3-1)/2;
//LBMReal x3c = 2.5 * D;
mu::Parser fct1;
- fct1.SetExpr("0.5-0.5*tanh(2*(sqrt((x1-x1c)^2+(x2-x2c)^2+(x3-x3c)^2)-radius)/interfaceThickness)");
+ fct1.SetExpr("0.5+0.5*tanh(2*(sqrt(0*(x1-x1c)^2+(x2-x2c)^2+(x3-x3c)^2)-radius)/interfaceThickness)");
fct1.DefineConst("x1c", x1c);
fct1.DefineConst("x2c", x2c);
fct1.DefineConst("x3c", x3c);
@@ -300,7 +310,7 @@ void run(string configname)
fct1.DefineConst("interfaceThickness", interfaceThickness);
mu::Parser fct2;
- fct2.SetExpr("0.5*uLB-uLB*0.5*tanh(2*(sqrt((x1-x1c)^2+(x2-x2c)^2+(x3-x3c)^2)-radius)/interfaceThickness)");
+ fct2.SetExpr("0.5*uLB-uLB*0.5*tanh(2*(sqrt(0*(x1-x1c)^2+(x2-x2c)^2+(x3-x3c)^2)-radius)/interfaceThickness)");
//fct2.SetExpr("uLB");
fct2.DefineConst("uLB", uLB);
fct2.DefineConst("x1c", x1c);
@@ -381,7 +391,7 @@ void run(string configname)
t = (int)(t_ast/std::sqrt(g_y/D));
visSch->addSchedule(t,t,t); //t=9
- SPtr<WriteMultiphaseQuantitiesSimulationObserver> pp(new WriteMultiphaseQuantitiesSimulationObserver(
+ SPtr<WriteSharpInterfaceQuantitiesSimulationObserver> pp(new WriteSharpInterfaceQuantitiesSimulationObserver(
grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
if(grid->getTimeStep() == 0)
pp->update(0);
diff --git a/apps/cpu/Nozzle/CMakeLists.txt b/apps/cpu/Nozzle/CMakeLists.txt
index f9e90c7e95115d4b4dfc436721a192100ad95e98..9764934d46b39abca2ceda133e3434a78980f294 100644
--- a/apps/cpu/Nozzle/CMakeLists.txt
+++ b/apps/cpu/Nozzle/CMakeLists.txt
@@ -1,3 +1,3 @@
PROJECT(Nozzle)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} LiggghtsCoupling MultiphaseFlow NonNewtonianFluids FILES nozzle.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} LiggghtsCoupling MultiphaseFlow NonNewtonianFluids FILES nozzleSinglePhase.cpp )
diff --git a/apps/cpu/Nozzle/nozzle.cpp b/apps/cpu/Nozzle/nozzle.cpp.1
similarity index 91%
rename from apps/cpu/Nozzle/nozzle.cpp
rename to apps/cpu/Nozzle/nozzle.cpp.1
index babee1900c0bd9bb10bca3bccd790e83d25d14b8..0feddc57b709be57c05000da0ef8075b6941b8c0 100644
--- a/apps/cpu/Nozzle/nozzle.cpp
+++ b/apps/cpu/Nozzle/nozzle.cpp.1
@@ -14,7 +14,7 @@ using namespace std;
int main(int argc, char *argv[])
{
- // Sleep(30000);
+ //Sleep(30000);
try {
@@ -42,11 +42,11 @@ int main(int argc, char *argv[])
double g_minX1 = -1.31431;
double g_minX2 = 0.375582;
- double g_minX3 = 0.1; //-210e-3 - 0.2 - 6e-3; //- 1e-3;
+ double g_minX3 = -0.21; //-210e-3 - 0.2 - 6e-3; //- 1e-3;
double g_maxX1 = -1.28831;
double g_maxX2 = 0.401582;
- double g_maxX3 = 0.206;
+ double g_maxX3 = 0.175;//0.21;
int blockNX[3] = { 26, 26, 35 };
@@ -126,8 +126,8 @@ int main(int argc, char *argv[])
if (myid == 0) VF_LOG_INFO("Yield stress = {} Pa", tau0);
if (myid == 0) VF_LOG_INFO("Yield stress LB = {} ", tau0_LB);
- // SPtr<BC> noSlipBC(new NoSlipBC());
- // noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ //SPtr<BC> noSlipBC(new NoSlipBC());
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
SPtr<BC> noSlipBC(new NoSlipBC());
noSlipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNoSlipBCStrategy()));
@@ -161,8 +161,8 @@ int main(int argc, char *argv[])
// fct.DefineConst("U", uLB_ref * ((N + 3) / (N + 1)));
// fct.DefineConst("NplusOne", N + 1.0);
- // SPtr<BC> inflowConcreteBC(new VelocityBC(false, false, true, fct, 0, BCFunction::INFCONST));
- // inflowConcreteBC->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //SPtr<BC> inflowConcreteBC(new VelocityBC(false, false, true, fct, 0, BCFunction::INFCONST));
+ //inflowConcreteBC->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
SPtr<BC> inflowConcreteBC(new MultiphaseVelocityBC(false, false, true, fct, phiH, 0, BCFunction::INFCONST));
inflowConcreteBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
@@ -444,13 +444,15 @@ int main(int argc, char *argv[])
bcVisitor.addBC(noSlipBC);
bcVisitor.addBC(inflowConcreteBC);
bcVisitor.addBC(inflowAirBC1);
- //bcVisitor.addBC(outflowBC);
+ bcVisitor.addBC(outflowBC);
// SPtr<LBMKernel> kernel = make_shared<IBcumulantK17LBMKernel>();
// SPtr<LBMKernel> kernel = make_shared<CumulantK17LBMKernel>();
// SPtr<LBMKernel> kernel = make_shared<MultiphaseTwoPhaseFieldsPressureFilterLBMKernel>();
// SPtr<LBMKernel> kernel = make_shared<MultiphaseSimpleVelocityBaseExternalPressureLBMKernel>();
- SPtr<LBMKernel> kernel = make_shared<MultiphaseSharpInterfaceLBMKernel>();
+ //SPtr<LBMKernel> kernel = make_shared<MultiphaseSharpInterfaceLBMKernel>();
+ //SPtr<LBMKernel> kernel = make_shared<IBcumulantK17LBMKernel>();
+ SPtr<LBMKernel> kernel = make_shared<IBsharpInterfaceLBMKernel>();
kernel->setWithForcing(false);
kernel->setForcingX1(0.0);
@@ -482,7 +484,7 @@ int main(int argc, char *argv[])
string geoPath = "d:/Projects/TRR277/Project/WP4/NozzleGeo";
- string outputPath = "f:/temp/NozzleFlowTest_SharpInterface_OutflowPress";
+ string outputPath = "d:/temp/NozzleFlowTest_SharpInterface_With_Part_fraction_0.23";
UbSystem::makeDirectory(outputPath);
UbSystem::makeDirectory(outputPath + "/liggghts");
@@ -492,6 +494,44 @@ int main(int argc, char *argv[])
// UbLog::output_policy::setStream(logFilename.str());
// }
+ /////////////////////////////////////////////////////////////////////
+ //LIGGGHTS things
+ /////////////////////////////////////////////////////////////////////
+ string inFile1 = "d:/Projects/TRR277/Project/WP4/Config/in.nozzle";
+ // string inFile2 = "d:/Projects/VirtualFluids_LIGGGHTS_coupling/apps/cpu/LiggghtsApp/in2.lbdem";
+ MPI_Comm mpi_comm = *(MPI_Comm *)(comm->getNativeCommunicator());
+ LiggghtsCouplingWrapper wrapper(argv, mpi_comm);
+
+ double v_frac = 0.1;
+ double dt_phys = units->getFactorTimeLbToW();
+ int demSubsteps = 10;
+ double dt_dem = dt_phys / (double)demSubsteps;
+ int vtkSteps = 1000;
+ string demOutDir = outputPath + "/liggghts";
+
+ // wrapper.execCommand("echo none");
+
+ // wrapper.execFile((char*)inFile1.c_str());
+
+ //// set timestep and output directory
+ wrapper.setVariable("t_step", dt_dem);
+ wrapper.setVariable("dmp_stp", vtkSteps * demSubsteps);
+ wrapper.setVariable("dmp_dir", demOutDir);
+
+ wrapper.execFile((char *)inFile1.c_str());
+ //wrapper.runUpto(demSubsteps - 1);
+ // wrapper.runUpto(1000);
+
+ //LatticeDecomposition lDec((g_maxX1 - g_minX1) / dx, (g_maxX2 - g_minX2) / dx, (g_maxX3 - g_minX3) / dx, wrapper.lmp, grid);
+
+ SPtr<UbScheduler> lScheduler = make_shared<UbScheduler>(1);
+ SPtr<LiggghtsCouplingSimulationObserver> lcSimulationObserver = make_shared<LiggghtsCouplingSimulationObserver>(grid, lScheduler, comm, wrapper, demSubsteps, unitsAir);
+ //SPtr<Grid3DVisitor> partVisitor = make_shared<LiggghtsPartitioningGridVisitor>(std::ceil((g_maxX1 - g_minX1) / dx), std::ceil((g_maxX2 - g_minX2) / dx), std::ceil((g_maxX3 - g_minX3) / dx), wrapper.lmp);
+ SPtr<Grid3DVisitor> partVisitor = make_shared<LiggghtsPartitioningGridVisitor>(26,26,420, wrapper.lmp);
+
+ /////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////
+
SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, vf::lbm::dir::DIR_MMM, MetisPartitioner::RECURSIVE));
SPtr<GbObject3D> gridCube = make_shared<GbCuboid3D>(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3);
@@ -557,7 +597,8 @@ int main(int argc, char *argv[])
SPtr<D3Q27Interactor> intrBox = SPtr<D3Q27Interactor>(new D3Q27Interactor(gridCube, grid, noSlipBC, Interactor3D::INVERSESOLID));
///////////////////////////////////////////////////////////
// inflow
- GbCylinder3DPtr geoInflow(new GbCylinder3D(-1.30181 + 0.0005, 0.390872 - 0.00229, 0.20105, -1.30181 + 0.0005, 0.390872 - 0.00229, 0.23, 0.013));
+ //GbCylinder3DPtr geoInflow(new GbCylinder3D(-1.30181 + 0.0005, 0.390872 - 0.00229, 0.20105, -1.30181 + 0.0005, 0.390872 - 0.00229, 0.23, 0.013));
+ GbCylinder3DPtr geoInflow(new GbCylinder3D(-1.30181 + 0.0005, 0.390872 - 0.00229, 0.175, -1.30181 + 0.0005, 0.390872 - 0.00229, 0.21, 0.013));
if (myid == 0) GbSystem3D::writeGeoObject(geoInflow.get(), outputPath + "/geo/geoInflow", WbWriterVtkXmlBinary::getInstance());
SPtr<D3Q27Interactor> intrInflow = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, inflowConcreteBC, Interactor3D::SOLID));
///////////////////////////////////////////////////////////
@@ -628,7 +669,7 @@ int main(int argc, char *argv[])
SPtr<Interactor3D> intAirInlet6 = std::make_shared<D3Q27TriFaceMeshInteractor>(meshAirInlet6, grid, inflowAirBC6, Interactor3D::SOLID, Interactor3D::POINTS);
///////////////////////////////////////////////////////////
- InteractorsHelper intHelper(grid, metisVisitor, true);
+ InteractorsHelper intHelper(grid, partVisitor, false);
intHelper.addInteractor(intrFluidArea);
intHelper.addInteractor(intrNozzleVolcanNozzle2);
@@ -658,10 +699,11 @@ int main(int argc, char *argv[])
// if (myid == 0) UBLOG(logINFO, Utilities::toString(grid, comm->getNumberOfProcesses()));
- // SetKernelBlockVisitor kernelVisitor(kernel, nuLB, comm->getNumberOfProcesses());
+ //SetKernelBlockVisitor kernelVisitor(kernel, nu_l_LB, comm->getNumberOfProcesses());
MultiphaseSetKernelBlockVisitor kernelVisitor(kernel, nu_h_LB, nu_l_LB, 1e9, 1);
grid->accept(kernelVisitor);
+
intHelper.setBC();
// InitDistributionsBlockVisitor initVisitor;
@@ -669,9 +711,10 @@ int main(int argc, char *argv[])
double x1c = -1.31431 + R;
double x2c = 0.375582 + R;
- double x3c = 0.20105;
+ double Ri = 5;
+ double x3c = 0.136 + Ri;
- R = 0.2 - 0.145; // 0.078-0.04; // 0.2;
+ //R = 0.2 - 0.145; // 0.078-0.04; // 0.2;
mu::Parser fct1;
// fct1.SetExpr(" 0.5 - 0.5 * tanh(2 * (sqrt((x1 - x1c) ^ 2 + (x2 - x2c) ^ 2 + (x3 - x3c) ^ 2) - radius) / interfaceThickness)");
@@ -679,40 +722,15 @@ int main(int argc, char *argv[])
fct1.DefineConst("x1c", x1c);
fct1.DefineConst("x2c", x2c);
fct1.DefineConst("x3c", x3c);
- fct1.DefineConst("radius", R);
+ fct1.DefineConst("radius", Ri);
fct1.DefineConst("interfaceThickness", interfaceThickness * dx);
MultiphaseVelocityFormInitDistributionsBlockVisitor initVisitor;
initVisitor.setPhi(fct1);
grid->accept(initVisitor);
- string inFile1 = "d:/Projects/VirtualFluids_Develop/apps/cpu/Nozzle/in.nozzle";
- //string inFile2 = "d:/Projects/VirtualFluids_LIGGGHTS_coupling/apps/cpu/LiggghtsApp/in2.lbdem";
- MPI_Comm mpi_comm = *(MPI_Comm*)(comm->getNativeCommunicator());
- LiggghtsCouplingWrapper wrapper(argv, mpi_comm);
-
- double v_frac = 0.1;
- double dt_phys = units->getFactorTimeLbToW();
- int demSubsteps = 10;
- double dt_dem = dt_phys / (double)demSubsteps;
- int vtkSteps = 100;
- string demOutDir = outputPath + "/liggghts";
-
- //wrapper.execCommand("echo none");
-
- //wrapper.execFile((char*)inFile1.c_str());
-
- //// set timestep and output directory
- wrapper.setVariable("t_step", dt_dem);
- wrapper.setVariable("dmp_stp", vtkSteps * demSubsteps);
- wrapper.setVariable("dmp_dir", demOutDir);
-
- //wrapper.execFile((char *)inFile1.c_str());
- //wrapper.runUpto(demSubsteps - 1);
- //wrapper.runUpto(1000);
-
- SPtr<UbScheduler> lScheduler = make_shared<UbScheduler>(1);
- SPtr<LiggghtsCouplingSimulationObserver> lcSimulationObserver = make_shared<LiggghtsCouplingSimulationObserver>(grid, lScheduler, comm, wrapper, demSubsteps, units);
+ //InitDistributionsBlockVisitor initVisitor;
+ //grid->accept(initVisitor);
// boundary conditions grid
{
@@ -724,12 +742,12 @@ int main(int argc, char *argv[])
grid->accept(bcVisitor);
- // OneDistributionSetConnectorsBlockVisitor setConnsVisitor(comm);
+ //OneDistributionSetConnectorsBlockVisitor setConnsVisitor(comm);
TwoDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
// ThreeDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
grid->accept(setConnsVisitor);
- int numOfThreads = 18;
+ int numOfThreads = 1;
omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> nupsSch = std::make_shared<UbScheduler>(10, 10, 100);
@@ -739,12 +757,16 @@ int main(int argc, char *argv[])
SPtr<UbScheduler> visSch(new UbScheduler(vtkSteps));
// SPtr<UbScheduler> visSch(new UbScheduler(1, 8700, 8800));
// visSch->addSchedule(1, 8700, 8800);
- SPtr<WriteSharpInterfaceQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteSharpInterfaceQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlASCII::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ SPtr<WriteSharpInterfaceQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteSharpInterfaceQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ //writeMQSimulationObserver->update(0);
+
+ //SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ //writeMQSimulationObserver->update(0);
int endTime = 10000000;
SPtr<Simulation> simulation(new Simulation(grid, lScheduler, endTime));
simulation->addSimulationObserver(nupsSimulationObserver);
- // Simulation->addSimulationObserver(lcSimulationObserver);
+ simulation->addSimulationObserver(lcSimulationObserver);
simulation->addSimulationObserver(writeMQSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
diff --git a/apps/cpu/Nozzle/nozzleSinglePhase.cpp b/apps/cpu/Nozzle/nozzleSinglePhase.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ed89cb57374e543630134296ae4ba24d02481db5
--- /dev/null
+++ b/apps/cpu/Nozzle/nozzleSinglePhase.cpp
@@ -0,0 +1,798 @@
+#include <iostream>
+#include <memory>
+#include <string>
+
+#include "VirtualFluids.h"
+
+#include "LiggghtsCoupling/LiggghtsCoupling.h"
+
+#include "MultiphaseFlow/MultiphaseFlow.h"
+
+#include "NonNewtonianFluids/NonNewtonianFluids.h"
+
+using namespace std;
+
+int main(int argc, char *argv[])
+{
+ //Sleep(30000);
+
+ try {
+
+ std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
+ int myid = comm->getProcessID();
+
+ // bounding box
+ // double g_minX1 = -1341.81e-3;
+ // double g_minX2 = 348.087e-3;
+ // double g_minX3 = -210e-3;
+
+ // double g_maxX1 = -1260.81e-3;
+ // double g_maxX2 = 429.087e-3;
+ // double g_maxX3 = 214.5e-3;
+
+ // double g_minX1 = -1341.81e-3 + 10e-3;
+ // double g_minX2 = 0.360872;
+ // double g_minX3 = -210e-3;
+
+ // double g_maxX1 = -1260.81e-3 - 10e-3;
+ // double g_maxX2 = 0.416302;
+ // double g_maxX3 = 210e-3;
+
+ // int blockNX[3] = { 10, 10, 10 };
+
+ double g_minX1 = -1.31431;
+ double g_minX2 = 0.375582;
+ double g_minX3 = -0.21; //-210e-3 - 0.2 - 6e-3; //- 1e-3;
+
+ double g_maxX1 = -1.28831;
+ double g_maxX2 = 0.401582;
+ double g_maxX3 = 0.175;//0.21;
+
+ int blockNX[3] = { 26, 26, 35 };
+
+ double dx = 1e-3;
+
+ double uLB_ref = 0.0001;
+ // double rhoLB = 0.0;
+
+ // concrete
+ double d_part = 1e-3;
+ double V = 0.4*10.; // flow rate [m^3/h]
+ double D = 0.026; // shotcrete inlet diameter [m]
+ double R = D / 2.0; // radius [m]
+ double A = UbMath::PI * R * R;
+ double u = V / 3600 / A;
+ double muConcrete = 2.1133054011798826; // [Pa s]
+ double rhoAir = 1.2041; // [kg/m^3]
+ double tau0 = 715.218181094648; // Pa
+ double rhoConcrete = 2400; // [kg/m^3]
+ double nu = muConcrete / rhoConcrete;
+
+ // double Re_D = d_part * u / nu;
+ // if (myid == 0) UBLOG(logINFO, "Re_D = " << Re_D);
+ //
+ SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(d_part, 1., 2400, d_part / dx, uLB_ref);
+ if (myid == 0) std::cout << units->toString() << std::endl;
+
+ double interfaceThickness = 3; // 4.096;
+ double sigma = 0.3; //0.03;
+ double Re = rhoConcrete * u * d_part / muConcrete;
+ double We = rhoConcrete * u * u * d_part / sigma;
+
+ double u_LB_con = u * units->getFactorVelocityWToLb();
+ double nu_h_LB = nu * units->getFactorViscosityWToLb(); // uLB_ref * d_part * units->getFactorLentghWToLb() / Re;
+ double nu_l_LB = 0; // = nu_h_LB;
+
+ double rho_h_LB = 1;
+
+ // surface tension
+ double sigma_LB = rho_h_LB *u_LB_con *u_LB_con *d_part * units->getFactorLentghWToLb() / We;
+
+ // LBMReal dLB = 0; // = length[1] / dx;
+ LBMReal rhoLB = 0.0;
+ // LBMReal nuLB = nu_l; //(uLB_ref*dLB) / Re;
+
+ double beta = 12.0 * sigma_LB / interfaceThickness;
+ double kappa = 1.5 * interfaceThickness * sigma_LB;
+
+ double phiL = 0.0;
+ double phiH = 1.0;
+ double tauH = 0.6; // Phase - field Relaxation
+ double mob = 0.02; // Mobility
+ // double nuL = 1e-2;
+ // double nuG = 0.015811388300841892;
+ double densityRatio = rhoConcrete / rhoAir;
+ // double sigma_old = 1.0850694444444444e-06;
+ //
+ // double beta_old = 12.0 * sigma / interfaceThickness;
+ // double kappa_old = 1.5 * interfaceThickness * sigma;
+
+ double theta = 110; // contact angle
+
+ // https://civilsir.com/density-of-cement-sand-and-aggregate-in-kg-m3-list-of-material-density/
+
+ // SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(r_p, 1.480, 2060, r_p/dx);
+ // SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(r_p, LBMUnitConverter::AIR_20C, r_p / dx);
+ // SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(d_part, 1., 1000, d_part / dx, std::abs(uLB_ref));
+ // SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(d_part, 1., 1000, d_part / dx, std::abs(uLB_ref));
+ // SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(d_part, 1., 2400, d_part / dx, uRef);
+
+ double Bm = (tau0 * d_part) / (muConcrete * u);
+ double tau0_LB = Bm * nu_h_LB * u_LB_con / (d_part * units->getFactorLentghWToLb());
+
+ SPtr<Rheology> thix = Rheology::getInstance();
+ thix->setYieldStress(tau0_LB);
+
+ if (myid == 0) VF_LOG_INFO("Yield stress = {} Pa", tau0);
+ if (myid == 0) VF_LOG_INFO("Yield stress LB = {} ", tau0_LB);
+
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ //SPtr<BC> noSlipBC(new NoSlipBC());
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNoSlipBCStrategy()));
+
+ // concrete inflow boundary condition
+ mu::Parser fct;
+ fct.SetExpr("U");
+ fct.DefineConst("U", -u_LB_con);
+ if (myid == 0) VF_LOG_INFO("Concrete inflow velocity = {} m/s", u);
+ if (myid == 0) VF_LOG_INFO("Concrete inflow velocity = {} dx/dt", u_LB_con);
+ if (myid == 0) VF_LOG_INFO("Concrete Re = {}", Re);
+
+ // // Å tigler, J. (2014). Analytical velocity profile in tube for laminar and turbulent flow. Engineering
+ // // Mechanics, 21(6), 371-379.
+ // double cx1 = -1.31431 + R;
+ // double cx2 = 0.375582 + R;
+ // //double cx3 = 0.20105 + R;
+ // double L = g_maxX1 - g_minX1;
+ // double p_concrete = 1e5; // Pa = 1 Bar
+ // double p1 = p_concrete * units->getFactorPressureWToLb();
+ // double p2 = 0.0;
+ // double drhoLB = 1.0 + rhoLB;
+ // double muLB = drhoLB * nuLB;
+ // double N = R * R / 2 * muLB * uLB_ref * (p1 - p2) / L - 3;
+
+ // // mu::Parser fct;
+ // fct.SetExpr("U*(1-(((((x2-y0)^2+(x1-x0)^2)^0.5)/R)^NplusOne))");
+ // fct.DefineConst("x0", cx1);
+ // fct.DefineConst("y0", cx2);
+ // //fct.DefineConst("z0", cx3);
+ // fct.DefineConst("R", R);
+ // fct.DefineConst("U", uLB_ref * ((N + 3) / (N + 1)));
+ // fct.DefineConst("NplusOne", N + 1.0);
+
+ SPtr<BC> inflowConcreteBC(new VelocityBC(false, false, true, fct, 0, BCFunction::INFCONST));
+ inflowConcreteBC->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //SPtr<BC> inflowConcreteBC(new MultiphaseVelocityBC(false, false, true, fct, phiH, 0, BCFunction::INFCONST));
+ //inflowConcreteBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
+
+ // air inflow boundary condition
+ // Å tigler, J. (2014). Analytical velocity profile in tube for laminar and turbulent flow. Engineering
+ // Mechanics, 21(6), 371-379.
+ // SPtr<LBMUnitConverter> unitsAir = std::make_shared<LBMUnitConverter>(d_part, LBMUnitConverter::AIR_20C, d_part / dx);
+ // SPtr<LBMUnitConverter> unitsAir = std::make_shared<LBMUnitConverter>(d_part, 1., 1.2041, d_part / dx, uLB_ref);
+ // double V = 40; // flow rate [m^3/h]
+ // double D = 0.0166; // air inlet diameter [m]
+ // double R = D / 2.0; // radius [m]
+ // double A = UbMath::PI * R * R;
+ // double u = V / 3600 / A;
+ // double uLB_ref = u * unitsAir->getFactorVelocityWToLb();
+ //// double cx1 = -1.2788 + R;
+ // double cx2 = 0.3803 + R;
+ // double cx3 = 0.1517 + R;
+ // double L = g_maxX1 - g_minX1;
+ // double p_air = 7e5; // Pa = 7 Bar
+ // double p1 = p_air;
+ // double p2 = 0.0;
+ // double mu = 17.2e-6; // Pa s, air 20° C
+ // double N = R * R / 2 * mu * u * (p1 - p2) / L - 3;
+ // if (myid == 0) VF_LOG_INFO("Air inflow velocity = {} m/s", u);
+ // if (myid == 0) VF_LOG_INFO("Air inflow velocity = {} dx/dt", uLB_ref);
+ //
+
+ // double nu = mu / rhoConcrete;
+ // double Re = d_part * u / nu;
+ // if (myid == 0) VF_LOG_INFO("Re_air = {}", Re);
+
+ // double nuLB = d_part * unitsAir->getFactorLentghWToLb() * uLB_ref / Re;
+ // if (myid == 0) VF_LOG_INFO("nuLB_air = {}", nuLB);
+ // nu_l_LB = nuLB;
+
+ SPtr<LBMUnitConverter> unitsAir = std::make_shared<LBMUnitConverter>(d_part, 1., 1.2041, d_part / dx, uLB_ref);
+ //SPtr<LBMUnitConverter> unitsAir = std::make_shared<LBMUnitConverter>(d_part, LBMUnitConverter::AIR_20C, d_part / dx);
+ double V_air = 40./6.; // flow rate [m^3/h] //10.
+ double D_air = 0.00553; // air inlet diameter [m]
+ double R_air = D_air / 2.0; // radius [m]
+ double A_air = UbMath::PI * (R_air * R_air);
+ double u_air = V_air / 3600 / A_air;
+ double uLB_air = u_air * unitsAir->getFactorVelocityWToLb();
+ // double cx1 = -1.2788 + R;
+ double cx2 = 0.385822 + R_air;
+ double cx3 = 0.135562 + R_air;
+ double L_air = 0.00747;
+ double p_air = 7e5; // Pa = 7 Bar
+ double p1 = p_air;
+ double p2 = 1e5;
+ double mu_air = 17.2e-6; // Pa s, air 20° C
+ double rho_air = 1.2041; // [kg/m^3]
+ double Re_inlet = D_air * u_air * rho_air / mu_air;
+ double lambda = 0.3164 / pow(Re_inlet, 0.25);
+ double deltaP = (lambda / (2. * R_air)) * (rho_air * pow(u_air, 2) / 2.); // Darcy friction factor (Rohrreibungszahl)
+ double N = pow(R_air, 2) / (2. * mu_air * u_air) * deltaP - 3.;
+ // double N = R_air * R_air / 2 * mu_air * u_air * (p1 - p2) / L_air - 3;
+ if (myid == 0) VF_LOG_INFO("Air inflow velocity = {} m/s", u_air);
+ if (myid == 0) VF_LOG_INFO("Air inflow velocity = {} dx/dt", uLB_air);
+
+ double nu_air = mu_air / rho_air;
+ double Re_air = d_part * u_air / nu_air;
+ if (myid == 0) VF_LOG_INFO("Air Re = {}", Re_air);
+
+ double nuLB_air = nu_air * unitsAir->getFactorViscosityWToLb(); // d_part * unitsAir->getFactorLentghWToLb() * uLB_air / Re_air;
+ if (myid == 0) VF_LOG_INFO("nuLB_air = {}", nuLB_air);
+ nu_l_LB = nuLB_air;
+
+ if (myid == 0) VF_LOG_INFO("nu_h = {}", nu_h_LB);
+ if (myid == 0) VF_LOG_INFO("nu_l = {}", nu_l_LB);
+ if (myid == 0) VF_LOG_INFO("sigma_LB = {}", sigma_LB);
+
+ double p_air_LB = p_air * unitsAir->getFactorPressureWToLb();
+ if (myid == 0) VF_LOG_INFO("p_air_LB = {}", p_air_LB);
+
+ // mu::Parser fctVx1;
+ ////fctVx1.SetExpr("U");
+ ////fctVx1.DefineConst("U", uLB_air);
+ // mu::Parser fctVx2;
+ // fctVx2.SetExpr("U");
+ // fctVx2.DefineConst("U", 0);
+ // mu::Parser fctVx3;
+ ////fctVx3.SetExpr("U");
+ ////fctVx3.DefineConst("U", -uLB_air);
+
+ double cx1 = 0;
+ double alpha = 0;
+ double gamma = 0;
+ double U = uLB_air;// * ((N + 3.) / (N + 1.));
+
+ mu::Parser fctVx1;
+ //fctVx1.SetExpr("U*cos(alpha*_pi/180)*(1-(((((x1-x0)^2+(x2-y0)^2+(x3-z0)^2)^0.5)/R)^NplusOne))");
+ //fctVx1.SetExpr("U*cos(alpha*_pi/180)*(1-(((((x1-x0)^2+(x2-y0)^2+(x3-z0)^2)^0.5)/R)))");
+ // fctVx1.SetExpr("(((x1-x0)^2+(x2-y0)^2+(x3-z0)^2)^0.5/R)^NplusOne");
+ fctVx1.SetExpr("U*cos(alpha*_pi/180)");
+ fctVx1.DefineConst("x0", cx1);
+ fctVx1.DefineConst("y0", cx2);
+ fctVx1.DefineConst("z0", cx3);
+ fctVx1.DefineConst("R", R_air);
+ fctVx1.DefineConst("U", U); //* ((N + 3.) / (N + 1.)));
+ fctVx1.DefineConst("NplusOne", N + 1.0);
+ fctVx1.DefineConst("alpha", alpha);
+ fctVx1.DefineConst("gamma", gamma);
+
+ mu::Parser fctVx2;
+ //fctVx2.SetExpr("U*sin(alpha*_pi/180)*(1-(((((x1-x0)^2+(x2-y0)^2+(x3-z0)^2)^0.5)/R)^NplusOne))");
+ //fctVx2.SetExpr("U*sin(alpha*_pi/180)*(1-(((((x1-x0)^2+(x2-y0)^2+(x3-z0)^2)^0.5)/R)))");
+ fctVx2.SetExpr("U*sin(alpha*_pi/180)");
+ fctVx2.DefineConst("x0", cx1);
+ fctVx2.DefineConst("x0", cx1);
+ fctVx2.DefineConst("y0", cx2);
+ fctVx2.DefineConst("z0", cx3);
+ fctVx2.DefineConst("R", R_air);
+ fctVx2.DefineConst("U", U); //* ((N + 3.) / (N + 1.)));
+ fctVx2.DefineConst("NplusOne", N + 1.0);
+ fctVx2.DefineConst("alpha", alpha);
+
+ mu::Parser fctVx3;
+ //fctVx3.SetExpr("U*(1-(((((x1-x0)^2+(x2-y0)^2+(x3-z0)^2)^0.5)/R)^NplusOne))");
+ //fctVx3.SetExpr("U*cos(alpha*_pi/180)*(1-(((((x1-x0)^2+(x2-y0)^2+(x3-z0)^2)^0.5)/R)))");
+ fctVx3.SetExpr("U");
+ fctVx3.DefineConst("x0", cx1);
+ fctVx3.DefineConst("y0", cx2);
+ fctVx3.DefineConst("z0", cx3);
+ fctVx3.DefineConst("R", R_air);
+ fctVx3.DefineConst("U", -U); //* ((N + 3.) / (N + 1.)));
+ fctVx3.DefineConst("NplusOne", N + 1.0);
+ fctVx3.DefineConst("alpha", alpha);
+ fctVx3.DefineConst("gamma", gamma);
+
+ // SPtr<BC> inflowAirBC1(new VelocityBC(true, false, false, fct, 0, BCFunction::INFCONST));
+ // inflowAirBC1->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ // t = U * sin(alpha * _pi / 180) * (1 - (((((x1 - x0) ^ 2 + (x2 - y0) ^ 2 + (x3 - z0) ^ 2) ^ 0.5) / R) ^ NplusOne));
+ cx1 = -1.31416;
+ cx2 = 0.388684;
+ cx3 = 0.138177;
+ alpha = 0;
+ gamma = 225;
+ fctVx1.DefineConst("x0", cx1);
+ fctVx1.DefineConst("y0", cx2);
+ fctVx1.DefineConst("z0", cx3);
+ fctVx1.DefineConst("alpha", alpha);
+ fctVx1.DefineConst("gamma", gamma);
+ fctVx2.DefineConst("x0", cx1);
+ fctVx2.DefineConst("y0", cx2);
+ fctVx2.DefineConst("z0", cx3);
+ fctVx2.DefineConst("alpha", alpha);
+ fctVx2.DefineConst("gamma", gamma);
+ fctVx3.DefineConst("x0", cx1);
+ fctVx3.DefineConst("y0", cx2);
+ fctVx3.DefineConst("z0", cx3);
+ fctVx3.DefineConst("alpha", alpha);
+ fctVx3.DefineConst("gamma", gamma);
+
+ SPtr<BC> inflowAirBC1(new VelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, 0, BCFunction::INFCONST));
+ inflowAirBC1->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //SPtr<BC> inflowAirBC1(new MultiphaseVelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, phiL, 0, BCFunction::INFCONST));
+ //inflowAirBC1->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
+
+ fctVx1.DefineVar("x1", &cx1);
+ fctVx1.DefineVar("x2", &cx2);
+ fctVx1.DefineVar("x3", &cx3);
+ fctVx2.DefineVar("x1", &cx1);
+ fctVx2.DefineVar("x2", &cx2);
+ fctVx2.DefineVar("x3", &cx3);
+ fctVx3.DefineVar("x1", &cx1);
+ fctVx3.DefineVar("x2", &cx2);
+ fctVx3.DefineVar("x3", &cx3);
+
+ if (myid == 0) {
+
+ VF_LOG_INFO("fctVx1 = {}", fctVx1.Eval());
+ VF_LOG_INFO("fctVx2 = {}", fctVx2.Eval());
+ VF_LOG_INFO("fctVx3 = {}", fctVx3.Eval());
+ VF_LOG_INFO("N = {}", N);
+ VF_LOG_INFO("NplusOne = {}", N + 1.0);
+ // return 0;
+ }
+ cx1 = -1.31303;
+ cx2 = 0.377234;
+ cx3 = 0.138174;
+ alpha = 60;
+ fctVx1.DefineConst("x0", cx1);
+ fctVx1.DefineConst("y0", cx2);
+ fctVx1.DefineConst("z0", cx3);
+ fctVx1.DefineConst("alpha", alpha);
+ fctVx2.DefineConst("x0", cx1);
+ fctVx2.DefineConst("y0", cx2);
+ fctVx2.DefineConst("z0", cx3);
+ fctVx2.DefineConst("alpha", alpha);
+ fctVx3.DefineConst("x0", cx1);
+ fctVx3.DefineConst("y0", cx2);
+ fctVx3.DefineConst("z0", cx3);
+ SPtr<BC> inflowAirBC2(new VelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, 0, BCFunction::INFCONST));
+ inflowAirBC2->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //SPtr<BC> inflowAirBC2(new MultiphaseVelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, phiL, 0, BCFunction::INFCONST));
+ //inflowAirBC2->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
+
+ cx1 = -1.2948374155694822;
+ cx2 = 0.37733728717266285;
+ cx3 = 0.13840460401111598;
+ alpha = 120;
+ fctVx1.DefineConst("x0", cx1);
+ fctVx1.DefineConst("y0", cx2);
+ fctVx1.DefineConst("z0", cx3);
+ fctVx1.DefineConst("alpha", alpha);
+ fctVx2.DefineConst("x0", cx1);
+ fctVx2.DefineConst("y0", cx2);
+ fctVx2.DefineConst("z0", cx3);
+ fctVx2.DefineConst("alpha", alpha);
+ fctVx3.DefineConst("x0", cx1);
+ fctVx3.DefineConst("y0", cx2);
+ fctVx3.DefineConst("z0", cx3);
+ SPtr<BC> inflowAirBC3(new VelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, 0, BCFunction::INFCONST));
+ inflowAirBC3->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //SPtr<BC> inflowAirBC3(new MultiphaseVelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, phiL, 0, BCFunction::INFCONST));
+ //inflowAirBC3->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
+
+ cx1 = -1.28847;
+ cx2 = 0.3885;
+ cx3 = 0.1385;
+ alpha = 180;
+ fctVx1.DefineConst("x0", cx1);
+ fctVx1.DefineConst("y0", cx2);
+ fctVx1.DefineConst("z0", cx3);
+ fctVx1.DefineConst("alpha", alpha);
+ fctVx2.DefineConst("x0", cx1);
+ fctVx2.DefineConst("y0", cx2);
+ fctVx2.DefineConst("z0", cx3);
+ fctVx2.DefineConst("alpha", alpha);
+ fctVx3.DefineConst("x0", cx1);
+ fctVx3.DefineConst("y0", cx2);
+ fctVx3.DefineConst("z0", cx3);
+ SPtr<BC> inflowAirBC4(new VelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, 0, BCFunction::INFCONST));
+ inflowAirBC4->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //SPtr<BC> inflowAirBC4(new MultiphaseVelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, phiL, 0, BCFunction::INFCONST));
+ //inflowAirBC4->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
+
+ cx1 = -1.294771417778694;
+ cx2 = 0.399787947463142;
+ cx3 = 0.1383429692754194;
+ alpha = 240;
+ fctVx1.DefineConst("x0", cx1);
+ fctVx1.DefineConst("y0", cx2);
+ fctVx1.DefineConst("z0", cx3);
+ fctVx1.DefineConst("alpha", alpha);
+ fctVx2.DefineConst("x0", cx1);
+ fctVx2.DefineConst("y0", cx2);
+ fctVx2.DefineConst("z0", cx3);
+ fctVx2.DefineConst("alpha", alpha);
+ fctVx3.DefineConst("x0", cx1);
+ fctVx3.DefineConst("y0", cx2);
+ fctVx3.DefineConst("z0", cx3);
+ SPtr<BC> inflowAirBC5(new VelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, 0, BCFunction::INFCONST));
+ inflowAirBC5->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //SPtr<BC> inflowAirBC5(new MultiphaseVelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, phiL, 0, BCFunction::INFCONST));
+ //inflowAirBC5->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
+
+ cx1 = -1.3077338898450492;
+ cx2 = 0.3998516560596088;
+ cx3 = 0.13843501416896437;
+ alpha = 300;
+ fctVx1.DefineConst("x0", cx1);
+ fctVx1.DefineConst("y0", cx2);
+ fctVx1.DefineConst("z0", cx3);
+ fctVx1.DefineConst("alpha", alpha);
+ fctVx2.DefineConst("x0", cx1);
+ fctVx2.DefineConst("y0", cx2);
+ fctVx2.DefineConst("z0", cx3);
+ fctVx2.DefineConst("alpha", alpha);
+ fctVx3.DefineConst("x0", cx1);
+ fctVx3.DefineConst("y0", cx2);
+ fctVx3.DefineConst("z0", cx3);
+ SPtr<BC> inflowAirBC6(new VelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, 0, BCFunction::INFCONST));
+ inflowAirBC6->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //SPtr<BC> inflowAirBC6(new MultiphaseVelocityBC(true, true, true, fctVx1, fctVx2, fctVx3, phiL, 0, BCFunction::INFCONST));
+ //inflowAirBC6->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
+
+ // Pressure BC for air inlet
+ // SPtr<BC> inflowAirBC1(new DensityBC(p_air_LB));
+ // inflowAirBC1->setBCStrategy(SPtr<BCStrategy>(new MultiphasePressureBCStrategy()));
+
+ SPtr<BC> outflowBC(new DensityBC(rhoLB));
+ outflowBC->setBCStrategy(SPtr<BCStrategy>(new NonEqDensityBCStrategy()));
+ //outflowBC->setBCStrategy(SPtr<BCStrategy>(new MultiphasePressureBCStrategy()));
+
+ // SPtr<BC> outflowBC(new DensityBC(rhoLB));
+ //outflowBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNonReflectingOutflowBCStrategy()));
+ //////////////////////////////////////////////////////////////////////////////////
+ // BC visitor
+ BoundaryConditionsBlockVisitor bcVisitor;
+ //MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
+ bcVisitor.addBC(noSlipBC);
+ //bcVisitor.addBC(inflowConcreteBC);
+ bcVisitor.addBC(inflowAirBC1);
+ bcVisitor.addBC(outflowBC);
+
+ // SPtr<LBMKernel> kernel = make_shared<IBcumulantK17LBMKernel>();
+ //SPtr<LBMKernel> kernel = make_shared<CumulantK17LBMKernel>();
+ // SPtr<LBMKernel> kernel = make_shared<MultiphaseTwoPhaseFieldsPressureFilterLBMKernel>();
+ // SPtr<LBMKernel> kernel = make_shared<MultiphaseSimpleVelocityBaseExternalPressureLBMKernel>();
+ //SPtr<LBMKernel> kernel = make_shared<MultiphaseSharpInterfaceLBMKernel>();
+ SPtr<LBMKernel> kernel = make_shared<IBcumulantK17LBMKernel>();
+ //SPtr<LBMKernel> kernel = make_shared<IBsharpInterfaceLBMKernel>();
+
+ kernel->setWithForcing(false);
+ kernel->setForcingX1(0.0);
+ kernel->setForcingX2(0.0);
+ kernel->setForcingX3(0.0);
+
+ kernel->setPhiL(phiL);
+ kernel->setPhiH(phiH);
+ kernel->setPhaseFieldRelaxation(tauH);
+ kernel->setMobility(mob);
+ kernel->setInterfaceWidth(interfaceThickness);
+
+ kernel->setCollisionFactorMultiphase(nu_h_LB, nu_l_LB);
+ kernel->setDensityRatio(densityRatio);
+ kernel->setMultiphaseModelParameters(beta, kappa);
+ kernel->setContactAngle(theta);
+ kernel->setSigma(sigma_LB);
+
+ SPtr<BCSet> bcProc = make_shared<BCSet>();
+ kernel->setBCSet(bcProc);
+
+ SPtr<Grid3D> grid = make_shared<Grid3D>(comm);
+ grid->setPeriodicX1(false);
+ grid->setPeriodicX2(false);
+ grid->setPeriodicX3(false);
+ grid->setDeltaX(dx);
+ grid->setBlockNX(blockNX[0], blockNX[1], blockNX[2]);
+ grid->setGhostLayerWidth(1);
+
+ string geoPath = "d:/Projects/TRR277/Project/WP4/NozzleGeo";
+
+ string outputPath = "d:/temp/NozzleFlowTest_SinglePhase_With_Part_fraction_0.13_vel_0.2_ogl";
+ UbSystem::makeDirectory(outputPath);
+ UbSystem::makeDirectory(outputPath + "/liggghts");
+
+ // if (myid == 0) {
+ // stringstream logFilename;
+ // logFilename << outputPath + "/logfile" + UbSystem::toString(UbSystem::getTimeStamp()) + ".txt";
+ // UbLog::output_policy::setStream(logFilename.str());
+ // }
+
+ /////////////////////////////////////////////////////////////////////
+ //LIGGGHTS things
+ /////////////////////////////////////////////////////////////////////
+ string inFile1 = "d:/Projects/TRR277/Project/WP4/Config/in.nozzle";
+ // string inFile2 = "d:/Projects/VirtualFluids_LIGGGHTS_coupling/apps/cpu/LiggghtsApp/in2.lbdem";
+ MPI_Comm mpi_comm = *(MPI_Comm *)(comm->getNativeCommunicator());
+ LiggghtsCouplingWrapper wrapper(argv, mpi_comm);
+
+ double v_frac = 0.1;
+ double dt_phys = units->getFactorTimeLbToW();
+ int demSubsteps = 10;
+ double dt_dem = dt_phys / (double)demSubsteps;
+ int vtkSteps = 1000;
+ string demOutDir = outputPath + "/liggghts";
+
+ // wrapper.execCommand("echo none");
+
+ // wrapper.execFile((char*)inFile1.c_str());
+
+ //// set timestep and output directory
+ wrapper.setVariable("t_step", dt_dem);
+ wrapper.setVariable("dmp_stp", vtkSteps * demSubsteps);
+ wrapper.setVariable("dmp_dir", demOutDir);
+
+ wrapper.execFile((char *)inFile1.c_str());
+ //wrapper.runUpto(demSubsteps - 1);
+ // wrapper.runUpto(1000);
+
+ //LatticeDecomposition lDec((g_maxX1 - g_minX1) / dx, (g_maxX2 - g_minX2) / dx, (g_maxX3 - g_minX3) / dx, wrapper.lmp, grid);
+
+ SPtr<UbScheduler> lScheduler = make_shared<UbScheduler>(1);
+ SPtr<LiggghtsCouplingSimulationObserver> lcSimulationObserver = make_shared<LiggghtsCouplingSimulationObserver>(grid, lScheduler, comm, wrapper, demSubsteps, unitsAir);
+ //SPtr<Grid3DVisitor> partVisitor = make_shared<LiggghtsPartitioningGridVisitor>(std::ceil((g_maxX1 - g_minX1) / dx), std::ceil((g_maxX2 - g_minX2) / dx), std::ceil((g_maxX3 - g_minX3) / dx), wrapper.lmp);
+ SPtr<Grid3DVisitor> partVisitor = make_shared<LiggghtsPartitioningGridVisitor>(26,26,420, wrapper.lmp);
+
+ /////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////
+
+ SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, vf::lbm::dir::DIR_MMM, MetisPartitioner::RECURSIVE));
+
+ SPtr<GbObject3D> gridCube = make_shared<GbCuboid3D>(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3);
+ if (myid == 0) GbSystem3D::writeGeoObject(gridCube.get(), outputPath + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
+
+ GenBlocksGridVisitor genBlocks(gridCube);
+ grid->accept(genBlocks);
+
+ // geo
+ //////////////////////////////////////////////////////////
+ int accuracy = Interactor3D::EDGES;
+ ///////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshNozzleAirDistributor = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleAirDistributor:start");
+ meshNozzleAirDistributor->readMeshFromSTLFileASCII(geoPath + "/01_Nozzle_Air_Distributor.stl", false);
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleAirDistributor:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshNozzleAirDistributor.get(), outputPath + "/geo/meshNozzleAirDistributor", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intrNozzleAirDistributor = std::make_shared<D3Q27TriFaceMeshInteractor>(meshNozzleAirDistributor, grid, noSlipBC, Interactor3D::SOLID, (Interactor3D::Accuracy)accuracy);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshNozzleAirInlet = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleAirInlet:start");
+ meshNozzleAirInlet->readMeshFromSTLFileASCII(geoPath + "/02_Nozzle_Air_Inlet.stl", false);
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleAirInlet:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshNozzleAirInlet.get(), outputPath + "/geo/meshNozzleAirInlet", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intrNozzleAirInlet = std::make_shared<D3Q27TriFaceMeshInteractor>(meshNozzleAirInlet, grid, noSlipBC, Interactor3D::SOLID, (Interactor3D::Accuracy)accuracy);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshNozzleSpacer = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleSpacer:start");
+ meshNozzleSpacer->readMeshFromSTLFileASCII(geoPath + "/03_Nozzle_Spacer.stl", true);
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleSpacer:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshNozzleSpacer.get(), outputPath + "/geo/meshNozzleSpacer", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intrNozzleSpacer = std::make_shared<D3Q27TriFaceMeshInteractor>(meshNozzleSpacer, grid, noSlipBC, Interactor3D::SOLID, (Interactor3D::Accuracy)accuracy);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshNozzleAccDistributor = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleAccDistributor:start");
+ meshNozzleAccDistributor->readMeshFromSTLFileASCII(geoPath + "/04_Nozzle_Acc_Distributor.stl", false);
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleAccDistributor:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshNozzleAccDistributor.get(), outputPath + "/geo/meshNozzleAccDistributor", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intrNozzleAccDistributor = std::make_shared<D3Q27TriFaceMeshInteractor>(meshNozzleAccDistributor, grid, noSlipBC, Interactor3D::SOLID, (Interactor3D::Accuracy)accuracy);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshNozzleAccInlet = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleAccInlet:start");
+ meshNozzleAccInlet->readMeshFromSTLFileASCII(geoPath + "/05_Nozzle_Acc_Inlet.stl", false);
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleAccInlet:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshNozzleAccInlet.get(), outputPath + "/geo/meshNozzleAccInlet", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intrNozzleAccInlet = std::make_shared<D3Q27TriFaceMeshInteractor>(meshNozzleAccInlet, grid, noSlipBC, Interactor3D::SOLID, (Interactor3D::Accuracy)accuracy);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshNozzleVolcanNozzle1 = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleVolcanNozzle1:start");
+ meshNozzleVolcanNozzle1->readMeshFromSTLFileBinary(geoPath + "/06_1_Nozzle_Volcan_Nozzle.stl", true);
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleVolcanNozzle1:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshNozzleVolcanNozzle1.get(), outputPath + "/geo/meshNozzleVolcanNozzle1", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intrNozzleVolcanNozzle1 = std::make_shared<D3Q27TriFaceMeshInteractor>(meshNozzleVolcanNozzle1, grid, noSlipBC, Interactor3D::SOLID, Interactor3D::EDGES);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshNozzleVolcanNozzle2 = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleVolcanNozzle2:start");
+ meshNozzleVolcanNozzle2->readMeshFromSTLFileBinary(geoPath + "/06_2_Nozzle_Volcan_Nozzle.stl", true);
+ if (myid == 0) UBLOG(logINFO, "Read meshNozzleVolcanNozzle2:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshNozzleVolcanNozzle2.get(), outputPath + "/geo/meshNozzleVolcanNozzle2", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intrNozzleVolcanNozzle2 = std::make_shared<D3Q27TriFaceMeshInteractor>(meshNozzleVolcanNozzle2, grid, noSlipBC, Interactor3D::SOLID, Interactor3D::POINTS);
+ ///////////////////////////////////////////////////////////
+ // box
+ SPtr<D3Q27Interactor> intrBox = SPtr<D3Q27Interactor>(new D3Q27Interactor(gridCube, grid, noSlipBC, Interactor3D::INVERSESOLID));
+ ///////////////////////////////////////////////////////////
+ // inflow
+ //GbCylinder3DPtr geoInflow(new GbCylinder3D(-1.30181 + 0.0005, 0.390872 - 0.00229, 0.20105, -1.30181 + 0.0005, 0.390872 - 0.00229, 0.23, 0.013));
+ GbCylinder3DPtr geoInflow(new GbCylinder3D(-1.30181 + 0.0005, 0.390872 - 0.00229, 0.175, -1.30181 + 0.0005, 0.390872 - 0.00229, 0.21, 0.013));
+ if (myid == 0) GbSystem3D::writeGeoObject(geoInflow.get(), outputPath + "/geo/geoInflow", WbWriterVtkXmlBinary::getInstance());
+ SPtr<D3Q27Interactor> intrInflow = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, inflowConcreteBC, Interactor3D::SOLID));
+ ///////////////////////////////////////////////////////////
+ // outflow
+ //GbCylinder3DPtr geoOutflow(new GbCylinder3D(-1.30181 + 0.0005, 0.390872 - 0.00229, -0.22, -1.30181 + 0.0005, 0.390872 - 0.00229, -0.21, 0.013));
+ //GbCylinder3DPtr geoOutflow(new GbCylinder3D(-1.30181 + 0.0005, 0.390872 - 0.00229, -0.426, -1.30181 + 0.0005, 0.390872 - 0.00229, -0.415, 0.013));
+ GbCylinder3DPtr geoOutflow(new GbCylinder3D(-1.30181 + 0.0005, 0.390872 - 0.00229, g_minX3, -1.30181 + 0.0005, 0.390872 - 0.00229, g_minX3+2.*dx, 0.013));
+ if (myid == 0) GbSystem3D::writeGeoObject(geoOutflow.get(), outputPath + "/geo/geoOutflow", WbWriterVtkXmlBinary::getInstance());
+ SPtr<D3Q27Interactor> intrOutflow = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow, grid, outflowBC, Interactor3D::SOLID));
+ ///////////////////////////////////////////////////////////
+ // SPtr<GbTriFaceMesh3D> geoAirInlet = std::make_shared<GbTriFaceMesh3D>();
+ // if (myid == 0) UBLOG(logINFO, "Read Air_Inlet:start");
+ // geoAirInlet->readMeshFromSTLFileASCII(geoPath + "/Air_Inlet.stl", true);
+ // if (myid == 0) UBLOG(logINFO, "Read Air_Inlet:end");
+ // if (myid == 0) GbSystem3D::writeGeoObject(geoAirInlet.get(), outputPath + "/geo/geoAirInlet", WbWriterVtkXmlBinary::getInstance());
+ // SPtr<Interactor3D> intrAirInlet = std::make_shared<D3Q27TriFaceMeshInteractor>(geoAirInlet, grid, inflowAirBC1, Interactor3D::SOLID, Interactor3D::EDGES);
+ /////////////////////////////////////////////////////////////
+ // Fluid area
+ GbCylinder3DPtr geoFluidArea(new GbCylinder3D(-1.30181 + 0.0005, 0.390872 - 0.00229, g_minX3, -1.30181 + 0.0005, 0.390872 - 0.00229, g_maxX3, 0.013));
+ if (myid == 0) GbSystem3D::writeGeoObject(geoFluidArea.get(), outputPath + "/geo/geoFluidArea", WbWriterVtkXmlBinary::getInstance());
+ SPtr<D3Q27Interactor> intrFluidArea = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoFluidArea, grid, noSlipBC, Interactor3D::INVERSESOLID));
+ ///////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////
+ GbCylinder3DPtr geoAirInflow(new GbCylinder3D(-1.31431 - 0.0005, 0.388587, 0.1383275, -1.31431, 0.388587, 0.1383275, 0.002765));
+ if (myid == 0) GbSystem3D::writeGeoObject(geoAirInflow.get(), outputPath + "/geo/geoAirInlet", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intrAirInflow = std::make_shared<D3Q27Interactor>(geoAirInflow, grid, inflowAirBC1, Interactor3D::SOLID, Interactor3D::EDGES);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshAirInlet1 = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet1:start");
+ meshAirInlet1->readMeshFromSTLFileASCII(geoPath + "/Air_Inlet_1.stl", true);
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet1:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshAirInlet1.get(), outputPath + "/geo/meshAirInlet1", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intAirInlet1 = std::make_shared<D3Q27TriFaceMeshInteractor>(meshAirInlet1, grid, inflowAirBC1, Interactor3D::SOLID, Interactor3D::POINTS);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshAirInlet2 = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet2:start");
+ meshAirInlet2->readMeshFromSTLFileASCII(geoPath + "/Air_Inlet_2.stl", true);
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet2:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshAirInlet2.get(), outputPath + "/geo/meshAirInlet2", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intAirInlet2 = std::make_shared<D3Q27TriFaceMeshInteractor>(meshAirInlet2, grid, inflowAirBC2, Interactor3D::SOLID, Interactor3D::POINTS);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshAirInlet3 = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet3:start");
+ meshAirInlet3->readMeshFromSTLFileASCII(geoPath + "/Air_Inlet_3.stl", true);
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet3:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshAirInlet3.get(), outputPath + "/geo/meshAirInlet3", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intAirInlet3 = std::make_shared<D3Q27TriFaceMeshInteractor>(meshAirInlet3, grid, inflowAirBC3, Interactor3D::SOLID, Interactor3D::POINTS);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshAirInlet4 = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet4:start");
+ meshAirInlet4->readMeshFromSTLFileASCII(geoPath + "/Air_Inlet_4.stl", true);
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet4:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshAirInlet4.get(), outputPath + "/geo/meshAirInlet4", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intAirInlet4 = std::make_shared<D3Q27TriFaceMeshInteractor>(meshAirInlet4, grid, inflowAirBC4, Interactor3D::SOLID, Interactor3D::POINTS);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshAirInlet5 = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet5:start");
+ meshAirInlet5->readMeshFromSTLFileASCII(geoPath + "/Air_Inlet_5.stl", true);
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet5:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshAirInlet5.get(), outputPath + "/geo/meshAirInlet5", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intAirInlet5 = std::make_shared<D3Q27TriFaceMeshInteractor>(meshAirInlet5, grid, inflowAirBC5, Interactor3D::SOLID, Interactor3D::POINTS);
+ ///////////////////////////////////////////////////////////
+ SPtr<GbTriFaceMesh3D> meshAirInlet6 = std::make_shared<GbTriFaceMesh3D>();
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet6:start");
+ meshAirInlet6->readMeshFromSTLFileASCII(geoPath + "/Air_Inlet_6.stl", true);
+ if (myid == 0) UBLOG(logINFO, "Read meshAirInlet6:end");
+ if (myid == 0) GbSystem3D::writeGeoObject(meshAirInlet6.get(), outputPath + "/geo/meshAirInlet6", WbWriterVtkXmlBinary::getInstance());
+ SPtr<Interactor3D> intAirInlet6 = std::make_shared<D3Q27TriFaceMeshInteractor>(meshAirInlet6, grid, inflowAirBC6, Interactor3D::SOLID, Interactor3D::POINTS);
+ ///////////////////////////////////////////////////////////
+
+ InteractorsHelper intHelper(grid, partVisitor, false);
+
+ intHelper.addInteractor(intrFluidArea);
+ intHelper.addInteractor(intrNozzleVolcanNozzle2);
+ // intHelper.addInteractor(intrBox);
+ //intHelper.addInteractor(intrInflow);
+ // intHelper.addInteractor(intrAirInflow);
+ intHelper.addInteractor(intAirInlet1);
+ intHelper.addInteractor(intAirInlet2);
+ intHelper.addInteractor(intAirInlet3);
+ intHelper.addInteractor(intAirInlet4);
+ intHelper.addInteractor(intAirInlet5);
+ intHelper.addInteractor(intAirInlet6);
+ intHelper.addInteractor(intrOutflow);
+
+ // intHelper.addInteractor(intrNozzleAirDistributor);
+ // intHelper.addInteractor(intrNozzleAirInlet);
+ // intHelper.addInteractor(intrNozzleSpacer);
+ // intHelper.addInteractor(intrNozzleAccDistributor);
+ // intHelper.addInteractor(intrNozzleAccInlet);
+ // intHelper.addInteractor(intrNozzleVolcanNozzle1);
+
+ intHelper.selectBlocks();
+
+ SPtr<SimulationObserver> ppblocks = make_shared<WriteBlocksSimulationObserver>(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm);
+ ppblocks->update(0);
+ ppblocks.reset();
+
+ // if (myid == 0) UBLOG(logINFO, Utilities::toString(grid, comm->getNumberOfProcesses()));
+
+ SetKernelBlockVisitor kernelVisitor(kernel, nu_l_LB, comm->getNumberOfProcesses());
+ //MultiphaseSetKernelBlockVisitor kernelVisitor(kernel, nu_h_LB, nu_l_LB, 1e9, 1);
+ grid->accept(kernelVisitor);
+
+
+ intHelper.setBC();
+
+ // InitDistributionsBlockVisitor initVisitor;
+ // grid->accept(initVisitor);
+
+ double x1c = -1.31431 + R;
+ double x2c = 0.375582 + R;
+ double Ri = 5;
+ double x3c = 0.136 + Ri;
+
+ //R = 0.2 - 0.145; // 0.078-0.04; // 0.2;
+
+ mu::Parser fct1;
+ // fct1.SetExpr(" 0.5 - 0.5 * tanh(2 * (sqrt((x1 - x1c) ^ 2 + (x2 - x2c) ^ 2 + (x3 - x3c) ^ 2) - radius) / interfaceThickness)");
+ fct1.SetExpr(" 0.5 - 0.5 * tanh(2 * (sqrt((x1 - x1c) ^ 2 + (x2 - x2c) ^ 2 + (x3 - x3c) ^ 2) - radius) / interfaceThickness)");
+ fct1.DefineConst("x1c", x1c);
+ fct1.DefineConst("x2c", x2c);
+ fct1.DefineConst("x3c", x3c);
+ fct1.DefineConst("radius", Ri);
+ fct1.DefineConst("interfaceThickness", interfaceThickness * dx);
+
+ //MultiphaseVelocityFormInitDistributionsBlockVisitor initVisitor;
+ //initVisitor.setPhi(fct1);
+ //grid->accept(initVisitor);
+
+ InitDistributionsBlockVisitor initVisitor;
+ grid->accept(initVisitor);
+
+ // boundary conditions grid
+ {
+ SPtr<UbScheduler> geoSch(new UbScheduler(1));
+ SPtr<WriteBoundaryConditionsSimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(grid, geoSch, outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppgeo->update(0);
+ ppgeo.reset();
+ }
+
+ grid->accept(bcVisitor);
+
+ OneDistributionSetConnectorsBlockVisitor setConnsVisitor(comm);
+ //TwoDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
+ // ThreeDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
+ grid->accept(setConnsVisitor);
+
+ int numOfThreads = 1;
+ omp_set_num_threads(numOfThreads);
+
+ SPtr<UbScheduler> nupsSch = std::make_shared<UbScheduler>(10, 10, 100);
+ SPtr<NUPSCounterSimulationObserver> nupsSimulationObserver = make_shared<NUPSCounterSimulationObserver>(grid, nupsSch, numOfThreads, comm);
+
+ //// write data for visualization of macroscopic quantities
+ SPtr<UbScheduler> visSch(new UbScheduler(vtkSteps));
+ // SPtr<UbScheduler> visSch(new UbScheduler(1, 8700, 8800));
+ // visSch->addSchedule(1, 8700, 8800);
+ //SPtr<WriteSharpInterfaceQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteSharpInterfaceQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ //writeMQSimulationObserver->update(0);
+
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ writeMQSimulationObserver->update(0);
+
+ int endTime = 10000000;
+ SPtr<Simulation> simulation(new Simulation(grid, lScheduler, endTime));
+ simulation->addSimulationObserver(nupsSimulationObserver);
+ simulation->addSimulationObserver(lcSimulationObserver);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+
+ if (myid == 0) UBLOG(logINFO, "Simulation-start");
+ simulation->run();
+ if (myid == 0) UBLOG(logINFO, "Simulation-end");
+
+ } catch (std::exception &e) {
+ cerr << e.what() << endl << flush;
+ } catch (std::string &s) {
+ cerr << s << endl;
+ } catch (...) {
+ cerr << "unknown exception" << endl;
+ }
+ return 0;
+}
diff --git a/apps/cpu/OrganPipe/OrganPipe.cpp b/apps/cpu/OrganPipe/OrganPipe.cpp
index ad6ec5a1d0892b60f699b74ee4101a9f4ad047e3..b23c159110dce4d1415f4a558d9cd1910e0c2de4 100644
--- a/apps/cpu/OrganPipe/OrganPipe.cpp
+++ b/apps/cpu/OrganPipe/OrganPipe.cpp
@@ -389,9 +389,9 @@ void run(string configname)
grid->setTimeStep(restartStep);
}
////set connectors
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
- dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iProcessor)->setBulkViscosity(nu_LB, bulckViscosity);
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
+ dynamicPointerCast<CompressibleOffsetMomentsInterpolator>(iProcessor)->setBulkViscosity(nu_LB, bulckViscosity);
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/PoiseuilleFlow/pf2.cpp b/apps/cpu/PoiseuilleFlow/pf2.cpp
index f312bc37dacc3caadd9935f450cdcf808c945b4f..c339e06a6c9cac71b4ba9d340ef72027fd999f41 100644
--- a/apps/cpu/PoiseuilleFlow/pf2.cpp
+++ b/apps/cpu/PoiseuilleFlow/pf2.cpp
@@ -149,7 +149,7 @@
// grid->accept(initVisitor);
//
// //set connectors
-// InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+// InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
// SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
// grid->accept(setConnsVisitor);
//
diff --git a/apps/cpu/PoiseuilleFlow/pf3.cpp b/apps/cpu/PoiseuilleFlow/pf3.cpp
index a2eca67d593fd9e21641e99bd3910e4c775f00a9..fa01b68521fadb59c4101a82caef30377b3368fc 100644
--- a/apps/cpu/PoiseuilleFlow/pf3.cpp
+++ b/apps/cpu/PoiseuilleFlow/pf3.cpp
@@ -141,7 +141,7 @@
// grid->accept(initVisitor);
//
// //set connectors
-// InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+// InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
// SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
// grid->accept(setConnsVisitor);
//
diff --git a/apps/cpu/PoiseuilleFlow/pf4.cpp b/apps/cpu/PoiseuilleFlow/pf4.cpp
index 9b249f94e19fd6c53b6410702406c498c101ed42..2e419358e1d5b32ea0f9fc542f8d47b80aa6cae8 100644
--- a/apps/cpu/PoiseuilleFlow/pf4.cpp
+++ b/apps/cpu/PoiseuilleFlow/pf4.cpp
@@ -154,7 +154,7 @@
// grid->accept(initVisitor);
//
// //set connectors
-// InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+// InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
// SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
// grid->accept(setConnsVisitor);
//
diff --git a/apps/cpu/TPMSRow/TPMSRow.cpp b/apps/cpu/TPMSRow/TPMSRow.cpp
index 9adcaadde90454a64221d04e55712ff12c175e54..596b79d0525339d38ee18a3062a219459de8f305 100644
--- a/apps/cpu/TPMSRow/TPMSRow.cpp
+++ b/apps/cpu/TPMSRow/TPMSRow.cpp
@@ -447,7 +447,7 @@ void run(string configname)
UBLOG(logINFO, "Restart - end");
}
// set connectors
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetInterpolationProcessor());
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetInterpolator());
//SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu, iProcessor);
OneDistributionSetConnectorsBlockVisitor setConnsVisitor(comm);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/aperm/aperm.cpp b/apps/cpu/aperm/aperm.cpp
index ecff1a453276444b706e31729012dea10597ac61..7591afe4d31c3b0c75097dd44a31477e852dbb00 100644
--- a/apps/cpu/aperm/aperm.cpp
+++ b/apps/cpu/aperm/aperm.cpp
@@ -320,7 +320,7 @@ void run(string configname)
//////////////////////////////////////
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
@@ -467,7 +467,7 @@ void run(string configname)
}
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/aperm/aperm.cpp.old b/apps/cpu/aperm/aperm.cpp.old
index 54dfe45fd86ff791d3965632a21acac0a3284aea..fd6f916d8155eda8719b3c8cf3382af513206989 100644
--- a/apps/cpu/aperm/aperm.cpp.old
+++ b/apps/cpu/aperm/aperm.cpp.old
@@ -285,7 +285,7 @@ void run(string configname)
//////////////////////////////////////
//set connectors
- D3Q27InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ D3Q27InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
@@ -487,7 +487,7 @@ void run(string configname)
}
//set connectors
- D3Q27InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ D3Q27InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/aperm/aperm.cpp.old2 b/apps/cpu/aperm/aperm.cpp.old2
index bd49f895a277a34608393a7cb53c0b6466526a95..8f0cf83e2f8ae1731dd0e76dccb4a50bddc00ba5 100644
--- a/apps/cpu/aperm/aperm.cpp.old2
+++ b/apps/cpu/aperm/aperm.cpp.old2
@@ -303,7 +303,7 @@ void run(string configname)
//////////////////////////////////////
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
@@ -450,7 +450,7 @@ void run(string configname)
}
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/bChannelA/bChannelA.cpp b/apps/cpu/bChannelA/bChannelA.cpp
index d50e87437b5fa17353b0f8adb298ec91ecc9d964..01725f2a3b883c0c0a53c6578dc581eadb0c8dc5 100644
--- a/apps/cpu/bChannelA/bChannelA.cpp
+++ b/apps/cpu/bChannelA/bChannelA.cpp
@@ -385,8 +385,8 @@ void run(string configname)
grid->accept(initVisitor);
////set connectors
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
@@ -409,7 +409,7 @@ void run(string configname)
//migCoProcessor->restart((int)restartStep);
grid->setTimeStep(restartStep);
////////////////////////////////////////////////////////////////////////////
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/f16Test/f16test.cpp b/apps/cpu/f16Test/f16test.cpp
index a73949c8cef45cfa1b576070cb004041f2ac7a0f..2360d962a59015c0c73d869cd97a68d65d3afeee 100644
--- a/apps/cpu/f16Test/f16test.cpp
+++ b/apps/cpu/f16Test/f16test.cpp
@@ -571,8 +571,8 @@ void run(string configname)
grid->accept(initVisitor);
////set connectors
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
@@ -591,7 +591,7 @@ void run(string configname)
}
else
{
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/levels/levels.cpp b/apps/cpu/levels/levels.cpp
index 0fe328df129ea3f64a135f74f51e425c8d33bd52..a5ac8588023b76b3043d333e6056426147fa4689 100644
--- a/apps/cpu/levels/levels.cpp
+++ b/apps/cpu/levels/levels.cpp
@@ -208,7 +208,7 @@ void run(string configname)
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
@@ -290,7 +290,7 @@ void run(string configname)
UBLOG(logINFO, "SetConnectors - start, id="<<myid);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
//D3Q27SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
SPtr<ConnectorFactory> cFactory(new Block3DConnectorFactory());
ConnectorBlockVisitor setConnsVisitor(comm, nuLB, iProcessor, cFactory);
diff --git a/apps/cpu/mirror/mirror.cpp b/apps/cpu/mirror/mirror.cpp
index 68902fdb7d0dcb74d3eb59d884a0619c8bb0cf6b..b85d9b249ba60e10584d00ba95eda73da915ef5b 100644
--- a/apps/cpu/mirror/mirror.cpp
+++ b/apps/cpu/mirror/mirror.cpp
@@ -488,7 +488,7 @@ void run(string configname)
grid->accept(initVisitor);
////set connectors
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
@@ -506,7 +506,7 @@ void run(string configname)
}
else
{
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/mpi_benchmark/mpib.cpp b/apps/cpu/mpi_benchmark/mpib.cpp
index 6c13de98b743ad251bb1000dafc609660ca4ba46..797efbc7ed5ea87b31b30cfc3b6258a239fbd5d2 100644
--- a/apps/cpu/mpi_benchmark/mpib.cpp
+++ b/apps/cpu/mpi_benchmark/mpib.cpp
@@ -211,7 +211,7 @@ void run(string configname)
//set connectors
if (myid==0) UBLOG(logINFO, "SetConnectorsBlockVisitor:start");
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nueLB, iProcessor);
grid->accept(setConnsVisitor);
if (myid==0) UBLOG(logINFO, "SetConnectorsBlockVisitor:end");
diff --git a/apps/cpu/pChannel/pChannel.cpp b/apps/cpu/pChannel/pChannel.cpp
index c2b32108037389ddd18351ff7092cd3d680492ea..72292679f3ef53eaf81e1f26fa54659f5b002584 100644
--- a/apps/cpu/pChannel/pChannel.cpp
+++ b/apps/cpu/pChannel/pChannel.cpp
@@ -536,7 +536,7 @@ void run(string configname)
grid->accept(initVisitor);
////set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
@@ -559,7 +559,7 @@ void run(string configname)
migCoProcessor->restart((int)restartStep);
grid->setTimeStep(restartStep);
////////////////////////////////////////////////////////////////////////////
- InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/perm/perm.cpp b/apps/cpu/perm/perm.cpp
index 7fae63025a198a09af2a30da3776f940441dbcc2..ff0af00b8d10af2715542aaee8adf53abf633db4 100644
--- a/apps/cpu/perm/perm.cpp
+++ b/apps/cpu/perm/perm.cpp
@@ -415,7 +415,7 @@ void perm(string configname)
}
////set connectors
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/poiseuille_example/poiseuille.cpp b/apps/cpu/poiseuille_example/poiseuille.cpp
index d5de62d10edb0ddcfb7790febe494f937317f6e9..52fede221deb1dd8ffa800fae711ff8517895054 100644
--- a/apps/cpu/poiseuille_example/poiseuille.cpp
+++ b/apps/cpu/poiseuille_example/poiseuille.cpp
@@ -79,7 +79,7 @@ int main()
grid->accept(kernelVisitor);
interactorsHelper.setBC();
- const auto interpolationProcessor(std::make_shared<CompressibleOffsetMomentsInterpolationProcessor>());
+ const auto interpolationProcessor(std::make_shared<CompressibleOffsetMomentsInterpolator>());
interpolationProcessor->setBulkViscosity(latticeViscosity, latticeViscosity * bulkViscosityFactor);
SetConnectorsBlockVisitor setConnsVisitor(communicator,
diff --git a/apps/cpu/screw/screw.cpp b/apps/cpu/screw/screw.cpp
index c1eea3f960cf6b4b64757843d08d126e4fac14b9..7ba90a58644e8d19181847dd0825abb57366daf5 100644
--- a/apps/cpu/screw/screw.cpp
+++ b/apps/cpu/screw/screw.cpp
@@ -146,8 +146,8 @@ int main(int argc, char* argv[])
//////////////////////////////////////
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
+ //InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
@@ -220,7 +220,7 @@ int main(int argc, char* argv[])
grid->accept(bcVisitor);
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/cpu/sphere/sphere.cpp b/apps/cpu/sphere/sphere.cpp
index 8a5ef89b8bf09e765236153f37cb259e075bf15e..1f0f5c116988f9d4bb8d068768d057db376a42d0 100644
--- a/apps/cpu/sphere/sphere.cpp
+++ b/apps/cpu/sphere/sphere.cpp
@@ -267,14 +267,14 @@ void run(string configname)
UBLOG(logINFO, "SetConnectors - start, id=" << myid);
//set connectors
- //SPtr<InterpolationProcessor> iProcessor(new IncompressibleOffsetInterpolationProcessor());
- //SPtr<CompressibleOffsetMomentsInterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
+ //SPtr<Interpolator> iProcessor(new IncompressibleOffsetInterpolator());
+ //SPtr<CompressibleOffsetMomentsInterpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
//SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
OneDistributionSetConnectorsBlockVisitor setConnsVisitor(comm);
grid->accept(setConnsVisitor);
- SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
+ SPtr<Interpolator> iProcessor(new CompressibleOffsetMomentsInterpolator());
SetInterpolationConnectorsBlockVisitor setInterConnsVisitor(comm, nuLB, iProcessor);
grid->accept(setInterConnsVisitor);
diff --git a/apps/cpu/teperm/teperm.cpp b/apps/cpu/teperm/teperm.cpp
index aecdb3745f3da37c03b07eb7b103374a99df4302..9c4c1585ffaee5dce85eb6d1d9d0de993e033d7b 100644
--- a/apps/cpu/teperm/teperm.cpp
+++ b/apps/cpu/teperm/teperm.cpp
@@ -356,7 +356,7 @@ void run(string configname)
//////////////////////////////////////
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
@@ -501,7 +501,7 @@ void run(string configname)
}
//set connectors
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
+ InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolator());
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nu_LB, iProcessor);
grid->accept(setConnsVisitor);
diff --git a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
index 94755358f680503e19e0e204946ae51016d39802..9c7394951e795055d22be9b155166464c998c098 100644
--- a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
+++ b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
@@ -71,7 +71,7 @@
//////////////////////////////////////////////////////////////////////////
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
@@ -107,7 +107,7 @@ std::string simulationName("ActuatorLine");
void multipleLevel(const std::string& configPath)
{
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
auto gridFactory = GridFactory::make();
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
@@ -236,21 +236,28 @@ void multipleLevel(const std::string& configPath)
para->addActuator( actuator_farm );
- // SPtr<PointProbe> pointProbe = std::make_shared<PointProbe>("pointProbe", para->getOutputPath(), 100, 1, 500, 100);
- // std::vector<real> probeCoordsX = {reference_diameter,2*reference_diameter,5*reference_diameter};
- // std::vector<real> probeCoordsY = {3*reference_diameter,3*reference_diameter,3*reference_diameter};
- // std::vector<real> probeCoordsZ = {3*reference_diameter,3*reference_diameter,3*reference_diameter};
- // pointProbe->addProbePointsFromList(probeCoordsX, probeCoordsY, probeCoordsZ);
- // // pointProbe->addProbePointsFromXNormalPlane(2*D, 0.0, 0.0, L_y, L_z, (uint)L_y/dx, (uint)L_z/dx);
+ SPtr<PointProbe> pointProbe = std::make_shared<PointProbe>("pointProbe", para->getOutputPath(), 100, 1, 500, 100, false);
+ std::vector<real> probeCoordsX = {reference_diameter,2*reference_diameter,5*reference_diameter};
+ std::vector<real> probeCoordsY = {3*reference_diameter,3*reference_diameter,3*reference_diameter};
+ std::vector<real> probeCoordsZ = {3*reference_diameter,3*reference_diameter,3*reference_diameter};
- // pointProbe->addStatistic(Statistic::Means);
- // pointProbe->addStatistic(Statistic::Variances);
- // para->addProbe( pointProbe );
+ pointProbe->addProbePointsFromList(probeCoordsX, probeCoordsY, probeCoordsZ);
+ // pointProbe->addProbePointsFromXNormalPlane(2*D, 0.0, 0.0, L_y, L_z, (uint)L_y/dx, (uint)L_z/dx);
- // SPtr<PlaneProbe> planeProbe = std::make_shared<PlaneProbe>("planeProbe", para->getOutputPath(), 100, 500, 100, 100);
- // planeProbe->setProbePlane(5*reference_diameter, 0, 0, dx, L_y, L_z);
- // planeProbe->addStatistic(Statistic::Means);
- // para->addProbe( planeProbe );
+ pointProbe->addStatistic(Statistic::Means);
+ pointProbe->addStatistic(Statistic::Variances);
+ para->addProbe( pointProbe );
+
+ SPtr<PointProbe> timeseriesProbe = std::make_shared<PointProbe>("timeProbe", para->getOutputPath(), 100, 1, 500, 100, true);
+ timeseriesProbe->addProbePointsFromList(probeCoordsX, probeCoordsY, probeCoordsZ);
+ timeseriesProbe->addStatistic(Statistic::Instantaneous);
+ timeseriesProbe->addStatistic(Statistic::Means);
+ para->addProbe( timeseriesProbe );
+
+ SPtr<PlaneProbe> planeProbe = std::make_shared<PlaneProbe>("planeProbe", para->getOutputPath(), 100, 500, 100, 100);
+ planeProbe->setProbePlane(5*reference_diameter, 0, 0, dx, L_y, L_z);
+ planeProbe->addStatistic(Statistic::Means);
+ para->addProbe( planeProbe );
auto cudaMemoryManager = std::make_shared<CudaMemoryManager>(para);
diff --git a/apps/gpu/LBM/Basel/main.cpp b/apps/gpu/LBM/Basel/main.cpp
index 4999d3418b269ae4340ca550a5f2c50fc6e45231..16161dc6a83846f2730c5920dfd64363b6e77b30 100644
--- a/apps/gpu/LBM/Basel/main.cpp
+++ b/apps/gpu/LBM/Basel/main.cpp
@@ -19,7 +19,7 @@
#include "Input/ConfigFileReader/ConfigFileReader.h"
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
diff --git a/apps/gpu/LBM/BaselMultiGPU/main.cpp b/apps/gpu/LBM/BaselMultiGPU/main.cpp
index bfd64d42b428907e08c3a3b7fdb99319e0f05382..346ab7ca36ccd147d1f8427974ce2510b5d637fb 100644
--- a/apps/gpu/LBM/BaselMultiGPU/main.cpp
+++ b/apps/gpu/LBM/BaselMultiGPU/main.cpp
@@ -19,7 +19,7 @@
#include "Input/ConfigFileReader/ConfigFileReader.h"
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
diff --git a/apps/gpu/LBM/BaselNU/main.cpp b/apps/gpu/LBM/BaselNU/main.cpp
index 9600785063018ce140606ef66b1ea466dc4bdb40..97c4c48afb5caffb89bad89e3f3fe99670c889bc 100644
--- a/apps/gpu/LBM/BaselNU/main.cpp
+++ b/apps/gpu/LBM/BaselNU/main.cpp
@@ -19,7 +19,7 @@
#include "Input/ConfigFileReader/ConfigFileReader.h"
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
diff --git a/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp b/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp
index 298c5d9c344a1873a2612a518f72f33f7d6b6f64..1c5f8ac0318f00a6bb819b016ff11925b2ff2da5 100644
--- a/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp
+++ b/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp
@@ -73,7 +73,7 @@
//////////////////////////////////////////////////////////////////////////
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
@@ -108,7 +108,7 @@ void multipleLevel(const std::string& configPath)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
vf::basics::ConfigurationFile config;
config.load(configPath);
@@ -119,7 +119,7 @@ void multipleLevel(const std::string& configPath)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
const int nProcs = communicator.getNumberOfProcess();
- const uint procID = vf::gpu::Communicator::getInstance().getPID();
+ const uint procID = vf::gpu::MpiCommunicator::getInstance().getPID();
std::vector<uint> devices(10);
std::iota(devices.begin(), devices.end(), 0);
para->setDevices(devices);
diff --git a/apps/gpu/LBM/BoundaryLayer/configBoundaryLayer.txt b/apps/gpu/LBM/BoundaryLayer/configBoundaryLayer.txt
index 83e7861a5fb85ea800d187699f1c6c1409422f0a..1b415aa6ce14109c2d93a17ae78463786a7b7608 100644
--- a/apps/gpu/LBM/BoundaryLayer/configBoundaryLayer.txt
+++ b/apps/gpu/LBM/BoundaryLayer/configBoundaryLayer.txt
@@ -23,8 +23,7 @@ Ma = 0.1
nz = 96
bodyForce = true
-UseAMD = true
-SGSconstant = 0.2
+TurbulenceModel = QR
QuadricLimiterP = 100000.0
QuadricLimiterM = 100000.0
QuadricLimiterD = 100000.0
diff --git a/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp b/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
index f553c255b882596ea4614e8e2fa33403e3d9a0f8..1482adf275da6dabae7bdde7647ac374a0d66bb1 100644
--- a/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
+++ b/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
@@ -65,7 +65,7 @@
//////////////////////////////////////////////////////////////////////////
#include "VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactory.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/GPU/CudaMemoryManager.h"
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
// setup simulation parameters (without config file)
//////////////////////////////////////////////////////////////////////////
- vf::gpu::Communicator &communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator &communicator = vf::gpu::MpiCommunicator::getInstance();
const int numberOfProcesses = communicator.getNumberOfProcess();
SPtr<Parameter> para = std::make_shared<Parameter>(numberOfProcesses, communicator.getPID());
std::vector<uint> devices(10);
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
//////////////////////////////////////////////////////////////////////////
vf::logging::Logger::changeLogPath("output/vflog_process" +
- std::to_string(vf::gpu::Communicator::getInstance().getPID()) + ".txt");
+ std::to_string(vf::gpu::MpiCommunicator::getInstance().getPID()) + ".txt");
vf::logging::Logger::initializeLogger();
//////////////////////////////////////////////////////////////////////////
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
para->setOutputPrefix("ChannelFlow");
para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
- const uint generatePart = vf::gpu::Communicator::getInstance().getPID();
+ const uint generatePart = vf::gpu::MpiCommunicator::getInstance().getPID();
real overlap = (real)8.0 * dx;
if (numberOfProcesses > 1) {
diff --git a/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp b/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
index a802de12c032766f9bf14d2a43b4d16078e230f6..245d1c052c909cef7c1ab948ca55d104419fa8cd 100644
--- a/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
+++ b/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
@@ -58,7 +58,7 @@
#include "VirtualFluids_GPU/Factories/BoundaryConditionFactory.h"
#include "VirtualFluids_GPU/Factories/GridScalingFactory.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/GPU/CudaMemoryManager.h"
@@ -164,7 +164,7 @@ int main()
// set copy mesh to simulation
//////////////////////////////////////////////////////////////////////////
- vf::gpu::Communicator &communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator &communicator = vf::gpu::MpiCommunicator::getInstance();
auto cudaMemoryManager = std::make_shared<CudaMemoryManager>(para);
SPtr<GridProvider> gridGenerator =
diff --git a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
index acab426b4868cc736710c883776c5626ec6b5753..d6b6703659aaca6d254a1fc2f7692be4e9f22593 100755
--- a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
+++ b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
@@ -36,7 +36,7 @@
//////////////////////////////////////////////////////////////////////////
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
@@ -62,7 +62,7 @@
void runVirtualFluids(const vf::basics::ConfigurationFile& config)
{
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
auto gridFactory = GridFactory::make();
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
@@ -145,7 +145,7 @@ void runVirtualFluids(const vf::basics::ConfigurationFile& config)
if (para->getNumprocs() > 1) {
- const uint generatePart = vf::gpu::Communicator::getInstance().getPID();
+ const uint generatePart = vf::gpu::MpiCommunicator::getInstance().getPID();
real overlap = (real)8.0 * dxGrid;
gridBuilder->setNumberOfLayers(10, 8);
@@ -517,7 +517,7 @@ int main(int argc, char *argv[])
try {
VF_LOG_TRACE("For the default config path to work, execute the app from the project root.");
- vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, "./apps/gpu/LBM/DrivenCavityMultiGPU/configDrivenCavityMultiGPU.txt");
+ vf::basics::ConfigurationFile config = vf::basics::loadConfig(argc, argv, "./apps/gpu/LBM/DrivenCavityMultiGPU/configDrivenCavityMultiGPU.txt");
runVirtualFluids(config);
//////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix4GPU_regressionTest.txt b/apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix4GPU_regressionTest.txt
index c5789cdf96049b7c0a31ce693c29cd2db4952a58..9b8c6e42de49997cc218a2a0ee6f832b903d142b 100644
--- a/apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix4GPU_regressionTest.txt
+++ b/apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix4GPU_regressionTest.txt
@@ -1,7 +1,7 @@
##################################################
#GPU Mapping
##################################################
-Devices="0 1 2 3"
+Devices=0 1 2 3
NumberOfDevices=4
##################################################
diff --git a/apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix8GPU_regressionTest.txt b/apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix8GPU_regressionTest.txt
index c5789cdf96049b7c0a31ce693c29cd2db4952a58..9b8c6e42de49997cc218a2a0ee6f832b903d142b 100644
--- a/apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix8GPU_regressionTest.txt
+++ b/apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix8GPU_regressionTest.txt
@@ -1,7 +1,7 @@
##################################################
#GPU Mapping
##################################################
-Devices="0 1 2 3"
+Devices=0 1 2 3
NumberOfDevices=4
##################################################
diff --git a/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp b/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp
index dfa1256c80e6aeb0e209638ba0c7425ff437e2d5..05c164ea82790c4a26c5c65538d944f46d1c969c 100644
--- a/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp
+++ b/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp
@@ -60,7 +60,7 @@
#include "VirtualFluids_GPU/Factories/BoundaryConditionFactory.h"
#include "VirtualFluids_GPU/Factories/GridScalingFactory.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/GPU/CudaMemoryManager.h"
@@ -167,7 +167,7 @@ int main()
// set copy mesh to simulation
//////////////////////////////////////////////////////////////////////////
- vf::gpu::Communicator &communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator &communicator = vf::gpu::MpiCommunicator::getInstance();
auto cudaMemoryManager = std::make_shared<CudaMemoryManager>(para);
SPtr<GridProvider> gridGenerator =
diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
index b583633b50542795fe4b27aca42c08cca1a5331c..5a5830d442ff83e33208ddee226e9ea34c84a2ef 100644
--- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
+++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
@@ -37,7 +37,7 @@
//////////////////////////////////////////////////////////////////////////
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
@@ -86,7 +86,7 @@ const std::string simulationName("MusselOyster");
void runVirtualFluids(const vf::basics::ConfigurationFile& config)
{
- vf::gpu::Communicator &communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator &communicator = vf::gpu::MpiCommunicator::getInstance();
auto gridFactory = GridFactory::make();
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
@@ -191,7 +191,7 @@ void runVirtualFluids(const vf::basics::ConfigurationFile& config)
bivalveRef_1_STL = std::make_shared<TriangularMesh>(stlPath + bivalveType + "_Level1.stl");
if (para->getNumprocs() > 1) {
- const uint generatePart = vf::gpu::Communicator::getInstance().getPID();
+ const uint generatePart = vf::gpu::MpiCommunicator::getInstance().getPID();
real overlap = (real)8.0 * dxGrid;
gridBuilder->setNumberOfLayers(10, 8);
@@ -584,7 +584,7 @@ int main(int argc, char *argv[])
try {
VF_LOG_TRACE("For the default config path to work, execute the app from the project root.");
- vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, "./apps/gpu/LBM/MusselOyster/configMusselOyster.txt");
+ vf::basics::ConfigurationFile config = vf::basics::loadConfig(argc, argv, "./apps/gpu/LBM/MusselOyster/configMusselOyster.txt");
runVirtualFluids(config);
//////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/LBM/SphereGPU/Sphere.cpp b/apps/gpu/LBM/SphereGPU/Sphere.cpp
index a20383b8e7eab9ce61fb8d8c21de95d6033f5c5f..7794217f4e42f79070b1037c86b3e74b1f94d967 100644
--- a/apps/gpu/LBM/SphereGPU/Sphere.cpp
+++ b/apps/gpu/LBM/SphereGPU/Sphere.cpp
@@ -62,7 +62,7 @@
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/GPU/CudaMemoryManager.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/LBM/Simulation.h"
#include "VirtualFluids_GPU/Output/FileWriter.h"
#include "VirtualFluids_GPU/Parameter/Parameter.h"
@@ -96,14 +96,14 @@ int main(int argc, char *argv[])
// setup simulation parameters (with or without config file)
//////////////////////////
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();;
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();;
SPtr<Parameter> para;
BoundaryConditionFactory bcFactory = BoundaryConditionFactory();
GridScalingFactory scalingFactory = GridScalingFactory();
vf::basics::ConfigurationFile config;
if (useConfigFile) {
VF_LOG_TRACE("For the default config path to work, execute the app from the project root.");
- vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, "./apps/gpu/LBM/SphereGPU/config.txt");
+ vf::basics::ConfigurationFile config = vf::basics::loadConfig(argc, argv, "./apps/gpu/LBM/SphereGPU/config.txt");
para = std::make_shared<Parameter>(&config);
} else {
para = std::make_shared<Parameter>();
diff --git a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
index da80302e9e9b5b6f43c7eb3eea0ae8be08f22b93..a5ed466c94cb8a3c40e8dcb87cc6a15b843a3d2c 100755
--- a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
+++ b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
@@ -39,7 +39,7 @@
//////////////////////////////////////////////////////////////////////////
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
@@ -65,7 +65,7 @@
void runVirtualFluids(const vf::basics::ConfigurationFile& config)
{
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
auto gridFactory = GridFactory::make();
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
@@ -170,7 +170,7 @@ void runVirtualFluids(const vf::basics::ConfigurationFile& config)
const real dCubeLev1 = 72.0; // Phoenix: 72.0
if (para->getNumprocs() > 1) {
- const uint generatePart = vf::gpu::Communicator::getInstance().getPID();
+ const uint generatePart = vf::gpu::MpiCommunicator::getInstance().getPID();
real overlap = (real)8.0 * dxGrid;
gridBuilder->setNumberOfLayers(10, 8);
@@ -658,7 +658,7 @@ int main(int argc, char *argv[])
try {
VF_LOG_INFO("For the default config path to work, execute the app from the project root.");
- vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, "./apps/gpu/LBM/SphereScaling/config.txt");
+ vf::basics::ConfigurationFile config = vf::basics::loadConfig(argc, argv, "./apps/gpu/LBM/SphereScaling/config.txt");
runVirtualFluids(config);
//////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/LBM/SphereScaling/configPhoenix4GPU_regressionTest.txt b/apps/gpu/LBM/SphereScaling/configPhoenix4GPU_regressionTest.txt
index c5789cdf96049b7c0a31ce693c29cd2db4952a58..9b8c6e42de49997cc218a2a0ee6f832b903d142b 100644
--- a/apps/gpu/LBM/SphereScaling/configPhoenix4GPU_regressionTest.txt
+++ b/apps/gpu/LBM/SphereScaling/configPhoenix4GPU_regressionTest.txt
@@ -1,7 +1,7 @@
##################################################
#GPU Mapping
##################################################
-Devices="0 1 2 3"
+Devices=0 1 2 3
NumberOfDevices=4
##################################################
diff --git a/apps/gpu/LBM/SphereScaling/configPhoenix8GPU_regressionTest.txt b/apps/gpu/LBM/SphereScaling/configPhoenix8GPU_regressionTest.txt
index c5789cdf96049b7c0a31ce693c29cd2db4952a58..9b8c6e42de49997cc218a2a0ee6f832b903d142b 100644
--- a/apps/gpu/LBM/SphereScaling/configPhoenix8GPU_regressionTest.txt
+++ b/apps/gpu/LBM/SphereScaling/configPhoenix8GPU_regressionTest.txt
@@ -1,7 +1,7 @@
##################################################
#GPU Mapping
##################################################
-Devices="0 1 2 3"
+Devices=0 1 2 3
NumberOfDevices=4
##################################################
diff --git a/apps/gpu/LBM/TGV_3D/TGV_3D.cpp b/apps/gpu/LBM/TGV_3D/TGV_3D.cpp
index 050efc6d0f0f2b80ca2da2df26cdb71b1e52f3ad..c813bc319c085506420638dac3ef623b110dc771 100644
--- a/apps/gpu/LBM/TGV_3D/TGV_3D.cpp
+++ b/apps/gpu/LBM/TGV_3D/TGV_3D.cpp
@@ -67,7 +67,7 @@
//////////////////////////////////////////////////////////////////////////
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
@@ -132,7 +132,7 @@ std::string simulationName("TGV_3D");
void multipleLevel(const std::string& configPath)
{
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
//UbLog::reportingLevel() = UbLog::logLevelFromString("DEBUG5");
diff --git a/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp b/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
index 0f945e32d9fbcb2e18d4888a4fa0a2c6e03c21b4..876496783e61867a45843b0aa871bbc794eca73f 100644
--- a/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
+++ b/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
@@ -67,7 +67,7 @@
//////////////////////////////////////////////////////////////////////////
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
@@ -131,7 +131,7 @@ std::string simulationName("TGV_3D_Gridref_noSqPress");
void multipleLevel(const std::string& configPath)
{
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
auto gridFactory = GridFactory::make();
//gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::RAYCASTING);
diff --git a/apps/gpu/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp b/apps/gpu/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp
index 0c7b9b9606201b32a8376ea637858eb14ec817bb..e643c4f72019c681bc7ae4b2711d46e3399dad71 100644
--- a/apps/gpu/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp
+++ b/apps/gpu/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp
@@ -54,7 +54,7 @@
#include "basics/config/ConfigurationFile.h"
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
@@ -156,7 +156,7 @@ void multipleLevel(const std::string& configPath)
rankY = ( mpirank % ( sideLengthX * sideLengthY ) ) / sideLengthX;
rankZ = mpirank / ( sideLengthY * sideLengthX );
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
//UbLog::reportingLevel() = UbLog::logLevelFromString("DEBUG5");
diff --git a/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp b/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
index d925eef7e7f452e19b63284f9ad3a6af25740e79..00fe00a24eb454c9aa0973d6ebe20f22c6a52369 100644
--- a/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
+++ b/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
@@ -68,7 +68,7 @@
//////////////////////////////////////////////////////////////////////////
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
@@ -129,7 +129,7 @@ std::string chooseVariation();
void multipleLevel(const std::string& configPath)
{
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
auto gridFactory = GridFactory::make();
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
diff --git a/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp b/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
index 93ff9de0f0a156d9d9aec0ec1b6615ae728e7811..90cc4c0ab33745c65688db4bf170b25a9099da51 100644
--- a/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
+++ b/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
@@ -18,7 +18,7 @@
#include "basics/config/ConfigurationFile.h"
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
@@ -65,7 +65,7 @@ void multipleLevel(const std::string& configPath)
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
vf::basics::ConfigurationFile config;
config.load(configPath);
SPtr<Parameter> para = std::make_shared<Parameter>(communicator.getNumberOfProcess(), communicator.getPID(), &config);
diff --git a/apps/gpu/LBM/lbmTest/main.cpp b/apps/gpu/LBM/lbmTest/main.cpp
index abe8e7488a55c773896ef6cb362db2bb8247fa4e..90640a3813a25e8249c7668a6e6c7779b0f01e4d 100644
--- a/apps/gpu/LBM/lbmTest/main.cpp
+++ b/apps/gpu/LBM/lbmTest/main.cpp
@@ -20,7 +20,7 @@
#include "StringUtilities/StringUtil.h"
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
diff --git a/apps/gpu/LBM/metisTest/main.cpp b/apps/gpu/LBM/metisTest/main.cpp
index b9879c16c32afd0ec27c5841a0b2dad7e4191055..9edfb9e853f1c4fff6872b15e93d4de94bd35095 100644
--- a/apps/gpu/LBM/metisTest/main.cpp
+++ b/apps/gpu/LBM/metisTest/main.cpp
@@ -19,7 +19,7 @@
#include "StringUtilities/StringUtil.h"
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp
index 58a4128fbd1ae54f59c625cb7b7ca4f851885962..6821f270428a32c2b579174a6c3e1662d0ccc55b 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp
@@ -1,6 +1,7 @@
#include "MathematicaListOfListsImp.h"
#include <iomanip>
+#include <limits>
std::shared_ptr<MathematicaListOfLists> MathematicaListOfListsImp::getNewInstance(std::string listName, std::vector<std::vector<double>> listOfLists)
{
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h
index ba19ba20dde6f9810f1003fb56964c9915cb425b..a1e82892ca92fc8b3b484440edb30bfbf957d965 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h
@@ -1,5 +1,5 @@
#ifndef MATHEMATICA_LIST_OF_LISTS_IMP_H
-#define MATHEMATICA_LIST_OF_LISTS_IMÜ_H
+#define MATHEMATICA_LIST_OF_LISTS_IMP_H
#include "MathematicaListOfLists.h"
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp
index 6689d5f14ad94cad908584c2847cc02536df60a6..cd00dddf194903666dc36abba86985c0a643d310 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp
@@ -4,6 +4,7 @@
#include "MathematicaPointList.h"
#include <iomanip>
+#include <limits>
std::shared_ptr<MathematicaPointList> MathematicaPointListImp::getNewInstance(std::string listName, std::vector<std::shared_ptr<DataPoint> > plotData)
{
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h
index 4ac2f917f904f32a80427514bffeeccc4dce53e9..21ee18ef262a24ed5ba978c9f1623ebc0ce5a286 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h
@@ -9,6 +9,7 @@ class PostProcessingConfigData;
class PostProcessingConfigFileReader
{
public:
+ virtual ~PostProcessingConfigFileReader() = default;
virtual std::shared_ptr<PostProcessingConfigData> readConfigFile(std::string filePath) = 0;
};
#endif
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
index 6c52eeb93f3e556ebfad4e993eb56c63c95b56fd..968af578a868b9e2655f4062d89fda8fed37941b 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
@@ -64,7 +64,3 @@ std::shared_ptr<PostProcessingConfigData> PostProcessingConfigFileReaderImp::rea
return data;
}
-
-PostProcessingConfigFileReaderImp::PostProcessingConfigFileReaderImp()
-{
-}
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h
index a47d53820807a6ac2fada77d7cb7efc09f658e07..e5355a708adb753e78089a68dc9f889df9a83fc5 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h
@@ -8,10 +8,10 @@ class PostProcessingConfigFileReaderImp : public PostProcessingConfigFileReader
public:
static std::shared_ptr<PostProcessingConfigFileReader> getNewInstance();
- std::shared_ptr<PostProcessingConfigData> readConfigFile(std::string filePath);
+ std::shared_ptr<PostProcessingConfigData> readConfigFile(std::string filePath) override;
private:
- PostProcessingConfigFileReaderImp();
+ PostProcessingConfigFileReaderImp() = default;
};
#endif
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/main.cpp b/apps/gpu/tests/NumericalTestPostProcessing/main.cpp
index bf88ad153d49bea167e148bab1abba8fa760b70f..e5dbeef9c7d3928c039049627129689ab92c653b 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/main.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/main.cpp
@@ -39,12 +39,12 @@ int main(int argc, char **argv)
std::shared_ptr<MathematicaAssistantFactory> assistantFactory = MathematicaAssistantFactoryImp::getNewInstance();
std::vector<std::shared_ptr<MathematicaAssistant> > mathematicaAssistants = assistantFactory->makeMathematicaAssistants(configData->getAssistants(), functionFactory);
- for (int sim = 0; sim < configData->getSimulations().size(); sim++) {
- for (int comb = 0; comb < configData->getDataCombinations().size(); comb++) {
+ for (uint sim = 0; sim < configData->getSimulations().size(); sim++) {
+ for (uint comb = 0; comb < configData->getDataCombinations().size(); comb++) {
std::shared_ptr<LogFileDataAssistantStrategy> strategy = assistentStrategyFactory->makeLogFileDataAssistantStrategy(configData->getSimulations().at(sim));
std::vector<std::shared_ptr<LogFileDataGroup> > logFileDataSorted = assistentLogFile->findDataCombination(logFileDataVector, strategy, configData->getDataCombinations().at(comb));
- for (int i = 0; i < logFileDataSorted.size(); i++) {
- for (int j = 0; j < mathematicaAssistants.size(); j++)
+ for (uint i = 0; i < logFileDataSorted.size(); i++) {
+ for (uint j = 0; j < mathematicaAssistants.size(); j++)
mathematicaAssistants.at(j)->makeMathematicaOutput(logFileDataSorted.at(i), aMathmaticaFile);
}
}
diff --git a/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp
index bf93a95f450ff1a21062644d9be098eb2c2c235f..a8a4a4df2e4d04564dbeb2a881cebd95ce6a1a9f 100644
--- a/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp
+++ b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp
@@ -17,7 +17,7 @@ std::shared_ptr<PhiTest> PhiTest::getNewInstance(std::shared_ptr<ColorConsoleOut
void PhiTest::evaluate()
{
- for (int i = 0; i < postProStrategies.size(); i++)
+ for (uint i = 0; i < postProStrategies.size(); i++)
phiDiff.push_back(postProStrategies.at(i)->getPhiDiff(dataToCalculate));
orderOfAccuracy = calcOrderOfAccuracy(phiDiff);
@@ -46,7 +46,7 @@ std::string PhiTest::getDataToCalculate()
std::vector<int> PhiTest::getLx()
{
std::vector<int> lxINT;
- for (int i = 0; i < lx.size(); i++)
+ for (uint i = 0; i < lx.size(); i++)
lxINT.push_back((int)lx.at(i));
return lxINT;
}
@@ -62,7 +62,7 @@ double PhiTest::getOrderOfAccuracy()
}
PhiTest::PhiTest(std::shared_ptr<ColorConsoleOutput> colorOutput, double viscosity, std::shared_ptr<PhiTestParameterStruct> testPara, std::string dataToCalculate)
- : TestImp(colorOutput), viscosity(viscosity), dataToCalculate(dataToCalculate)
+ : TestImp(colorOutput), dataToCalculate(dataToCalculate)
{
minOrderOfAccuracy = testPara->minOrderOfAccuracy;
startStepCalculation = testPara->startTimeStepCalculation;
@@ -92,7 +92,7 @@ std::vector<std::string> PhiTest::buildTestOutput()
std::vector<std::string> output = buildBasicTestOutput();
std::ostringstream oss;
- for (int i = 0; i < phiDiff.size(); i++) {
+ for (uint i = 0; i < phiDiff.size(); i++) {
oss << "PhiDiff" << simInfos.at(i)->getLx() << ": " << phiDiff.at(i);
output.push_back(oss.str());
oss.str(std::string());
@@ -125,7 +125,7 @@ std::vector<std::string> PhiTest::buildBasicTestOutput()
output.push_back(oss.str());
oss.str(std::string());
- for (int i = 0; i < simInfos.size(); i++) {
+ for (uint i = 0; i < simInfos.size(); i++) {
oss << "L: " << std::setfill(' ') << std::right << std::setw(4) << simInfos.at(i)->getLx() << simInfos.at(i)->getSimulationParameterString();
output.push_back(oss.str());
oss.str(std::string());
diff --git a/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h
index 84b1d33896a89834460c9d8495f1e068a2221364..4bf1c02f85e35b9cf1766642b6a0e9b58e6b4d07 100644
--- a/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h
+++ b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h
@@ -40,7 +40,6 @@ private:
std::vector<double> phiDiff;
double orderOfAccuracy;
double minOrderOfAccuracy;
- double viscosity;
std::string dataToCalculate;
std::vector<std::shared_ptr<PhiTestPostProcessingStrategy> > postProStrategies;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h
index 21ab49017188b92a97ea59a53d7ce28e51a694a8..5c90fa1ae0fe1332608d2932f2fa40435bb21fc5 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h
@@ -8,6 +8,7 @@
class L2NormCalculator
{
public:
+ virtual ~L2NormCalculator() = default;
virtual double calc(std::vector<double> basicData, std::vector<double> divergentData, std::vector<unsigned int> level, double lx, double lz, double l0) = 0;
virtual std::string getErrorMessage() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h
index 2b13f7ca3ca1337d8cbd7181ce4fc556e831a248..ffd1030cfa2abf8fb8b82699fe209dcf4e2416de 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h
@@ -9,6 +9,7 @@ class L2NormCalculator;
class L2NormCalculatorFactory
{
public:
+ virtual ~L2NormCalculatorFactory() = default;
virtual std::shared_ptr<L2NormCalculator> makeL2NormCalculator(std::string type) = 0;
};
diff --git a/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h b/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h
index 73b5dff2a02af7a60d3bccc9df6c0ec90c8c5940..5c9f03658f40e77cdd9d8ce8f82d3cd08e2c02d6 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h
@@ -12,6 +12,7 @@ class SimulationInfo;
class ColorConsoleOutput
{
public:
+ virtual ~ColorConsoleOutput() = default;
virtual void makeSimulationHeadOutput(std::shared_ptr<SimulationInfo> simInfo) = 0;
virtual void makeTestOutput(std::vector<std::string> testOutput, TestStatus status) = 0;
virtual void makeFinalTestOutputHead(int numberOfTests, int numberOfExecutedTest, int numberOfPassedTest, int numberOfFailedTest, int numberOfErrorTest, int numberOfNotExecutedTest) = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h
index 3af764aeeaa8b6f29831ead54b1f312d3be54e9f..a6e1eecf4a976e8c8e6a34c34f8b1e5e08887fd1 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h
@@ -10,7 +10,7 @@ class AnalyticalResults;
class AnalyticalResults2DToVTKWriter
{
public:
-
+ virtual ~AnalyticalResults2DToVTKWriter() = default;
virtual void writeAnalyticalResult(std::shared_ptr<Parameter> para, std::shared_ptr<AnalyticalResults> analyticalResult) = 0;
};
diff --git a/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp
index 126ff07a31c4f434cc82b4bb8b7e1d944b22cae1..15032a8fd4ec6ce8f7684c33ceae0085d92f54c4 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp
@@ -40,7 +40,7 @@ void AnalyticalResults2DToVTKWriterImp::writeAnalyticalResult(std::shared_ptr<Pa
for (int level = para->getCoarse(); level <= para->getFine(); level++) {
#pragma omp parallel for
for (int timeStep = 0; timeStep < analyticalResult->getNumberOfTimeSteps(); timeStep++) {
- const unsigned int numberOfParts = para->getParH(level)->size_Mat / para->getlimitOfNodesForVTK() + 1;
+ const unsigned int numberOfParts = para->getParH(level)->size_Mat / para->getLimitOfNodesForVTK() + 1;
std::vector<std::string> fname;
unsigned int time =
analyticalResult->getTimeSteps().at(timeStep) * analyticalResult->getTimeStepLength();
@@ -93,13 +93,13 @@ void AnalyticalResults2DToVTKWriterImp::writeTimeStep(std::shared_ptr<Parameter>
std::vector<double> vz = analyticalResult->getVz()[timeStep];
for (unsigned int part = 0; part < fname.size(); part++) {
- if (((part + 1) * para->getlimitOfNodesForVTK()) > para->getParH(level)->size_Mat)
- sizeOfNodes = para->getParH(level)->size_Mat - (part * para->getlimitOfNodesForVTK());
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > para->getParH(level)->size_Mat)
+ sizeOfNodes = para->getParH(level)->size_Mat - (part * para->getLimitOfNodesForVTK());
else
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
diff --git a/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
index 0735f39696efe134393f6fca66a5d318d59bcb13..1c9b322a29c80c28173d5791adc75e3756f22bbc 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
@@ -11,6 +11,7 @@ class Parameter;
class InitialCondition
{
public:
+ virtual ~InitialCondition() = default;
virtual void setParameter(std::shared_ptr<Parameter> para) = 0;
virtual void init(const int level) = 0;
virtual real getInitVX(int i, int level) = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h b/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h
index dbcb9b003579b34be5f5a6be09154d3762576086..7407fe4cc33da0a929d090a30878b8fe628f03bf 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h
@@ -7,7 +7,8 @@
class KernelConfiguration
{
public:
- virtual std::string getMainKernel() = 0;
+ virtual ~KernelConfiguration() = default;
+ virtual std::string getMainKernel() = 0;
virtual bool getMultiKernelOn() = 0;
virtual std::vector<int> getMultiKernelLevel() = 0;
virtual std::vector<std::string> getMultiKernel() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
index 20897bc5f8de3c94f7659b67b4ba6bdb3598d958..a8f14cab134f821b5dd46116e2b690779cab8176 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
@@ -12,7 +12,7 @@ public:
std::string getOutput();
private:
- BasicSimulationInfo() {};
+ BasicSimulationInfo() = default;
BasicSimulationInfo(int numberOfTimeSteps, double viscosity, int basicTimeStepLength, std::string kernel);
int numberOfTimeSteps;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
index 6c035169a8d74cd51aa0e94281b2f01bf3b4fc33..b234c86551603df780613da31b07aa5836f528d0 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
@@ -1,11 +1,12 @@
#ifndef LOGFILE_INFORMATION_H
#define LOGFILE_INFORMATION_H
-#include <iostream>
+#include <string>
class LogFileInformation
{
public:
+ virtual ~LogFileInformation() = default;
virtual std::string getOutput() = 0;
private:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
index 83c4cff969f8910cabdd4ef4f57c8ef3f8fe8925..c89decfe90014d2090a6d9a89ec3b8d79d49ce8d 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
@@ -8,6 +8,7 @@
class LogFileInformationImp : public LogFileInformation
{
public:
+ LogFileInformationImp() = default;
virtual std::string getOutput() = 0;
protected:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h
index ce72f8f124a1273e9c2124e2ea30b9a055237733..45a41cc1f43eae3d1fa6fb17457b77a83826e7d6 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h
@@ -9,6 +9,7 @@
class SimulationLogFileInformation : public LogFileInformationImp
{
public:
+ virtual ~SimulationLogFileInformation() = default;
virtual std::string getOutput() = 0;
virtual std::vector<std::string> getFilePathExtension() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h
index cb8c413d13769551ef2b9c23592d02f03f14c291..013d553901a93328fbd5f44c0b035ecd24b49d3e 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h
@@ -1,13 +1,10 @@
#ifndef LOGFILE_QUEUE_H
#define LOGFILE_QUEUE_H
-#include <memory>
-
-class LogFileWriter;
-
class LogFileQueue
{
public:
+ virtual ~LogFileQueue() = default;
virtual void writeLogFiles() = 0;
private:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp
index 9decb8a93ccaa3bf8e1b198bb646f4f499ada72f..fa6b0b2b5a6c7e296dd4dc3b9034c027c416cbc5 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp
@@ -13,7 +13,7 @@ std::shared_ptr<LogFileQueueImp> LogFileQueueImp::getNewInstance(std::string bas
void LogFileQueueImp::writeLogFiles()
{
- for (int i = 0; i < logFileWriter.size(); i++){
+ for (uint i = 0; i < logFileWriter.size(); i++){
logFileWriter.at(i)->writeLogFile(basicLogFilePath);
}
}
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h
index 3fe27faeb0d8f48bf087c76fb8c57c36cb0a4bb1..133924382995d2a91abfbb51185bccdd7fe33e63 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h
@@ -5,17 +5,20 @@
#include <string>
#include <vector>
+#include <memory>
+
+class LogFileWriter;
class LogFileQueueImp : public LogFileQueue
{
public:
static std::shared_ptr<LogFileQueueImp> getNewInstance(std::string basicLogFilePath);
- void writeLogFiles();
+ void writeLogFiles() override;
void addLogFileWriter(std::shared_ptr<LogFileWriter> aLogFileWriter);
private:
- LogFileQueueImp() {};
+ LogFileQueueImp() = default;
LogFileQueueImp(std::string basicLogFilePath);
std::string calcDateAndTime();
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
index d828256c677e1fece336845de68fb1fc3d3868df..396deec9d1a771fd74e9ca7f3e23910a6c9c7fcb 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
@@ -6,6 +6,7 @@
class LogFileWriter
{
public:
+ virtual ~LogFileWriter() = default;
virtual void writeLogFile(std::string basicFilePath) = 0;
private:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h
index b5facb26a1dd1e2e0439a415fae2c692340449fe..d21deb7bda97df58830ec9f4dc3dcb8445915911 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h
@@ -12,6 +12,7 @@ class LogFileQueue;
class NumericalTestFactory
{
public:
+ virtual ~NumericalTestFactory() = default;
virtual std::vector<std::shared_ptr<TestSimulation> > getTestSimulations() = 0;
virtual std::shared_ptr<TestQueue> getTestQueue() = 0;
virtual std::shared_ptr<LogFileQueue> getLogFileQueue() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
index 1d9b33d357406de2e94c6eb7f2ef9a570ce59e21..ff9753a4afde382e48fc8d07a8763f26f4c6b23d 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
@@ -93,7 +93,7 @@ private:
int simID;
int numberOfSimulations;
- int simPerKernel, numberOfTestGroupsBetweenKernels, numberOfTestsForOneSimulation, numberOfTestsBetweenKernels;
- int posBasicSimulationForL2Test, posDivergentSimulationForL2Test;
+ // int simPerKernel, numberOfTestGroupsBetweenKernels, numberOfTestsForOneSimulation, numberOfTestsBetweenKernels;
+ // int posBasicSimulationForL2Test, posDivergentSimulationForL2Test;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.cpp b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.cpp
index cdf82c32ef982dec19df49ae347e5601017a538b..b0368e4e4215aca06cda79faf47403d7a2650f8d 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.cpp
@@ -13,7 +13,7 @@ std::shared_ptr<NumericalTestGridReader> NumericalTestGridReader::getNewInstance
return std::shared_ptr<NumericalTestGridReader>(new NumericalTestGridReader(para, initialCondition, cudaManager));
}
-void NumericalTestGridReader::setInitalNodeValues(uint numberOfNodes, int level) const
+void NumericalTestGridReader::setInitialNodeValues(uint numberOfNodes, int level) const
{
initialCondition->init(level);
for (uint j = 0; j <= numberOfNodes; j++){
diff --git a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.h
index 84f5d72705db06349f0b31a42eb99ded45bb0e1d..99363655817874672eaf5b898fb087cb20effb02 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.h
@@ -13,7 +13,7 @@ public:
static std::shared_ptr<NumericalTestGridReader> getNewInstance(std::shared_ptr<Parameter> para, std::shared_ptr<InitialCondition> initialCondition, std::shared_ptr<CudaMemoryManager> cudaManager);
protected:
- virtual void setInitalNodeValues(uint numberOfNodes, int level) const override;
+ virtual void setInitialNodeValues(uint numberOfNodes, int level) const override;
private:
NumericalTestGridReader(std::shared_ptr<Parameter> para, std::shared_ptr<InitialCondition> initialCondition, std::shared_ptr<CudaMemoryManager> cudaManager);
diff --git a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h
index b3835c11bf101c3a0e10beddba0095d0f1f0bef3..0e3c9fcb23964922b8ed155a89ca8c3504aa67fc 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h
@@ -10,6 +10,7 @@ enum SimulationStatus { initialized , executed, crashed};
class NumericalTestSimulation
{
public:
+ virtual ~NumericalTestSimulation() = default;
virtual void run() = 0;
virtual SimulationStatus getSimulationStatus() = 0;
virtual void registerSimulationObserver(std::shared_ptr<SimulationObserver> simObserver) = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h b/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h
index 686c2300e75257717820b6bb97554b37493d46e3..e995bd4de187da87bce2cc987ac460138e3ffcb8 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h
@@ -10,6 +10,7 @@ class SimulationResults;
class PostProcessingStrategy
{
public:
+ virtual ~PostProcessingStrategy() = default;
virtual void evaluate() = 0;
};
#endif
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h b/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h
index 7ed53fce60606e8a91b52330cb87822207f36f94..979c57ec3a2fd2bc26f85d07db06e31169b5aa7a 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h
@@ -10,6 +10,7 @@ class SimulationResults;
class AnalyticalResults : public ResultsImp
{
public:
+ virtual ~AnalyticalResults() = default;
virtual void calc(std::shared_ptr<SimulationResults> simResults) = 0;
virtual bool isCalculated() = 0;
};
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Results/Results.h b/apps/gpu/tests/NumericalTests/Utilities/Results/Results.h
index 264831a96b1df5cf212b033f2a8dc2acfb03ae5a..3744bf591d98769cee398fcfde78dac1d14737ae 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Results/Results.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Results/Results.h
@@ -6,6 +6,7 @@
class Results
{
public:
+ virtual ~Results() = default;
virtual int getNumberOfTimeSteps() = 0;
virtual std::vector<std::vector<double> > getVx() = 0;
virtual std::vector<std::vector<double> > getVy() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h b/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
index cd0c29e9c41765b3c877fb4830d66d41f5c98ee7..aa49cba4875a6ad2090cdd715da9971b6bec8967 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
@@ -10,6 +10,7 @@ class TimeInfo;
class SimulationInfo
{
public:
+ virtual ~SimulationInfo() = default;
virtual std::string getKernelName() = 0;
virtual double getViscosity() = 0;
virtual std::string getSimulationName() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h b/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h
index b9ca9b2e332f4a7f3a79ca0ffae65f621b942230..7de661ce17d681c88fdeef50aebb56ce9af36202 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h
@@ -11,6 +11,7 @@ class KernelConfiguration;
class SimulationParameter
{
public:
+ virtual ~SimulationParameter() = default;
virtual std::shared_ptr<KernelConfiguration> getKernelConfiguration() = 0;
virtual double getViscosity() = 0;
virtual std::string getGridPath() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h b/apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h
index 9cf022b558255ee2dbb3862caf78ccea8c0e1873..ac579cdc97015c16b5bb8cf27ae664c82aa86655 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h
@@ -4,6 +4,7 @@
class SimulationObserver
{
public:
+ virtual ~SimulationObserver() = default;
virtual void update() = 0;
};
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Test/Test.h b/apps/gpu/tests/NumericalTests/Utilities/Test/Test.h
index c5809671330d2ac5a32f13f3db0d6d3690f06b6f..994bf272eeae9c1d93f15748def233fa0672812c 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Test/Test.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Test/Test.h
@@ -10,8 +10,8 @@
class Test : public SimulationObserver
{
public:
+ virtual ~Test() = default;
virtual void run() = 0;
- virtual void update() = 0;
virtual TestStatus getTestStatus() = 0;
virtual void makeConsoleOutput() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h b/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h
index f4fc758ec75f3c0e12b79faf2efb74a2e749e00e..06c2b3013e22f9de7280dc42b86ad2c1974b1b40 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h
@@ -16,9 +16,9 @@ class TestImp : public Test
{
public:
void run() override;
- void update();
- TestStatus getTestStatus();
- virtual void makeConsoleOutput();
+ void update() override;
+ TestStatus getTestStatus() override;
+ void makeConsoleOutput() override;
void addSimulation(std::shared_ptr<NumericalTestSimulation> sim, std::shared_ptr<SimulationInfo> simInfo, std::shared_ptr<PostProcessingStrategy> postProStrategy);
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h
index dcc0ece599e45539fd1416b3cd06bb67576a915a..736146d5a9aa3ce295e661fcd0bd3340f0a56ad0 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h
@@ -6,6 +6,7 @@ enum TestSuiteResult { PASSED, FAILED };
class TestQueue
{
public:
+ virtual ~TestQueue() = default;
virtual TestSuiteResult run() = 0;
virtual void makeFinalOutput() = 0;
virtual int getNumberOfFailedTests() const noexcept = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp
index c7ceef408bcc7d098810aa0f8fd82498902ee211..f55b932bf8f55b3bbab7983a17646b0826484915 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp
@@ -6,7 +6,7 @@
TestSuiteResult TestQueueImp::run()
{
- for (const auto test : tests)
+ for (const auto& test : tests)
test->run();
makeFinalOutput();
@@ -19,7 +19,7 @@ void TestQueueImp::makeFinalOutput()
calcTestNumbers();
colorOutput->makeFinalTestOutputHead(numberOfTests, numberOfExecutedTest, numberOfPassedTest, numberOfFailedTest,
numberOfErrorTest, numberOfNotExecutedTest);
- for (int i = 0; i < tests.size(); i++)
+ for (uint i = 0; i < tests.size(); i++)
tests.at(i)->makeConsoleOutput();
colorOutput->makeFinalTestOutputFoot(numberOfTests, numberOfExecutedTest, numberOfPassedTest, numberOfFailedTest,
numberOfErrorTest, numberOfNotExecutedTest);
@@ -54,7 +54,7 @@ void TestQueueImp::calcTestNumbers()
numberOfErrorTest = 0;
numberOfNotExecutedTest = 0;
- for (int i = 0; i < tests.size(); i++) {
+ for (uint i = 0; i < tests.size(); i++) {
switch (tests.at(i)->getTestStatus()) {
case passed:
numberOfPassedTest++;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h
index 89952773f810a983d34f9e35e9508e9d0d7e3ce3..386b5805fb1ff7068ee75e764d6374f2e2fda767 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h
@@ -13,7 +13,7 @@ class TestQueueImp : public TestQueue
{
public:
TestSuiteResult run() override;
- void makeFinalOutput();
+ void makeFinalOutput() override;
int getNumberOfFailedTests() const noexcept override;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h
index 729ca06a3a57bfc1202d4f93728a68b18a57f8db..1f356304f05b1d08a52ed8c1842959af8f2965c1 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h
@@ -15,6 +15,7 @@ class Parameter;
class TestSimulation
{
public:
+ virtual ~TestSimulation() = default;
virtual void run() = 0;
virtual void makeSimulationHeadOutput() = 0;
virtual void startPostProcessing() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
index dc4aca9b35b0bea92b3d8e3e5b07cb8ed3e054d5..2dd40ef77149c408e3f8ded6f3a7349761fa3a0b 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
@@ -87,7 +87,7 @@ std::vector<std::string> TestSimulationImp::getDataToCalcTests()
void TestSimulationImp::notifyObserver()
{
- for (int i = 0; i < simObserver.size(); i++)
+ for (uint i = 0; i < simObserver.size(); i++)
simObserver.at(i)->update();
}
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h
index b876cb079f241226bbb3455f7b4bc97b80039131..2a36fda25912ea15f2ee5a8b64d6fe0f7a982180 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h
@@ -5,7 +5,7 @@
#include "Utilities/NumericalTestSimulation/NumericalTestSimulation.h"
#include <functional>
-#include <time.h>
+#include <ctime>
#include <vector>
class ToVectorWriter;
@@ -28,20 +28,20 @@ public:
std::shared_ptr<ColorConsoleOutput> colorOutput);
void run() override;
- std::shared_ptr<SimulationParameter> getSimulationParameter();
+ std::shared_ptr<SimulationParameter> getSimulationParameter() override;
std::shared_ptr<SimulationInfo> getSimulationInfo();
- std::shared_ptr<TimeTracking> getTimeTracking();
+ std::shared_ptr<TimeTracking> getTimeTracking() override;
- SimulationStatus getSimulationStatus();
+ SimulationStatus getSimulationStatus() override;
- void makeSimulationHeadOutput();
- void startPostProcessing();
+ void makeSimulationHeadOutput() override;
+ void startPostProcessing() override;
- void setParameter(std::shared_ptr<Parameter> para);
+ void setParameter(std::shared_ptr<Parameter> para) override;
std::shared_ptr<SimulationResults> getSimulationResults();
std::shared_ptr<AnalyticalResults> getAnalyticalResults();
- void registerSimulationObserver(std::shared_ptr<SimulationObserver> simObserver);
+ void registerSimulationObserver(std::shared_ptr<SimulationObserver> simObserver) override;
std::vector<std::string> getDataToCalcTests();
private:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h
index 87e14e74fb08f6e7f0ceba7923e3adf4db39d455..f6f6c39ef9e641c67af5ae8a7c5af220f68c7c66 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h
@@ -5,26 +5,26 @@
#include "TimeTracking.h"
#include <memory>
-#include <time.h>
+#include <ctime>
class TimeImp : public TimeTracking, public TimeInfo
{
public:
static std::shared_ptr<TimeImp> getNewInstance();
- void setSimulationStartTime();
- void setSimulationEndTime();
- void setTestStartTime();
- void setTestEndTime();
- void setAnalyticalResultWriteStartTime();
- void setAnalyticalResultWriteEndTime();
- void setResultCheckStartTime();
- void setResultCheckEndTime();
+ void setSimulationStartTime() override;
+ void setSimulationEndTime() override;
+ void setTestStartTime() override;
+ void setTestEndTime() override;
+ void setAnalyticalResultWriteStartTime() override;
+ void setAnalyticalResultWriteEndTime() override;
+ void setResultCheckStartTime() override;
+ void setResultCheckEndTime() override;
- std::string getSimulationTime();
- std::string getResultCheckTime();
- std::string getTestTime();
- std::string getAnalyticalResultWriteTime();
+ std::string getSimulationTime() override;
+ std::string getResultCheckTime() override;
+ std::string getTestTime() override;
+ std::string getAnalyticalResultWriteTime() override;
private:
TimeImp();
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h
index 11e49b28406ecf08f83f13cfc5cbe09c3ebd8a84..02cf14c5c6db3de64595e58e51acf6771baa1e21 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h
@@ -6,9 +6,10 @@
class TimeInfo
{
public:
- virtual std::string getSimulationTime() = 0;
- virtual std::string getResultCheckTime() = 0;
- virtual std::string getTestTime() = 0;
- virtual std::string getAnalyticalResultWriteTime() = 0;
+ virtual ~TimeInfo() = default;
+ virtual std::string getSimulationTime() = 0;
+ virtual std::string getResultCheckTime() = 0;
+ virtual std::string getTestTime() = 0;
+ virtual std::string getAnalyticalResultWriteTime() = 0;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h
index 736ca764116934dc31e18d7d7c910ead554b253b..663456d6a2c0d428f23a373448ac3c93ad19067f 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h
@@ -4,6 +4,7 @@
class TimeTracking
{
public:
+ virtual ~TimeTracking() = default;
virtual void setSimulationStartTime() = 0;
virtual void setSimulationEndTime() = 0;
@@ -16,4 +17,4 @@ public:
virtual void setAnalyticalResultWriteStartTime() = 0;
virtual void setAnalyticalResultWriteEndTime() = 0;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactory.cpp b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactory.cpp
index 23bcb582dd863acd813519eed4ec1402105c3618..3564f65025a38d37c577b6ea6a882e6f48fd1e65 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactory.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactory.cpp
@@ -9,7 +9,7 @@
#include "VirtualFluids_GPU/Parameter/Parameter.h"
#include "VirtualFluids_GPU/Factories/BoundaryConditionFactory.h"
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "VirtualFluids_GPU/LBM/Simulation.h"
std::shared_ptr<Parameter> vf::gpu::tests::makeParameter(std::shared_ptr<SimulationParameter> simPara)
@@ -120,7 +120,7 @@ const std::function<void()> vf::gpu::tests::makeVirtualFluidSimulation(std::shar
auto grid = makeGridReader(condition, para, cudaManager);
BoundaryConditionFactory bc_factory;
auto simulation =
- std::make_shared<Simulation>(para, cudaManager, vf::gpu::Communicator::getInstance(), *grid.get(), &bc_factory);
+ std::make_shared<Simulation>(para, cudaManager, vf::gpu::MpiCommunicator::getInstance(), *grid.get(), &bc_factory);
simulation->setDataWriter(dataWriter);
return [simulation]() { simulation->run(); };
diff --git a/pyproject.toml b/pyproject.toml
index 257da6fd95d683081dbff865c864079eae9c675d..df0b13b9c22718ef4172d4698fd29b8e85f0ad22 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,9 +1,46 @@
[build-system]
-requires = [
- "setuptools>=42",
- "scikit-build",
- "cmake",
- "ninja; platform_system!='Windows'"
+requires = ["scikit-build-core"]
+build-backend = "scikit_build_core.build"
+
+[project]
+name = "pyfluids"
+version = "0.1.0"
+description = "Python bindings for VirtualFluids"
+readme = "README.md"
+requires-python = ">=3.6"
+classifiers = [
+ "Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.6",
+ "Programming Language :: Python :: 3.7",
+ "Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
]
-build-backend = "setup_builder"
-backend-path = ["utilities"]
\ No newline at end of file
+url = "https://git.rz.tu-bs.de/irmb/virtualfluids"
+
+[tool.cmake]
+jobs = 8
+
+[tool.scikit-build]
+build-dir = "build"
+strict-config = true
+logging.level = "INFO"
+
+[tool.scikit-build.wheel]
+packages = ["pythonbindings/pyfluids", "pythonbindings/pyfluids-stubs", "pythonbindings/pymuparser"]
+
+[tool.scikit_build.cmake]
+verbose = true
+build-type = "Release"
+
+[tool.scikit-build.cmake.define]
+BUILD_VF_PYTHON_BINDINGS = "ON"
+BUILD_SHARED_LIBS = "OFF"
+BUILD_VF_UNIT_TESTS = "OFF"
+BUILD_WARNINGS_AS_ERRORS = "OFF"
+
+
+[mypy]
+plugins = "numpy.typing.mypy_plugin"
+
diff --git a/pythonbindings/CMakeLists.txt b/pythonbindings/CMakeLists.txt
index 037b68baf53d5da8a1ccd20155cb0e7be483176b..c9bef9ef080e6e995b903837475f7c2e401152ee 100644
--- a/pythonbindings/CMakeLists.txt
+++ b/pythonbindings/CMakeLists.txt
@@ -6,27 +6,78 @@ endif()
project(VirtualFluidsPython LANGUAGES ${PYFLUIDS_LANGUAGES})
-pybind11_add_module(python_bindings MODULE src/VirtualFluids.cpp)
-target_compile_definitions(python_bindings PUBLIC VF_DOUBLE_ACCURACY)
+add_custom_target(python_bindings)
-set_target_properties( python_bindings PROPERTIES
- LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/pythonbindings/pyfluids
- OUTPUT_NAME "bindings")
+set(PYFLUIDS_DIR ${SKBUILD_PLATLIB_DIR}/pyfluids)
+set(PYMUPRASER_DIR ${SKBUILD_PLATLIB_DIR}/pymuparser)
+
+
+pybind11_add_module(basics_bindings MODULE src/basics/basics.cpp)
+set_target_properties( basics_bindings PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${PYFLUIDS_DIR}
+ OUTPUT_NAME "basics")
+target_link_libraries(basics_bindings PRIVATE basics)
+target_include_directories(basics_bindings PRIVATE ${CMAKE_SOURCE_DIR}/src/)
+target_include_directories(basics_bindings PRIVATE ${CMAKE_BINARY_DIR})
+add_dependencies(python_bindings basics_bindings)
+
+
+pybind11_add_module(logger_bindings MODULE src/logger.cpp)
+set_target_properties( logger_bindings PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${PYFLUIDS_DIR}
+ OUTPUT_NAME "logger")
+target_link_libraries(logger_bindings PRIVATE logger)
+target_include_directories(logger_bindings PRIVATE ${CMAKE_SOURCE_DIR}/src/)
+target_include_directories(logger_bindings PRIVATE ${CMAKE_BINARY_DIR})
+add_dependencies(python_bindings logger_bindings)
+
+
+pybind11_add_module(lbm_bindings MODULE src/lbm.cpp)
+set_target_properties( lbm_bindings PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${PYFLUIDS_DIR}
+ OUTPUT_NAME "lbm")
+target_link_libraries(lbm_bindings PRIVATE lbm)
+target_include_directories(lbm_bindings PRIVATE ${CMAKE_SOURCE_DIR}/src/)
+target_include_directories(lbm_bindings PRIVATE ${CMAKE_BINARY_DIR})
+add_dependencies(python_bindings lbm_bindings)
-target_link_libraries(python_bindings PRIVATE basics logger mpi lbm)
IF(BUILD_VF_GPU)
- set_source_files_properties(src/VirtualFluids.cpp PROPERTIES LANGUAGE CUDA)
+ pybind11_add_module(gpu_bindings MODULE src/gpu/gpu.cpp)
+ set_target_properties( gpu_bindings PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${PYFLUIDS_DIR}
+ OUTPUT_NAME "gpu")
+ target_link_libraries(gpu_bindings PRIVATE basics)
+ set_source_files_properties(src/gpu/gpu.cpp PROPERTIES LANGUAGE CUDA)
+
+ target_include_directories(gpu_bindings PRIVATE ${VF_THIRD_DIR}/cuda_samples/)
- target_include_directories(python_bindings PRIVATE ${VF_THIRD_DIR}/cuda_samples/)
- target_compile_definitions(python_bindings PRIVATE VF_GPU_PYTHONBINDINGS)
+ target_link_libraries(gpu_bindings PRIVATE GridGenerator VirtualFluids_GPU)
+
+ target_include_directories(gpu_bindings PRIVATE ${CMAKE_SOURCE_DIR}/src/)
+ target_include_directories(gpu_bindings PRIVATE ${CMAKE_BINARY_DIR})
+ add_dependencies(python_bindings gpu_bindings)
- target_link_libraries(python_bindings PRIVATE GridGenerator VirtualFluids_GPU)
ENDIF()
IF(BUILD_VF_CPU)
- target_compile_definitions(python_bindings PRIVATE VF_METIS VF_MPI VF_CPU_PYTHONBINDINGS)
- target_link_libraries(python_bindings PRIVATE simulationconfig VirtualFluidsCore muparser)
+ pybind11_add_module(cpu_bindings MODULE src/cpu/cpu.cpp)
+ set_target_properties( cpu_bindings PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${PYFLUIDS_DIR}
+ OUTPUT_NAME "cpu")
+ target_link_libraries(cpu_bindings PRIVATE simulationconfig VirtualFluidsCore muparser)
+
+ target_include_directories(cpu_bindings PRIVATE ${CMAKE_SOURCE_DIR}/src/)
+ target_include_directories(cpu_bindings PRIVATE ${CMAKE_BINARY_DIR})
+
+ target_compile_definitions(cpu_bindings PUBLIC VF_DOUBLE_ACCURACY) # TODO: remove this and always set it dynamically
+ target_compile_definitions(basics_bindings PUBLIC VF_DOUBLE_ACCURACY)
+ target_compile_definitions(logger_bindings PUBLIC VF_DOUBLE_ACCURACY)
+ target_compile_definitions(lbm_bindings PUBLIC VF_DOUBLE_ACCURACY)
+
+ target_compile_definitions(cpu_bindings PRIVATE VF_METIS VF_MPI)
+ add_dependencies(python_bindings cpu_bindings)
+
# include bindings for muparsers
pybind11_add_module(pymuparser MODULE src/muParser.cpp)
@@ -40,7 +91,3 @@ IF(BUILD_VF_CPU)
target_compile_definitions(pymuparser PRIVATE VF_METIS VF_MPI)
target_link_libraries(pymuparser PRIVATE muparser)
ENDIF()
-
-
-target_include_directories(python_bindings PRIVATE ${CMAKE_SOURCE_DIR}/src/)
-target_include_directories(python_bindings PRIVATE ${CMAKE_BINARY_DIR})
\ No newline at end of file
diff --git a/pythonbindings/pyfluids-stubs/__init__.pyi b/pythonbindings/pyfluids-stubs/__init__.pyi
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..df0d398713cd56ef06bf96637d3aca0f6032dc58 100644
--- a/pythonbindings/pyfluids-stubs/__init__.pyi
+++ b/pythonbindings/pyfluids-stubs/__init__.pyi
@@ -0,0 +1,6 @@
+from . import basics as basics
+from . import logger as logger
+from . import lbm as lbm
+from . import gpu as gpu
+from . import cpu as cpu
+
diff --git a/pythonbindings/pyfluids-stubs/bindings/basics/__init__.pyi b/pythonbindings/pyfluids-stubs/basics/__init__.pyi
similarity index 95%
rename from pythonbindings/pyfluids-stubs/bindings/basics/__init__.pyi
rename to pythonbindings/pyfluids-stubs/basics/__init__.pyi
index a646f7e590e2aba91ab1c367f75b8c6ebe8f79ae..ed74e648a0b6739b31853c9633d63eeac3b91df4 100644
--- a/pythonbindings/pyfluids-stubs/bindings/basics/__init__.pyi
+++ b/pythonbindings/pyfluids-stubs/basics/__init__.pyi
@@ -32,10 +32,13 @@ r"""
! \author Henry Korb
=======================================================================================
"""
-from typing import ClassVar
+from __future__ import annotations
-from typing import overload
+from typing import ClassVar, overload
+from . import logger as logger
+
+from pyfluids.bindings.basics import logger as logger
class ConfigurationFile:
def __init__(self) -> None: ...
def contains(self, key: str) -> bool: ...
diff --git a/pythonbindings/pyfluids-stubs/bindings/__init__.pyi b/pythonbindings/pyfluids-stubs/bindings/__init__.pyi
deleted file mode 100644
index 4e7f353eab97cc536f8f18e72319af1cd7a1916a..0000000000000000000000000000000000000000
--- a/pythonbindings/pyfluids-stubs/bindings/__init__.pyi
+++ /dev/null
@@ -1,38 +0,0 @@
-r"""
-=======================================================================================
- ____ ____ __ ______ __________ __ __ __ __
- \ \ | | | | | _ \ |___ ___| | | | | / \ | |
- \ \ | | | | | |_) | | | | | | | / \ | |
- \ \ | | | | | _ / | | | | | | / /\ \ | |
- \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
- \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
- \ \ | | ________________________________________________________________
- \ \ | | | ______________________________________________________________|
- \ \| | | | __ __ __ __ ______ _______
- \ | | |_____ | | | | | | | | | _ \ / _____)
- \ | | _____| | | | | | | | | | | \ \ \_______
- \ | | | | |_____ | \_/ | | | | |_/ / _____ |
- \ _____| |__| |________| \_______/ |__| |______/ (_______/
-
- This file is part of VirtualFluids. VirtualFluids is free software: you can
- redistribute it and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
-
- VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License along
- with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-
-! \file __init__.pyi
-! \ingroup bindings
-! \author Henry Korb
-=======================================================================================
-"""
-class ostream_redirect:
- def __init__(self, stdout: bool = ..., stderr: bool = ...) -> None: ...
- def __enter__(self) -> None: ...
- def __exit__(self, *args) -> None: ...
diff --git a/pythonbindings/pyfluids-stubs/bindings/lbm.pyi b/pythonbindings/pyfluids-stubs/bindings/lbm.pyi
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi b/pythonbindings/pyfluids-stubs/gpu/__init__.pyi
similarity index 81%
rename from pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi
rename to pythonbindings/pyfluids-stubs/gpu/__init__.pyi
index 36c2fea76713e980bb95eb6726d778de8c9a6583..cc6e3906477e5206a7d3be159cda15909aa1ba68 100644
--- a/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi
+++ b/pythonbindings/pyfluids-stubs/gpu/__init__.pyi
@@ -32,77 +32,88 @@ r"""
! \author Henry Korb
=======================================================================================
"""
-from typing import Any, Callable, ClassVar, List, Optional
+from __future__ import annotations
+from typing import Callable, ClassVar, List, Optional
-from typing import overload
-import numpy
-import pyfluids.bindings.basics
-import pyfluids.bindings.gpu.grid_generator as grid_generator
+from typing import overload, Union
+import numpy as np
+import numpy.typing as npt
+import basics
+
+from . import grid_generator as grid_generator
+from . import probes as probes
+
+class PreCollisionInteractor:
+ def __init__(self, *args, **kwargs) -> None: ...
+
+
+class FileCollection:
+ def __init__(self, *args, **kwargs) -> None: ...
class ActuatorFarm(PreCollisionInteractor):
def __init__(self, number_of_blades_per_turbine: int, density: float, number_of_nodes_per_blade: int, epsilon: float, level: int, delta_t: float, delta_x: float, use_host_arrays: bool) -> None: ...
def add_turbine(self, posX: float, posY: float, posZ: float, diameter: float, omega: float, azimuth: float, yaw: float, bladeRadii: List[float]) -> None: ...
def calc_blade_forces(self) -> None: ...
- def get_all_azimuths(self) -> numpy.ndarray[numpy.float32]: ...
- def get_all_blade_coords_x(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_azimuths(self) -> npt.NDArray[np.float32]: ...
+ def get_all_blade_coords_x(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_coords_x_device(self) -> int: ...
- def get_all_blade_coords_y(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_blade_coords_y(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_coords_y_device(self) -> int: ...
- def get_all_blade_coords_z(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_blade_coords_z(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_coords_z_device(self) -> int: ...
- def get_all_blade_forces_x(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_blade_forces_x(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_forces_x_device(self) -> int: ...
- def get_all_blade_forces_y(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_blade_forces_y(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_forces_y_device(self) -> int: ...
- def get_all_blade_forces_z(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_blade_forces_z(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_forces_z_device(self) -> int: ...
- def get_all_blade_radii(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_blade_radii(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_radii_device(self) -> int: ...
- def get_all_blade_velocities_x(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_blade_velocities_x(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_velocities_x_device(self) -> int: ...
- def get_all_blade_velocities_y(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_blade_velocities_y(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_velocities_y_device(self) -> int: ...
- def get_all_blade_velocities_z(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_blade_velocities_z(self) -> npt.NDArray[np.float32]: ...
def get_all_blade_velocities_z_device(self) -> int: ...
- def get_all_omegas(self) -> numpy.ndarray[numpy.float32]: ...
- def get_all_turbine_pos_x(self) -> numpy.ndarray[numpy.float32]: ...
- def get_all_turbine_pos_y(self) -> numpy.ndarray[numpy.float32]: ...
- def get_all_turbine_pos_z(self) -> numpy.ndarray[numpy.float32]: ...
- def get_all_yaws(self) -> numpy.ndarray[numpy.float32]: ...
+ def get_all_omegas(self) -> npt.NDArray[np.float32]: ...
+ def get_all_turbine_pos_x(self) -> npt.NDArray[np.float32]: ...
+ def get_all_turbine_pos_y(self) -> npt.NDArray[np.float32]: ...
+ def get_all_turbine_pos_z(self) -> npt.NDArray[np.float32]: ...
+ def get_all_yaws(self) -> npt.NDArray[np.float32]: ...
def get_turbine_azimuth(self, turbine: int) -> float: ...
- def get_turbine_blade_coords_x(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_coords_x(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_coords_x_device(self, turbine: int) -> int: ...
- def get_turbine_blade_coords_y(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_coords_y(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_coords_y_device(self, turbine: int) -> int: ...
- def get_turbine_blade_coords_z(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_coords_z(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_coords_z_device(self, turbine: int) -> int: ...
- def get_turbine_blade_forces_x(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_forces_x(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_forces_x_device(self, turbine: int) -> int: ...
- def get_turbine_blade_forces_y(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_forces_y(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_forces_y_device(self, turbine: int) -> int: ...
- def get_turbine_blade_forces_z(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_forces_z(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_forces_z_device(self, turbine: int) -> int: ...
- def get_turbine_blade_radii(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_radii(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_radii_device(self, turbine: int) -> int: ...
- def get_turbine_blade_velocities_x(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_velocities_x(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_velocities_x_device(self, turbine: int) -> int: ...
- def get_turbine_blade_velocities_y(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_velocities_y(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_velocities_y_device(self, turbine: int) -> int: ...
- def get_turbine_blade_velocities_z(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_blade_velocities_z(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_blade_velocities_z_device(self, turbine: int) -> int: ...
def get_turbine_omega(self, turbine: int) -> float: ...
- def get_turbine_pos(self, turbine: int) -> numpy.ndarray[numpy.float32]: ...
+ def get_turbine_pos(self, turbine: int) -> npt.NDArray[np.float32]: ...
def get_turbine_yaw(self, turbine: int) -> float: ...
- def set_all_azimuths(self, azimuths: numpy.ndarray[numpy.float32]) -> None: ...
- def set_all_blade_coords(self, blade_coords_x: numpy.ndarray[numpy.float32], blade_coords_y: numpy.ndarray[numpy.float32], blade_coords_z: numpy.ndarray[numpy.float32]) -> None: ...
- def set_all_blade_forces(self, blade_forces_x: numpy.ndarray[numpy.float32], blade_forces_y: numpy.ndarray[numpy.float32], blade_forces_z: numpy.ndarray[numpy.float32]) -> None: ...
- def set_all_blade_velocities(self, blade_velocities_x: numpy.ndarray[numpy.float32], blade_velocities_y: numpy.ndarray[numpy.float32], blade_velocities_z: numpy.ndarray[numpy.float32]) -> None: ...
- def set_all_omegas(self, omegas: numpy.ndarray[numpy.float32]) -> None: ...
- def set_all_yaws(self, yaws: numpy.ndarray[numpy.float32]) -> None: ...
+ def set_all_azimuths(self, azimuths: npt.NDArray[np.float32]) -> None: ...
+ def set_all_blade_coords(self, blade_coords_x: npt.NDArray[np.float32], blade_coords_y: npt.NDArray[np.float32], blade_coords_z: npt.NDArray[np.float32]) -> None: ...
+ def set_all_blade_forces(self, blade_forces_x: npt.NDArray[np.float32], blade_forces_y: npt.NDArray[np.float32], blade_forces_z: npt.NDArray[np.float32]) -> None: ...
+ def set_all_blade_velocities(self, blade_velocities_x: npt.NDArray[np.float32], blade_velocities_y: npt.NDArray[np.float32], blade_velocities_z: npt.NDArray[np.float32]) -> None: ...
+ def set_all_omegas(self, omegas: npt.NDArray[np.float32]) -> None: ...
+ def set_all_yaws(self, yaws: npt.NDArray[np.float32]) -> None: ...
def set_turbine_azimuth(self, turbine: int, azimuth: float) -> None: ...
- def set_turbine_blade_coords(self, turbine: int, blade_coords_x: numpy.ndarray[numpy.float32], blade_coords_y: numpy.ndarray[numpy.float32], blade_coords_z: numpy.ndarray[numpy.float32]) -> None: ...
- def set_turbine_blade_forces(self, turbine: int, blade_forces_x: numpy.ndarray[numpy.float32], blade_forces_y: numpy.ndarray[numpy.float32], blade_forces_z: numpy.ndarray[numpy.float32]) -> None: ...
- def set_turbine_blade_velocities(self, turbine: int, blade_velocities_x: numpy.ndarray[numpy.float32], blade_velocities_y: numpy.ndarray[numpy.float32], blade_velocities_z: numpy.ndarray[numpy.float32]) -> None: ...
+ def set_turbine_blade_coords(self, turbine: int, blade_coords_x: npt.NDArray[np.float32], blade_coords_y: npt.NDArray[np.float32], blade_coords_z: npt.NDArray[np.float32]) -> None: ...
+ def set_turbine_blade_forces(self, turbine: int, blade_forces_x: npt.NDArray[np.float32], blade_forces_y: npt.NDArray[np.float32], blade_forces_z: npt.NDArray[np.float32]) -> None: ...
+ def set_turbine_blade_velocities(self, turbine: int, blade_velocities_x: npt.NDArray[np.float32], blade_velocities_y: npt.NDArray[np.float32], blade_velocities_z: npt.NDArray[np.float32]) -> None: ...
def set_turbine_omega(self, turbine: int, omega: float) -> None: ...
def set_turbine_yaw(self, turbine: int, yaw: float) -> None: ...
@property
@@ -116,32 +127,36 @@ class ActuatorFarm(PreCollisionInteractor):
@property
def number_of_indices(self) -> int: ...
@property
- def number_of_nodes(self) -> int: ...
+ def number_of_grid_nodes(self) -> int: ...
@property
def number_of_nodes_per_blade(self) -> int: ...
@property
def number_of_turbines(self) -> int: ...
+
class BoundaryConditionFactory:
def __init__(self) -> None: ...
- def set_geometry_boundary_condition(self, boundary_condition_type) -> None: ...
- def set_no_slip_boundary_condition(self, boundary_condition_type) -> None: ...
- def set_precursor_boundary_condition(self, boundary_condition_type) -> None: ...
- def set_pressure_boundary_condition(self, boundary_condition_type) -> None: ...
- def set_slip_boundary_condition(self, boundary_condition_type) -> None: ...
- def set_stress_boundary_condition(self, boundary_condition_type) -> None: ...
- def set_velocity_boundary_condition(self, boundary_condition_type) -> None: ...
-
-class Communicator:
+ def set_geometry_boundary_condition(self, boundary_condition_type: Union[SlipBC, VelocityBC, NoSlipBC]) -> None: ...
+ def set_no_slip_boundary_condition(self, boundary_condition_type: NoSlipBC) -> None: ...
+ def set_precursor_boundary_condition(self, boundary_condition_type: PrecursorBC) -> None: ...
+ def set_pressure_boundary_condition(self, boundary_condition_type: PressureBC) -> None: ...
+ def set_slip_boundary_condition(self, boundary_condition_type: SlipBC) -> None: ...
+ def set_stress_boundary_condition(self, boundary_condition_type: StressBC) -> None: ...
+ def set_velocity_boundary_condition(self, boundary_condition_type: VelocityBC) -> None: ...
+
+
+class MpiCommunicator:
def __init__(self, *args, **kwargs) -> None: ...
@staticmethod
- def get_instance() -> Communicator: ...
+ def get_instance() -> MpiCommunicator: ...
def get_number_of_process(self) -> int: ...
def get_pid(self) -> int: ...
+
class CudaMemoryManager:
def __init__(self, parameter: Parameter) -> None: ...
+
class FileType:
__members__: ClassVar[dict] = ... # read-only
VTK: ClassVar[FileType] = ...
@@ -157,10 +172,13 @@ class FileType:
@property
def name(self) -> str: ...
+
class GridProvider:
def __init__(self, *args, **kwargs) -> None: ...
@staticmethod
- def make_grid_generator(builder: grid_generator.GridBuilder, para: Parameter, cuda_memory_manager: CudaMemoryManager, communicator: Communicator) -> GridProvider: ...
+ def make_grid_generator(builder: grid_generator.GridBuilder, para: Parameter, cuda_memory_manager: CudaMemoryManager, communicator: MpiCommunicator) -> GridProvider: ...
+
+
class GridScaling:
__members__: ClassVar[dict] = ... # read-only
@@ -179,10 +197,12 @@ class GridScaling:
@property
def name(self) -> str: ...
+
class GridScalingFactory:
def __init__(self) -> None: ...
def set_scaling_factory(self, scaling_type) -> None: ...
+
class NoSlipBC:
__members__: ClassVar[dict] = ... # read-only
NoSlip3rdMomentsCompressible: ClassVar[NoSlipBC] = ...
@@ -202,6 +222,7 @@ class NoSlipBC:
@property
def name(self) -> str: ...
+
class OutputVariable:
__members__: ClassVar[dict] = ... # read-only
Distributions: ClassVar[OutputVariable] = ...
@@ -218,13 +239,14 @@ class OutputVariable:
@property
def name(self) -> str: ...
+
class Parameter:
@overload
- def __init__(self, number_of_processes: int, my_ID: int, config_data: Optional[pyfluids.bindings.basics.ConfigurationFile]) -> None: ...
+ def __init__(self, number_of_processes: int, my_ID: int, config_data: Optional[basics.ConfigurationFile]) -> None: ...
@overload
def __init__(self, number_of_processes: int, my_ID: int) -> None: ...
@overload
- def __init__(self, config_data: pyfluids.bindings.basics.ConfigurationFile) -> None: ...
+ def __init__(self, config_data: basics.ConfigurationFile) -> None: ...
def add_actuator(self, actuator: PreCollisionInteractor) -> None: ...
def add_probe(self, probe: PreCollisionInteractor) -> None: ...
def get_SGS_constant(self) -> float: ...
@@ -245,7 +267,7 @@ class Parameter:
def set_diff_on(self, is_diff: bool) -> None: ...
def set_forcing(self, forcing_x: float, forcing_y: float, forcing_z: float) -> None: ...
def set_has_wall_model_monitor(self, has_wall_monitor: bool) -> None: ...
- def set_initial_condition(self, init_func: Callable[[float,float,float],List[float]]) -> None: ...
+ def set_initial_condition(self, init_func: Callable[[float, float, float], List[float]]) -> None: ...
def set_initial_condition_log_law(self, u_star: float, z0: float, velocity_ratio: float) -> None: ...
def set_initial_condition_perturbed_log_law(self, u_star: float, z0: float, length_x: float, length_z: float, height: float, velocity_ratio: float) -> None: ...
def set_initial_condition_uniform(self, velocity_x: float, velocity_y: float, velocity_z: float) -> None: ...
@@ -270,8 +292,6 @@ class Parameter:
def set_viscosity_LB(self, viscosity: float) -> None: ...
def set_viscosity_ratio(self, viscosity_ratio: float) -> None: ...
-class PreCollisionInteractor:
- def __init__(self, *args, **kwargs) -> None: ...
class PrecursorBC:
__members__: ClassVar[dict] = ... # read-only
@@ -290,9 +310,11 @@ class PrecursorBC:
@property
def name(self) -> str: ...
+
class PrecursorWriter(PreCollisionInteractor):
def __init__(self, filename: str, output_path: str, x_pos: float, y_min: float, y_max: float, z_min: float, z_max: float, t_start_out: int, t_save: int, output_variable: OutputVariable, max_timesteps_per_file: int) -> None: ...
+
class PressureBC:
__members__: ClassVar[dict] = ... # read-only
NotSpecified: ClassVar[PressureBC] = ...
@@ -314,6 +336,7 @@ class PressureBC:
@property
def name(self) -> str: ...
+
class SideType:
__members__: ClassVar[dict] = ... # read-only
GEOMETRY: ClassVar[SideType] = ...
@@ -335,6 +358,7 @@ class SideType:
@property
def name(self) -> str: ...
+
class Simulation:
@overload
def __init__(self, parameter: Parameter, memoryManager: CudaMemoryManager, communicator, gridProvider: GridProvider, bcFactory: BoundaryConditionFactory, gridScalingFactory: GridScalingFactory) -> None: ...
@@ -346,6 +370,7 @@ class Simulation:
def addKineticEnergyAnalyzer(self, t_analyse: int) -> None: ...
def run(self) -> None: ...
+
class SlipBC:
__members__: ClassVar[dict] = ... # read-only
NotSpecified: ClassVar[SlipBC] = ...
@@ -366,6 +391,7 @@ class SlipBC:
@property
def name(self) -> str: ...
+
class StressBC:
__members__: ClassVar[dict] = ... # read-only
NotSpecified: ClassVar[StressBC] = ...
@@ -384,6 +410,7 @@ class StressBC:
@property
def name(self) -> str: ...
+
class TurbulenceModel:
__members__: ClassVar[dict] = ... # read-only
AMD: ClassVar[TurbulenceModel] = ...
@@ -402,15 +429,18 @@ class TurbulenceModel:
@property
def name(self) -> str: ...
+
class TurbulenceModelFactory:
def __init__(self, para: Parameter) -> None: ...
- def read_config_file(self, config_data: pyfluids.bindings.basics.ConfigurationFile) -> None: ...
+ def read_config_file(self, config_data: basics.ConfigurationFile) -> None: ...
def set_model_constant(self, model_constant: float) -> None: ...
def set_turbulence_model(self, turbulence_model: TurbulenceModel) -> None: ...
+
class VTKFileCollection(FileCollection):
def __init__(self, prefix: str) -> None: ...
+
class VelocityBC:
__members__: ClassVar[dict] = ... # read-only
NotSpecified: ClassVar[VelocityBC] = ...
@@ -430,7 +460,5 @@ class VelocityBC:
@property
def name(self) -> str: ...
-class FileCollection:
- def __init__(self, *args, **kwargs) -> None: ...
def create_file_collection(prefix: str, type: FileType) -> FileCollection: ...
diff --git a/pythonbindings/pyfluids-stubs/bindings/gpu/grid_generator.pyi b/pythonbindings/pyfluids-stubs/gpu/grid_generator.pyi
similarity index 79%
rename from pythonbindings/pyfluids-stubs/bindings/gpu/grid_generator.pyi
rename to pythonbindings/pyfluids-stubs/gpu/grid_generator.pyi
index 433a20e7efe472bd791b1d2a0f43859676e8fcf0..b1afd89f6455b5fdf5df568c7e03656229d69c1d 100644
--- a/pythonbindings/pyfluids-stubs/bindings/gpu/grid_generator.pyi
+++ b/pythonbindings/pyfluids-stubs/gpu/grid_generator.pyi
@@ -32,15 +32,23 @@ r"""
! \author Henry Korb
=======================================================================================
"""
-from typing import Any, List
+from __future__ import annotations
+
+from typing import List
from typing import overload
-import pyfluids.bindings.basics
-import pyfluids.bindings.gpu
+import gpu
+
+
class BoundingBox:
def __init__(self, min_x: float, max_x: float, min_y: float, max_y: float, min_z: float, max_z: float) -> None: ...
+
+class Object:
+ def __init__(self, *args, **kwargs) -> None: ...
+
+
class Conglomerate(Object):
def __init__(self, *args, **kwargs) -> None: ...
def add(self, object: Object) -> None: ...
@@ -48,27 +56,33 @@ class Conglomerate(Object):
def make_shared() -> Conglomerate: ...
def subtract(self, object: Object) -> None: ...
+
class Cuboid(Object):
def __init__(self, min_x1: float, min_x2: float, min_x3: float, max_x1: float, max_x2: float, max_x3: float) -> None: ...
+
class GridBuilder:
def __init__(self, *args, **kwargs) -> None: ...
def get_number_of_grid_levels(self) -> int: ...
+
class GridFactory:
def __init__(self, *args, **kwargs) -> None: ...
@staticmethod
def make() -> GridFactory: ...
+
class LevelGridBuilder(GridBuilder):
def __init__(self, *args, **kwargs) -> None: ...
- def set_no_slip_boundary_condition(self, side_type: pyfluids.bindings.gpu.SideType) -> None: ...
+ def set_no_slip_boundary_condition(self, side_type: gpu.SideType) -> None: ...
def set_periodic_boundary_condition(self, periodic_x: bool, periodic_y: bool, periodic_z: bool) -> None: ...
- def set_precursor_boundary_condition(self, side_type: pyfluids.bindings.gpu.SideType, file_collection: pyfluids.bindings.gpu.VelocityFileCollection, n_t_read: int, velocity_x: float = ..., velocity_y: float = ..., velocity_z: float = ..., file_level_to_grid_level_map: List[int] = ...) -> None: ...
- def set_pressure_boundary_condition(self, side_type: pyfluids.bindings.gpu.SideType, rho: float) -> None: ...
- def set_slip_boundary_condition(self, side_type: pyfluids.bindings.gpu.SideType, normal_x: float, normal_y: float, normal_z: float) -> None: ...
- def set_stress_boundary_condition(self, side_type: pyfluids.bindings.gpu.SideType, normal_x: float, normal_y: float, normal_z: float, sampling_offset: int, z0: float, dx: float, q: float) -> None: ...
- def set_velocity_boundary_condition(self, side_type: pyfluids.bindings.gpu.SideType, vx: float, vy: float, vz: float) -> None: ...
+ def set_precursor_boundary_condition(self, side_type: gpu.SideType, file_collection: gpu.FileCollection, n_t_read: int, velocity_x: float = ..., velocity_y: float = ..., velocity_z: float = ..., file_level_to_grid_level_map: List[int] = ...) -> None: ...
+ def set_pressure_boundary_condition(self, side_type: gpu.SideType, rho: float) -> None: ...
+ def set_slip_boundary_condition(self, side_type: gpu.SideType, normal_x: float, normal_y: float, normal_z: float) -> None: ...
+ def set_stress_boundary_condition(self, side_type: gpu.SideType, normal_x: float, normal_y: float, normal_z: float, sampling_offset: int, z0: float, dx: float, q: float = ...) -> None: ...
+ def set_velocity_boundary_condition(self, side_type: gpu.SideType, vx: float, vy: float, vz: float) -> None: ...
+
+
class MultipleGridBuilder(LevelGridBuilder):
def __init__(self, *args, **kwargs) -> None: ...
@@ -86,14 +100,13 @@ class MultipleGridBuilder(LevelGridBuilder):
@staticmethod
def make_shared(grid_factory: GridFactory) -> MultipleGridBuilder: ...
-class Object:
- def __init__(self, *args, **kwargs) -> None: ...
class Sphere(Object):
def __init__(self, *args, **kwargs) -> None: ...
@staticmethod
def make_shared() -> Sphere: ...
+
class TriangularMesh(Object):
def __init__(self, *args, **kwargs) -> None: ...
@staticmethod
diff --git a/pythonbindings/pyfluids-stubs/bindings/gpu/probes.pyi b/pythonbindings/pyfluids-stubs/gpu/probes.pyi
similarity index 95%
rename from pythonbindings/pyfluids-stubs/bindings/gpu/probes.pyi
rename to pythonbindings/pyfluids-stubs/gpu/probes.pyi
index af9c40078e6009efebda4450b5c5e23586aa1e83..4c275d1d6f2eb2bc6a63ae0a8a015d5b0eee6472 100644
--- a/pythonbindings/pyfluids-stubs/bindings/gpu/probes.pyi
+++ b/pythonbindings/pyfluids-stubs/gpu/probes.pyi
@@ -32,27 +32,11 @@ r"""
! \author Henry Korb
=======================================================================================
"""
+from __future__ import annotations
from typing import ClassVar, List
-import pyfluids.bindings.gpu
+import gpu
-class PlanarAverageProbe(Probe):
- def __init__(self, probe_name: str, output_path: str, t_start_avg: int, t_start_tmp_avg: int, t_avg: int, t_start_out: int, t_out: int, plane_normal: str) -> None: ...
-
-class PlaneProbe(Probe):
- def __init__(self, probe_name: str, output_path: str, t_start_avg: int, t_avg: int, t_start_out: int, t_out: int) -> None: ...
- def set_probe_plane(self, pos_x: float, pos_y: float, pos_z: float, delta_x: float, delta_y: float, delta_z: float) -> None: ...
-
-class PointProbe(Probe):
- def __init__(self, probe_name: str, output_path: str, t_start_avg: int, t_avg: int, t_start_out: int, t_out: int, output_timeseries: bool) -> None: ...
- def add_probe_points_from_list(self, point_coords_x: List[float], point_coords_y: List[float], point_coords_z: List[float]) -> None: ...
- def add_probe_points_from_x_normal_plane(self, pos_x: float, pos0_y: float, pos0_z: float, pos1_y: float, pos1_z: float, n_y: int, n_z: int) -> None: ...
-
-class Probe(pyfluids.bindings.gpu.PreCollisionInteractor):
- def __init__(self, *args, **kwargs) -> None: ...
- def add_all_available_statistics(self) -> None: ...
- def add_statistic(self, variable: Statistic) -> None: ...
- def set_file_name_to_n_out(self) -> None: ...
class Statistic:
__members__: ClassVar[dict] = ... # read-only
@@ -79,6 +63,30 @@ class Statistic:
@property
def name(self) -> str: ...
+
+class Probe(gpu.PreCollisionInteractor):
+ def __init__(self, *args, **kwargs) -> None: ...
+ def add_all_available_statistics(self) -> None: ...
+ def add_statistic(self, variable: Statistic) -> None: ...
+ def set_file_name_to_n_out(self) -> None: ...
+
+
+class PlanarAverageProbe(Probe):
+ def __init__(self, probe_name: str, output_path: str, t_start_avg: int, t_start_tmp_avg: int, t_avg: int, t_start_out: int, t_out: int, plane_normal: str) -> None: ...
+
+
+class PlaneProbe(Probe):
+ def __init__(self, probe_name: str, output_path: str, t_start_avg: int, t_avg: int, t_start_out: int, t_out: int) -> None: ...
+ def set_probe_plane(self, pos_x: float, pos_y: float, pos_z: float, delta_x: float, delta_y: float, delta_z: float) -> None: ...
+
+
+class PointProbe(Probe):
+ def __init__(self, probe_name: str, output_path: str, t_start_avg: int, t_avg: int, t_start_out: int, t_out: int, output_timeseries: bool) -> None: ...
+ def add_probe_point(self, point_coord_x: float, point_coord_y: float, point_coord_z: float) -> None: ...
+ def add_probe_points_from_list(self, point_coords_x: List[float], point_coords_y: List[float], point_coords_z: List[float]) -> None: ...
+ def add_probe_points_from_x_normal_plane(self, pos_x: float, pos0_y: float, pos0_z: float, pos1_y: float, pos1_z: float, n_y: int, n_z: int) -> None: ...
+
+
class WallModelProbe(Probe):
def __init__(self, probe_name: str, output_path: str, t_start_avg: int, t_start_tmp_avg: int, t_avg: int, t_start_out: int, t_out: int) -> None: ...
def set_evaluate_pressure_gradient(self, eval_press_grad: bool) -> None: ...
diff --git a/pythonbindings/pyfluids-stubs/bindings/logger.pyi b/pythonbindings/pyfluids-stubs/logger.pyi
similarity index 98%
rename from pythonbindings/pyfluids-stubs/bindings/logger.pyi
rename to pythonbindings/pyfluids-stubs/logger.pyi
index fe84eeb18f3245ef72ed023b2de9db7b9131d144..91c1346c2de2313de2c8df4a0b6d5eb4f4ab87bd 100644
--- a/pythonbindings/pyfluids-stubs/bindings/logger.pyi
+++ b/pythonbindings/pyfluids-stubs/logger.pyi
@@ -32,12 +32,16 @@ r"""
! \author Henry Korb
=======================================================================================
"""
+from __future__ import annotations
+
+
class Logger:
@staticmethod
def change_log_path(path: str) -> None: ...
@staticmethod
def initialize_logger() -> None: ...
+
def vf_log_critical(message: str) -> None: ...
def vf_log_debug(message: str) -> None: ...
def vf_log_info(message: str) -> None: ...
diff --git a/pythonbindings/pyfluids/timeseries_probe_reader.py b/pythonbindings/pyfluids/timeseries_probe_reader.py
new file mode 100644
index 0000000000000000000000000000000000000000..d8aa7af05a82b92a1a9cab9ea791de897ac89c13
--- /dev/null
+++ b/pythonbindings/pyfluids/timeseries_probe_reader.py
@@ -0,0 +1,47 @@
+import numpy as np
+from pathlib import Path
+import pandas as pd
+#%%
+
+
+class TimeseriesProbeReader:
+ def __init__(self, file: Path):
+ self.file = file
+ self.quants, self.positions, self.data = \
+ self.read_file()
+
+ def read_file(self):
+ with open(self.file, "rb") as f:
+ header_length = 0
+ header_length += len(f.readline()) # first line
+ quant_line = f.readline()
+ header_length += len(f.readline()) # number of points
+ number_of_points_line = f.readline()
+ header_length += len(f.readline()) # positions
+ n_points = int(number_of_points_line)
+ positions = np.zeros((n_points, 3))
+ for i in range(n_points):
+ pos_line = f.readline()
+ header_length += len(pos_line)
+ positions[i] = [float(pos) for pos in pos_line.split(b", ")]
+
+ header_length += len(quant_line)
+ header_length += len(number_of_points_line)
+
+ quants = quant_line.decode().split(" ")[1:-1]
+ n_quants = len(quants)
+ data = np.fromfile(self.file, dtype=np.float32, offset=header_length)
+ n_timesteps = len(data)//(n_quants*n_points+1)
+ return quants, positions, data.reshape(n_timesteps, n_points*n_quants+1)
+
+ def get_data(self):
+ return self.data
+
+ def get_positions(self):
+ return self.positions
+
+ def get_quantities(self):
+ return self.quants
+
+ def to_dataframe(self):
+ return pd.DataFrame(self.data[:,1:], columns=self.quants, index=self.data[:,0])
\ No newline at end of file
diff --git a/pythonbindings/src/basics/basics.cpp b/pythonbindings/src/basics/basics.cpp
index 0b294b7a8de2f4f396dac418b0544b5f99ecec3d..126d8614e1b40ba0658a5335d5eb9d147309eae0 100644
--- a/pythonbindings/src/basics/basics.cpp
+++ b/pythonbindings/src/basics/basics.cpp
@@ -37,12 +37,8 @@ namespace basics
{
namespace py = pybind11;
- py::module makeModule(py::module_ &parentModule)
+ PYBIND11_MODULE(basics, m)
{
- py::module basicsModule = parentModule.def_submodule("basics");
-
- configuration::makeModule(basicsModule);
-
- return basicsModule;
+ configuration::makeModule(m);
}
}
\ No newline at end of file
diff --git a/pythonbindings/src/basics/submodules/configuration_file.cpp b/pythonbindings/src/basics/submodules/configuration_file.cpp
index 7fcd48c34824b9370eeac1872c899bf980176a52..cb9154e23aa9df3dae66163b4703bfe4ecae0c31 100644
--- a/pythonbindings/src/basics/submodules/configuration_file.cpp
+++ b/pythonbindings/src/basics/submodules/configuration_file.cpp
@@ -53,7 +53,7 @@ namespace configuration
.def("get_double_value", static_cast<double (vf::basics::ConfigurationFile::*)(const std::string&, double ) const>(&vf::basics::ConfigurationFile::getValue), py::arg("key"), py::arg("default_value"))
.def("get_bool_value" , static_cast<bool (vf::basics::ConfigurationFile::*)(const std::string&) const>(&vf::basics::ConfigurationFile::getValue), py::arg("key"))
.def("get_bool_value" , static_cast<bool (vf::basics::ConfigurationFile::*)(const std::string&, bool ) const>(&vf::basics::ConfigurationFile::getValue), py::arg("key"), py::arg("default_value"))
- .def("get_string_value", static_cast<std::string (vf::basics::ConfigurationFile::*)(const std::string&) const>(&vf::basics::ConfigurationFile::getValue), py::arg("key"))
+ .def("get_string_value", static_cast<std::string (vf::basics::ConfigurationFile::*)(const std::string&) const>(&vf::basics::ConfigurationFile::getValue<std::string>), py::arg("key"))
.def("get_string_value", static_cast<std::string (vf::basics::ConfigurationFile::*)(const std::string&, std::string) const>(&vf::basics::ConfigurationFile::getValue), py::arg("key"), py::arg("default_value"));
}
}
\ No newline at end of file
diff --git a/pythonbindings/src/cpu/cpu.cpp b/pythonbindings/src/cpu/cpu.cpp
index 75143d913596c74a26f25ce64f1e6d214a442e34..baced0fc11afd6a12721759780d82f8a26d56cfc 100644
--- a/pythonbindings/src/cpu/cpu.cpp
+++ b/pythonbindings/src/cpu/cpu.cpp
@@ -38,18 +38,16 @@
#include "submodules/simulationparameters.cpp"
#include "submodules/writer.cpp"
-namespace cpu
+namespace cpu_bindings
{
namespace py = pybind11;
- py::module makeModule(py::module_ &parentModule)
+ PYBIND11_MODULE(cpu, m)
{
- py::module cpuModule = parentModule.def_submodule("cpu");
- boundaryconditions::makeModule(cpuModule);
- simulation::makeModule(cpuModule);
- geometry::makeModule(cpuModule);
- kernel::makeModule(cpuModule);
- parameters::makeModule(cpuModule);
- writer::makeModule(cpuModule);
- return cpuModule;
+ boundaryconditions::makeModule(m);
+ simulation::makeModule(m);
+ geometry::makeModule(m);
+ kernel::makeModule(m);
+ parameters::makeModule(m);
+ writer::makeModule(m);
}
}
\ No newline at end of file
diff --git a/pythonbindings/src/cpu/submodules/boundaryconditions.cpp b/pythonbindings/src/cpu/submodules/boundaryconditions.cpp
index 40ad9f0a9eac793b2c44f9001375c0ca6be0fe06..8ab64a7a5037d134563eaac4e836f72e89c4ec77 100644
--- a/pythonbindings/src/cpu/submodules/boundaryconditions.cpp
+++ b/pythonbindings/src/cpu/submodules/boundaryconditions.cpp
@@ -30,6 +30,7 @@
//! \ingroup submodules
//! \author Sven Marcus, Henry Korb
//=======================================================================================
+#include "BCStrategy.h"
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
#include <BoundaryConditions/DensityBC.h>
@@ -55,7 +56,7 @@ namespace boundaryconditions
template<typename ...Args>
PyBoundaryCondition(Args &&... args) : adapter(std::forward<Args>(args)...)
{
- this->setBcAlgorithm(std::make_shared<algorithm>());
+ this->setBCStrategy(std::make_shared<algorithm>());
}
};
diff --git a/pythonbindings/src/cpu/submodules/simulationconfig.cpp b/pythonbindings/src/cpu/submodules/simulationconfig.cpp
index 09d91f44e85f03c6150c56ce5762e7629212fba0..282b51fbfc986d20a27ee57c6f8e3b716ad34a06 100644
--- a/pythonbindings/src/cpu/submodules/simulationconfig.cpp
+++ b/pythonbindings/src/cpu/submodules/simulationconfig.cpp
@@ -39,16 +39,16 @@ namespace simulation
void makeModule(py::module_ &parentModule)
{
- py::class_<Simulation, std::shared_ptr<Simulation>>(parentModule, "Simulation")
+ py::class_<CPUSimulation, std::shared_ptr<CPUSimulation>>(parentModule, "Simulation")
.def(py::init())
- .def("set_writer", &Simulation::setWriterConfiguration)
- .def("set_grid_parameters", &Simulation::setGridParameters)
- .def("set_physical_parameters", &Simulation::setPhysicalParameters)
- .def("set_runtime_parameters", &Simulation::setRuntimeParameters)
- .def("set_kernel_config", &Simulation::setKernelConfiguration)
- .def("add_object", &Simulation::addObject)
- .def("add_bc_adapter", &Simulation::addBCAdapter)
- .def("run_simulation", &Simulation::run);
+ .def("set_writer", &CPUSimulation::setWriterConfiguration)
+ .def("set_grid_parameters", &CPUSimulation::setGridParameters)
+ .def("set_physical_parameters", &CPUSimulation::setPhysicalParameters)
+ .def("set_runtime_parameters", &CPUSimulation::setRuntimeParameters)
+ .def("set_kernel_config", &CPUSimulation::setKernelConfiguration)
+ .def("add_object", &CPUSimulation::addObject)
+ .def("add_bc_adapter", &CPUSimulation::addBCAdapter)
+ .def("run_simulation", &CPUSimulation::run);
}
}
\ No newline at end of file
diff --git a/pythonbindings/src/gpu/gpu.cpp b/pythonbindings/src/gpu/gpu.cpp
index 9eb160ae7765f16a6437e343cb878bb4b80877bf..8946b1d8af7655682a19e793119b27ab77f6f542 100644
--- a/pythonbindings/src/gpu/gpu.cpp
+++ b/pythonbindings/src/gpu/gpu.cpp
@@ -46,27 +46,25 @@
#include "submodules/actuator_farm.cpp"
#include "submodules/grid_scaling_factory.cpp"
-namespace gpu
+namespace gpu_bindings
{
namespace py = pybind11;
- py::module makeModule(py::module_ &parentModule)
+ PYBIND11_MODULE(gpu, m)
{
- py::module gpuModule = parentModule.def_submodule("gpu");
- simulation::makeModule(gpuModule);
- parameter::makeModule(gpuModule);
- pre_collision_interactor::makeModule(gpuModule);
- actuator_farm::makeModule(gpuModule);
- boundary_conditions::makeModule(gpuModule);
- transient_bc_setter::makeModule(gpuModule);
- communicator::makeModule(gpuModule);
- cuda_memory_manager::makeModule(gpuModule);
- probes::makeModule(gpuModule);
- precursor_writer::makeModule(gpuModule);
- grid_generator::makeModule(gpuModule);
- grid_provider::makeModule(gpuModule);
- turbulence_model::makeModule(gpuModule);
- grid_scaling_factory::makeModule(gpuModule);
- return gpuModule;
+ simulation::makeModule(m);
+ parameter::makeModule(m);
+ pre_collision_interactor::makeModule(m);
+ actuator_farm::makeModule(m);
+ boundary_conditions::makeModule(m);
+ transient_bc_setter::makeModule(m);
+ communicator::makeModule(m);
+ cuda_memory_manager::makeModule(m);
+ probes::makeModule(m);
+ precursor_writer::makeModule(m);
+ grid_generator::makeModule(m);
+ grid_provider::makeModule(m);
+ turbulence_model::makeModule(m);
+ grid_scaling_factory::makeModule(m);
}
}
\ No newline at end of file
diff --git a/pythonbindings/src/gpu/submodules/actuator_farm.cpp b/pythonbindings/src/gpu/submodules/actuator_farm.cpp
index a930616db3e0d0713bdf57157387d75d171603de..86e3f5a42152e60d6b62e32fb894406efc8384ea 100644
--- a/pythonbindings/src/gpu/submodules/actuator_farm.cpp
+++ b/pythonbindings/src/gpu/submodules/actuator_farm.cpp
@@ -30,10 +30,13 @@
//! \ingroup submodules
//! \author Henry Korb
//=======================================================================================
+
#include <pybind11/pybind11.h>
#include <pybind11/numpy.h>
#include <gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.h>
#include <gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h>
+
+
class PyActuatorFarm : public ActuatorFarm
{
public:
@@ -43,13 +46,20 @@ public:
PYBIND11_OVERRIDE_NAME(void, ActuatorFarm, "calc_blade_forces", calcBladeForces);
}
};
+
namespace actuator_farm
{
namespace py = pybind11;
+ template<class dtype>
+ dtype* np_to_arr(py::array_t<dtype, py::array::c_style> array){ return static_cast<dtype *>(array.request().ptr); };
+
+ template<class dtype>
+ intptr_t arr_to_cp(dtype* array){ return reinterpret_cast<intptr_t>(array); };
+
void makeModule(py::module_ &parentModule)
{
- using arr = py::array_t<float, py::array::c_style>;
+ using arr = py::array_t<real, py::array::c_style>;
py::class_<ActuatorFarm, PreCollisionInteractor, PyActuatorFarm, std::shared_ptr<ActuatorFarm>>(parentModule, "ActuatorFarm", py::dynamic_attr())
.def(py::init< const uint,
@@ -71,7 +81,7 @@ namespace actuator_farm
.def_property_readonly("number_of_turbines", &ActuatorFarm::getNumberOfTurbines)
.def_property_readonly("number_of_nodes_per_blade", &ActuatorFarm::getNumberOfNodesPerBlade)
.def_property_readonly("number_of_blades_per_turbine", &ActuatorFarm::getNumberOfBladesPerTurbine)
- .def_property_readonly("number_of_nodes", &ActuatorFarm::getNumberOfNodes)
+ .def_property_readonly("number_of_grid_nodes", &ActuatorFarm::getNumberOfGridNodes)
.def_property_readonly("number_of_indices", &ActuatorFarm::getNumberOfIndices)
.def_property_readonly("density", &ActuatorFarm::getDensity)
.def_property_readonly("delta_t", &ActuatorFarm::getDeltaT)
@@ -79,7 +89,9 @@ namespace actuator_farm
.def("add_turbine", &ActuatorFarm::addTurbine, py::arg("posX"), py::arg("posY"), py::arg("posZ"), py::arg("diameter"), py::arg("omega"), py::arg("azimuth"), py::arg("yaw"), py::arg("bladeRadii"))
- .def("get_turbine_pos", [](ActuatorFarm& al, uint turbine){ real position[3] = {al.getTurbinePosX(turbine), al.getTurbinePosY(turbine), al.getTurbinePosZ(turbine)}; return arr(3, position); }, py::arg("turbine"))
+ .def("get_turbine_pos", [](ActuatorFarm& al, uint turbine){
+ real position[3] = {al.getTurbinePosX(turbine), al.getTurbinePosY(turbine), al.getTurbinePosZ(turbine)}; return arr(3, position);
+ }, py::arg("turbine"))
.def("get_turbine_azimuth", &ActuatorFarm::getTurbineAzimuth, py::arg("turbine"))
.def("get_turbine_yaw", &ActuatorFarm::getTurbineYaw, py::arg("turbine"))
.def("get_turbine_omega", &ActuatorFarm::getTurbineOmega, py::arg("turbine"))
@@ -112,59 +124,53 @@ namespace actuator_farm
.def("get_turbine_blade_forces_y", [](ActuatorFarm& al, uint turbine){ return arr({al.getNumberOfBladesPerTurbine(), al.getNumberOfNodesPerBlade()}, al.getTurbineBladeForcesYDevice(turbine)); }, py::arg("turbine") )
.def("get_turbine_blade_forces_z", [](ActuatorFarm& al, uint turbine){ return arr({al.getNumberOfBladesPerTurbine(), al.getNumberOfNodesPerBlade()}, al.getTurbineBladeForcesZDevice(turbine)); }, py::arg("turbine") )
- .def("get_all_blade_radii_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t>(al.getAllBladeRadiiDevice()); } )
- .def("get_all_blade_coords_x_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t> (al.getAllBladeCoordsXDevice()); } )
- .def("get_all_blade_coords_y_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t> (al.getAllBladeCoordsYDevice()); } )
- .def("get_all_blade_coords_z_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t> (al.getAllBladeCoordsZDevice()); } )
- .def("get_all_blade_velocities_x_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t> (al.getAllBladeVelocitiesXDevice()); } )
- .def("get_all_blade_velocities_y_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t> (al.getAllBladeVelocitiesYDevice()); } )
- .def("get_all_blade_velocities_z_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t> (al.getAllBladeVelocitiesZDevice()); } )
- .def("get_all_blade_forces_x_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t> (al.getAllBladeForcesXDevice()); } )
- .def("get_all_blade_forces_y_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t> (al.getAllBladeForcesYDevice()); } )
- .def("get_all_blade_forces_z_device", [](ActuatorFarm& al) -> intptr_t { return reinterpret_cast<intptr_t> (al.getAllBladeForcesZDevice()); } )
+ .def("get_all_blade_radii_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeRadiiDevice()); } )
+ .def("get_all_blade_coords_x_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeCoordsXDevice()); } )
+ .def("get_all_blade_coords_y_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeCoordsYDevice()); } )
+ .def("get_all_blade_coords_z_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeCoordsZDevice()); } )
+ .def("get_all_blade_velocities_x_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeVelocitiesXDevice()); } )
+ .def("get_all_blade_velocities_y_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeVelocitiesYDevice()); } )
+ .def("get_all_blade_velocities_z_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeVelocitiesZDevice()); } )
+ .def("get_all_blade_forces_x_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeForcesXDevice()); } )
+ .def("get_all_blade_forces_y_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeForcesYDevice()); } )
+ .def("get_all_blade_forces_z_device", [](ActuatorFarm& al) -> intptr_t { return arr_to_cp(al.getAllBladeForcesZDevice()); } )
- .def("get_turbine_blade_radii_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeRadiiDevice(turbine)); }, py::arg("turbine") )
- .def("get_turbine_blade_coords_x_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeCoordsXDevice(turbine)); }, py::arg("turbine") )
- .def("get_turbine_blade_coords_y_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeCoordsYDevice(turbine)); }, py::arg("turbine") )
- .def("get_turbine_blade_coords_z_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeCoordsZDevice(turbine)); }, py::arg("turbine") )
- .def("get_turbine_blade_velocities_x_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeVelocitiesXDevice(turbine)); }, py::arg("turbine") )
- .def("get_turbine_blade_velocities_y_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeVelocitiesYDevice(turbine)); }, py::arg("turbine") )
- .def("get_turbine_blade_velocities_z_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeVelocitiesZDevice(turbine)); }, py::arg("turbine") )
- .def("get_turbine_blade_forces_x_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeForcesXDevice(turbine)); }, py::arg("turbine") )
- .def("get_turbine_blade_forces_y_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeForcesYDevice(turbine)); }, py::arg("turbine") )
- .def("get_turbine_blade_forces_z_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return reinterpret_cast<intptr_t>(al.getTurbineBladeForcesZDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_radii_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeRadiiDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_coords_x_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeCoordsXDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_coords_y_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeCoordsYDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_coords_z_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeCoordsZDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_velocities_x_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeVelocitiesXDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_velocities_y_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeVelocitiesYDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_velocities_z_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeVelocitiesZDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_forces_x_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeForcesXDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_forces_y_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeForcesYDevice(turbine)); }, py::arg("turbine") )
+ .def("get_turbine_blade_forces_z_device", [](ActuatorFarm& al, uint turbine) -> intptr_t { return arr_to_cp(al.getTurbineBladeForcesZDevice(turbine)); }, py::arg("turbine") )
- .def("set_all_azimuths", [](ActuatorFarm& al, arr azimuths){ al.setAllAzimuths(static_cast<float *>(azimuths.request().ptr)); }, py::arg("azimuths"))
- .def("set_all_yaws", [](ActuatorFarm& al, arr yaws){ al.setAllYaws(static_cast<float *>(yaws.request().ptr)); }, py::arg("yaws"))
- .def("set_all_omegas", [](ActuatorFarm& al, arr omegas){ al.setAllOmegas(static_cast<float *>(omegas.request().ptr)); }, py::arg("omegas"))
+ .def("set_all_azimuths", [](ActuatorFarm& al, arr azimuths){ al.setAllAzimuths(np_to_arr(azimuths)); }, py::arg("azimuths"))
+ .def("set_all_yaws", [](ActuatorFarm& al, arr yaws){ al.setAllYaws(np_to_arr(yaws)); }, py::arg("yaws"))
+ .def("set_all_omegas", [](ActuatorFarm& al, arr omegas){ al.setAllOmegas(np_to_arr(omegas)); }, py::arg("omegas"))
.def("set_turbine_azimuth", &ActuatorFarm::setTurbineAzimuth, py::arg("turbine"), py::arg("azimuth"))
.def("set_turbine_yaw", &ActuatorFarm::setTurbineYaw, py::arg("turbine"), py::arg("yaw"))
.def("set_turbine_omega", &ActuatorFarm::setTurbineOmega, py::arg("turbine"), py::arg("omega"))
- .def("set_all_blade_coords", [](ActuatorFarm& al, arr coordsX, arr coordsY, arr coordsZ)
- {
- al.setAllBladeCoords(static_cast<float *>(coordsX.request().ptr), static_cast<float *>(coordsY.request().ptr), static_cast<float *>(coordsZ.request().ptr));
+ .def("set_all_blade_coords", [](ActuatorFarm& al, arr coordsX, arr coordsY, arr coordsZ){
+ al.setAllBladeCoords(np_to_arr(coordsX), np_to_arr(coordsY), np_to_arr(coordsZ));
}, py::arg("blade_coords_x"), py::arg("blade_coords_y"), py::arg("blade_coords_z") )
- .def("set_all_blade_velocities", [](ActuatorFarm& al, arr velocitiesX, arr velocitiesY, arr velocitiesZ)
- {
- al.setAllBladeVelocities(static_cast<float *>(velocitiesX.request().ptr), static_cast<float *>(velocitiesY.request().ptr), static_cast<float *>(velocitiesZ.request().ptr));
+ .def("set_all_blade_velocities", [](ActuatorFarm& al, arr velocitiesX, arr velocitiesY, arr velocitiesZ){
+ al.setAllBladeVelocities(np_to_arr(velocitiesX), np_to_arr(velocitiesY), np_to_arr(velocitiesZ));
}, py::arg("blade_velocities_x"), py::arg("blade_velocities_y"), py::arg("blade_velocities_z") )
- .def("set_all_blade_forces", [](ActuatorFarm& al, arr forcesX, arr forcesY, arr forcesZ)
- {
- al.setAllBladeForces(static_cast<float *>(forcesX.request().ptr), static_cast<float *>(forcesY.request().ptr), static_cast<float *>(forcesZ.request().ptr));
+ .def("set_all_blade_forces", [](ActuatorFarm& al, arr forcesX, arr forcesY, arr forcesZ){
+ al.setAllBladeForces(np_to_arr(forcesX), np_to_arr(forcesY), np_to_arr(forcesZ));
}, py::arg("blade_forces_x"), py::arg("blade_forces_y"), py::arg("blade_forces_z") )
- .def("set_turbine_blade_coords", [](ActuatorFarm& al, uint turbine, arr coordsX, arr coordsY, arr coordsZ)
- {
- al.setTurbineBladeCoords(turbine, static_cast<float *>(coordsX.request().ptr), static_cast<float *>(coordsY.request().ptr), static_cast<float *>(coordsZ.request().ptr));
+ .def("set_turbine_blade_coords", [](ActuatorFarm& al, uint turbine, arr coordsX, arr coordsY, arr coordsZ){
+ al.setTurbineBladeCoords(turbine, np_to_arr(coordsX), np_to_arr(coordsY), np_to_arr(coordsZ));
}, py::arg("turbine"), py::arg("blade_coords_x"), py::arg("blade_coords_y"), py::arg("blade_coords_z") )
- .def("set_turbine_blade_velocities", [](ActuatorFarm& al, uint turbine, arr velocitiesX, arr velocitiesY, arr velocitiesZ)
- {
- al.setTurbineBladeVelocities(turbine, static_cast<float *>(velocitiesX.request().ptr), static_cast<float *>(velocitiesY.request().ptr), static_cast<float *>(velocitiesZ.request().ptr));
+ .def("set_turbine_blade_velocities", [](ActuatorFarm& al, uint turbine, arr velocitiesX, arr velocitiesY, arr velocitiesZ){
+ al.setTurbineBladeVelocities(turbine, np_to_arr(velocitiesX), np_to_arr(velocitiesY), np_to_arr(velocitiesZ));
}, py::arg("turbine"), py::arg("blade_velocities_x"), py::arg("blade_velocities_y"), py::arg("blade_velocities_z") )
- .def("set_turbine_blade_forces", [](ActuatorFarm& al, uint turbine, arr forcesX, arr forcesY, arr forcesZ)
- {
- al.setTurbineBladeForces(turbine, static_cast<float *>(forcesX.request().ptr), static_cast<float *>(forcesY.request().ptr), static_cast<float *>(forcesZ.request().ptr));
+ .def("set_turbine_blade_forces", [](ActuatorFarm& al, uint turbine, arr forcesX, arr forcesY, arr forcesZ){
+ al.setTurbineBladeForces(turbine, np_to_arr(forcesX), np_to_arr(forcesY), np_to_arr(forcesZ));
}, py::arg("turbine"), py::arg("blade_forces_x"), py::arg("blade_forces_y"), py::arg("blade_forces_z") )
.def("calc_blade_forces", &ActuatorFarm::calcBladeForces);
}
diff --git a/pythonbindings/src/gpu/submodules/communicator.cpp b/pythonbindings/src/gpu/submodules/communicator.cpp
index 0230caf197c04c2f2cd411288e9ea24ee314c4a8..f17fa749461b522ffb3254cad7f9b6675d3de4fc 100644
--- a/pythonbindings/src/gpu/submodules/communicator.cpp
+++ b/pythonbindings/src/gpu/submodules/communicator.cpp
@@ -31,7 +31,7 @@
//! \author Henry Korb
//=======================================================================================
#include <pybind11/pybind11.h>
-#include <gpu/VirtualFluids_GPU/Communication/Communicator.h>
+#include <gpu/VirtualFluids_GPU/Communication/MpiCommunicator.h>
namespace communicator
{
@@ -39,9 +39,9 @@ namespace communicator
void makeModule(py::module_ &parentModule)
{
- py::class_<vf::gpu::Communicator, std::unique_ptr<vf::gpu::Communicator, py::nodelete>>(parentModule, "Communicator")
- .def_static("get_instance", &vf::gpu::Communicator::getInstance, py::return_value_policy::reference)
- .def("get_number_of_process", &vf::gpu::Communicator::getNumberOfProcess)
- .def("get_pid", &vf::gpu::Communicator::getPID);
+ py::class_<vf::gpu::MpiCommunicator, std::unique_ptr<vf::gpu::MpiCommunicator, py::nodelete>>(parentModule, "MpiCommunicator")
+ .def_static("get_instance", &vf::gpu::MpiCommunicator::getInstance, py::return_value_policy::reference)
+ .def("get_number_of_process", &vf::gpu::MpiCommunicator::getNumberOfProcess)
+ .def("get_pid", &vf::gpu::MpiCommunicator::getPID);
}
}
\ No newline at end of file
diff --git a/pythonbindings/src/gpu/submodules/grid_generator.cpp b/pythonbindings/src/gpu/submodules/grid_generator.cpp
index 59d0bd5708b11f246664d1e8c7ee198f986d80c1..f4c2b733e7b099309b3fdc238ee71c22d940cced 100644
--- a/pythonbindings/src/gpu/submodules/grid_generator.cpp
+++ b/pythonbindings/src/gpu/submodules/grid_generator.cpp
@@ -42,6 +42,10 @@
#include "gpu/GridGenerator/grid/GridBuilder/GridBuilder.h"
#include "gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h"
#include "gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h"
+#include "basics/constants/NumericConstants.h"
+
+using namespace vf::basics::constant;
+
namespace grid_generator
{
@@ -91,16 +95,16 @@ namespace grid_generator
.def("set_pressure_boundary_condition", &LevelGridBuilder::setPressureBoundaryCondition, py::arg("side_type"), py::arg("rho"))
.def("set_periodic_boundary_condition", &LevelGridBuilder::setPeriodicBoundaryCondition, py::arg("periodic_x"), py::arg("periodic_y"), py::arg("periodic_z"))
.def("set_no_slip_boundary_condition", &LevelGridBuilder::setNoSlipBoundaryCondition, py::arg("side_type"))
- .def("set_precursor_boundary_condition", &LevelGridBuilder::setPrecursorBoundaryCondition, py::arg("side_type"), py::arg("file_collection"), py::arg("n_t_read"), py::arg("velocity_x")=0.0f, py::arg("velocity_y")=0.0f, py::arg("velocity_z")=0.0f, py::arg("file_level_to_grid_level_map")=std::vector<uint>())
+ .def("set_precursor_boundary_condition", &LevelGridBuilder::setPrecursorBoundaryCondition, py::arg("side_type"), py::arg("file_collection"), py::arg("n_t_read"), py::arg("velocity_x")=c0o1, py::arg("velocity_y")=c0o1, py::arg("velocity_z")=c0o1, py::arg("file_level_to_grid_level_map")=std::vector<uint>())
.def("set_stress_boundary_condition", &LevelGridBuilder::setStressBoundaryCondition, py::arg("side_type"), py::arg("normal_x"), py::arg("normal_y"), py::arg("normal_z"), py::arg("sampling_offset"), py::arg("z0"), py::arg("dx"));
py::class_<MultipleGridBuilder, LevelGridBuilder, std::shared_ptr<MultipleGridBuilder>>(gridGeneratorModule, "MultipleGridBuilder")
.def_static("make_shared", &MultipleGridBuilder::makeShared, py::return_value_policy::reference, py::arg("grid_factory"))
.def("add_coarse_grid", &MultipleGridBuilder::addCoarseGrid, py::arg("start_x"), py::arg("start_y"), py::arg("start_z"), py::arg("end_x"), py::arg("end_y"), py::arg("end_z"), py::arg("delta"))
- .def("add_grid", py::overload_cast<Object*>(&MultipleGridBuilder::addGrid), py::arg("grid_shape"))
- .def("add_grid", py::overload_cast<Object*, uint>(&MultipleGridBuilder::addGrid), py::arg("grid_shape"), py::arg("level_fine"))
- .def("add_geometry", py::overload_cast<Object*>(&MultipleGridBuilder::addGeometry), py::arg("solid_object"))
- .def("add_geometry", py::overload_cast<Object*, uint>(&MultipleGridBuilder::addGeometry), py::arg("solid_object"), py::arg("level"))
+ .def("add_grid", py::overload_cast<SPtr<Object>>(&MultipleGridBuilder::addGrid), py::arg("grid_shape"))
+ .def("add_grid", py::overload_cast<SPtr<Object>, uint>(&MultipleGridBuilder::addGrid), py::arg("grid_shape"), py::arg("level_fine"))
+ .def("add_geometry", py::overload_cast<SPtr<Object>>(&MultipleGridBuilder::addGeometry), py::arg("solid_object"))
+ .def("add_geometry", py::overload_cast<SPtr<Object>, uint>(&MultipleGridBuilder::addGeometry), py::arg("solid_object"), py::arg("level"))
.def("get_number_of_levels", &MultipleGridBuilder::getNumberOfLevels)
.def("build_grids", &MultipleGridBuilder::buildGrids, py::arg("enable_thin_walls"))
.def("set_subdomain_box", &MultipleGridBuilder::setSubDomainBox, py::arg("bounding_box"))
diff --git a/pythonbindings/src/gpu/submodules/probes.cpp b/pythonbindings/src/gpu/submodules/probes.cpp
index 7c26958df81a60f00c9909a91f5576a5931652d4..9c3fc8ab15234013a093dbe00f6654ea3257d4b0 100644
--- a/pythonbindings/src/gpu/submodules/probes.cpp
+++ b/pythonbindings/src/gpu/submodules/probes.cpp
@@ -72,13 +72,16 @@ namespace probes
uint,
uint,
uint,
- uint>(),
+ uint,
+ bool>(),
py::arg("probe_name"),
py::arg("output_path"),
py::arg("t_start_avg"),
py::arg("t_avg"),
py::arg("t_start_out"),
- py::arg("t_out"))
+ py::arg("t_out"),
+ py::arg("output_timeseries"))
+ .def("add_probe_point", &PointProbe::addProbePoint, py::arg("point_coord_x"), py::arg("point_coord_y"), py::arg("point_coord_z"))
.def("add_probe_points_from_list", &PointProbe::addProbePointsFromList, py::arg("point_coords_x"), py::arg("point_coords_y"), py::arg("point_coords_z"))
.def("add_probe_points_from_x_normal_plane", &PointProbe::addProbePointsFromXNormalPlane, py::arg("pos_x"), py::arg("pos0_y"), py::arg("pos0_z"), py::arg("pos1_y"), py::arg("pos1_z"), py::arg("n_y"), py::arg("n_z"));
diff --git a/pythonbindings/src/lbm/lbm.cpp b/pythonbindings/src/lbm.cpp
similarity index 93%
rename from pythonbindings/src/lbm/lbm.cpp
rename to pythonbindings/src/lbm.cpp
index 90fd4a71b0101469666936c89974de316e0e2b18..622cc9742fdaa98f2ff6d974e495e6b8b490a2c2 100644
--- a/pythonbindings/src/lbm/lbm.cpp
+++ b/pythonbindings/src/lbm.cpp
@@ -32,14 +32,11 @@
//=======================================================================================
#include <pybind11/pybind11.h>
-namespace lbm
+namespace lbm_bindings
{
namespace py = pybind11;
- py::module makeModule(py::module_ &parentModule)
+ PYBIND11_MODULE(lbm, m)
{
- py::module lbmModule = parentModule.def_submodule("lbm");
-
- return lbmModule;
}
}
\ No newline at end of file
diff --git a/pythonbindings/src/logger/logger.cpp b/pythonbindings/src/logger.cpp
similarity index 73%
rename from pythonbindings/src/logger/logger.cpp
rename to pythonbindings/src/logger.cpp
index c4c99c0a5077303b398e0726eaba0420ddb0dceb..367ae693475eca064c128de47c88e56fca91a58e 100644
--- a/pythonbindings/src/logger/logger.cpp
+++ b/pythonbindings/src/logger.cpp
@@ -33,25 +33,23 @@
#include <pybind11/pybind11.h>
#include <logger/Logger.h>
-namespace logging
+namespace logger_bindings
{
+
namespace py = pybind11;
- py::module makeModule(py::module_ &parentModule)
+ PYBIND11_MODULE(logger, m)
{
- py::module loggerModule = parentModule.def_submodule("logger");
-
- py::class_<vf::logging::Logger>(loggerModule, "Logger")
+ py::class_<vf::logging::Logger>(m, "Logger")
.def_static("initialize_logger", &vf::logging::Logger::initializeLogger)
.def_static("change_log_path", &vf::logging::Logger::changeLogPath, py::arg("path"));
// use f-strings (f"text {float}") in python for compounded messages
- loggerModule.def("vf_log_trace", [](std::string message){ VF_LOG_TRACE(message); }, py::arg("message"));
- loggerModule.def("vf_log_debug", [](std::string message){ VF_LOG_DEBUG(message); }, py::arg("message"));
- loggerModule.def("vf_log_info", [](std::string message){ VF_LOG_INFO(message); }, py::arg("message"));
- loggerModule.def("vf_log_warning", [](std::string message){ VF_LOG_WARNING(message); }, py::arg("message"));
- loggerModule.def("vf_log_critical", [](std::string message){ VF_LOG_CRITICAL(message); }, py::arg("message"));
-
- return loggerModule;
+ m.def("vf_log_trace", [](std::string message){ VF_LOG_TRACE(message); }, py::arg("message"));
+ m.def("vf_log_debug", [](std::string message){ VF_LOG_DEBUG(message); }, py::arg("message"));
+ m.def("vf_log_info", [](std::string message){ VF_LOG_INFO(message); }, py::arg("message"));
+ m.def("vf_log_warning", [](std::string message){ VF_LOG_WARNING(message); }, py::arg("message"));
+ m.def("vf_log_critical", [](std::string message){ VF_LOG_CRITICAL(message); }, py::arg("message"));
}
-} // namespace logging
+}
+
diff --git a/regression-tests/flow_around_cylinder_test.sh b/regression-tests/flow_around_cylinder_test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..63f90886b79002dcffe6beb24e626922ca95fe78
--- /dev/null
+++ b/regression-tests/flow_around_cylinder_test.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+source ./regression-tests/__regression_test_executer.sh
+
+
+# 1. set reference data directory (must match the folder structure in https://github.com/irmb/test_data)
+REFERENCE_DATA_DIR=regression_tests/cpu/FlowAroundCylinder_2023_04
+
+# 2. set cmake flags for the build of VirtualFluids
+CMAKE_FLAGS="--preset=make_cpu -DCMAKE_BUILD_TYPE=Release"
+
+# 3. define the application to be executed
+APPLICATION="./build/bin/FlowAroundCylinder ./apps/cpu/FlowAroundCylinder/cylinder.cfg"
+
+# 4. set the path to the produced data
+RESULT_DATA_DIR=output/FlowAroundCylinder
+
+
+run_regression_test "$REFERENCE_DATA_DIR" "$CMAKE_FLAGS" "$APPLICATION" "$RESULT_DATA_DIR"
diff --git a/regression-tests/multigpu_test/rocket4GPU.yml b/regression-tests/multigpu_test/rocket4GPU.yml
index a05ffea6ad04e0d5cfb8d7749111726dfceb4609..a7ece055707c26a7a27e9c12be3447dc1b77855f 100755
--- a/regression-tests/multigpu_test/rocket4GPU.yml
+++ b/regression-tests/multigpu_test/rocket4GPU.yml
@@ -37,7 +37,7 @@ copy:
collect:
- from: multigpu_test/output/4GPU/
- to: output/4GPU
+ to: output/4GPU/
overwrite: true
- from: multigpu_test/slurm4GPU.out
@@ -45,7 +45,7 @@ collect:
overwrite: true
clean:
- - multigpu_test/output/*
+ - multigpu_test/*
sbatch: multigpu_test/slurm4GPU.job
continue_if_job_fails: true
diff --git a/regression-tests/multigpu_test/rocket8GPU.yml b/regression-tests/multigpu_test/rocket8GPU.yml
index e8cc08a9fa39425686a16d193dba1743533994bc..4b434fc8a2433dab513649800dbe3f160d986edd 100755
--- a/regression-tests/multigpu_test/rocket8GPU.yml
+++ b/regression-tests/multigpu_test/rocket8GPU.yml
@@ -37,7 +37,7 @@ copy:
collect:
- from: multigpu_test/output/8GPU/
- to: output/8GPU
+ to: output/8GPU/
overwrite: true
- from: multigpu_test/slurm8GPU.out
@@ -45,7 +45,7 @@ collect:
overwrite: true
clean:
- - multigpu_test/output/*
+ - multigpu_test/*
sbatch: multigpu_test/slurm8GPU.job
continue_if_job_fails: true
diff --git a/regression-tests/multigpu_test/slurm4GPU.job b/regression-tests/multigpu_test/slurm4GPU.job
index 886bfaf7479e01cfef285e9a2dae189258ce0b7e..0be42c51bac9a341b56eb705f9bdb518883f507d 100755
--- a/regression-tests/multigpu_test/slurm4GPU.job
+++ b/regression-tests/multigpu_test/slurm4GPU.job
@@ -2,16 +2,21 @@
#SBATCH --partition=gpu01_queue
#SBATCH --nodes=1
-#SBATCH --time=10:00:00
+#SBATCH --time=03:00:00
#SBATCH --job-name=Regr4GPU
#SBATCH --ntasks-per-node=4
#SBATCH --gres=gpu:4
#SBATCH --output=multigpu_test/slurm4GPU.out
##SBATCH --exclusive
-module purge
-module load comp/ccache/4.1 # loads comp/gcc/9.3.0
-module load mpi/openmpi/4.0.5_gcc_9.3/openmpi
+echo "SLURM_JOBID="$SLURM_JOBID
+echo "SLURM_JOB_NODELIST"=$SLURM_JOB_NODELIST
+echo "SLURM_NNODES"=$SLURM_NNODES
+echo "SLURM_TASKS_PER_NODE"=$SLURM_TASKS_PER_NODE
+
+module purge
+module load comp/gcc/10.2.0
+module load mpi/openmpi/4.0.5_gcc_9.3/openmpi
module load cuda/11.3
module load comp/git/2.27.0
PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
@@ -19,7 +24,7 @@ PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
module list
cd multigpu_test
-mkdir -p build
+rm -rf build && mkdir -p build
cd build
cmake .. -DBUILD_VF_GPU=ON -DCMAKE_CUDA_ARCHITECTURES=60 -DUSER_APPS=apps/gpu/LBM/DrivenCavityMultiGPU\;apps/gpu/LBM/SphereScaling
make -j 16
@@ -27,7 +32,7 @@ cd ..
mkdir -p output
echo $'\n\n\n\n---First test: DrivenCavityMultiGPU on 4 GPUs\n\n'
-mpirun -np 4 "./build/bin/DrivenCavityMultiGPU" "configPhoenix4GPU_regressionTest.txt"
+mpirun -np 4 "./build/bin/DrivenCavityMultiGPU" "apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix4GPU_regressionTest.txt"
echo $'\n\n\n\n---Second test: SphereScaling on 4 GPUs\n\n'
-mpirun -np 4 "./build/bin/SphereScaling" "configPhoenix4GPU_regressionTest.txt"
\ No newline at end of file
+mpirun -np 4 "./build/bin/SphereScaling" "apps/gpu/LBM/SphereScaling/configPhoenix4GPU_regressionTest.txt"
\ No newline at end of file
diff --git a/regression-tests/multigpu_test/slurm8GPU.job b/regression-tests/multigpu_test/slurm8GPU.job
index 333d5c77b176329947fb5d0452a0187208f323d4..bb7bf55c70eb6b178eff3f52e18c35d7cafd6938 100755
--- a/regression-tests/multigpu_test/slurm8GPU.job
+++ b/regression-tests/multigpu_test/slurm8GPU.job
@@ -2,16 +2,21 @@
#SBATCH --partition=gpu01_queue
#SBATCH --nodes=2
-#SBATCH --time=10:00:00
+#SBATCH --time=03:00:00
#SBATCH --job-name=Regr8GPU
#SBATCH --ntasks-per-node=4
#SBATCH --gres=gpu:4
#SBATCH --output=multigpu_test/slurm8GPU.out
##SBATCH --exclusive
-module purge
-module load comp/ccache/4.1 # loads comp/gcc/9.3.0
-module load mpi/openmpi/4.0.5_gcc_9.3/openmpi
+echo "SLURM_JOBID="$SLURM_JOBID
+echo "SLURM_JOB_NODELIST"=$SLURM_JOB_NODELIST
+echo "SLURM_NNODES"=$SLURM_NNODES
+echo "SLURM_TASKS_PER_NODE"=$SLURM_TASKS_PER_NODE
+
+module purge
+module load comp/gcc/10.2.0
+module load mpi/openmpi/4.0.5_gcc_9.3/openmpi
module load cuda/11.3
module load comp/git/2.27.0
PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
@@ -19,7 +24,7 @@ PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
module list
cd multigpu_test
-mkdir -p build
+rm -rf build && mkdir -p build
cd build
cmake .. -DBUILD_VF_GPU=ON -DCMAKE_CUDA_ARCHITECTURES=60 -DUSER_APPS=apps/gpu/LBM/DrivenCavityMultiGPU\;apps/gpu/LBM/SphereScaling
make -j 16
@@ -27,7 +32,7 @@ cd ..
mkdir -p output
echo $'\n\n\n\n---First test: DrivenCavityMultiGPU on 8 GPUs\n\n'
-mpirun -np 8 "./build/bin/DrivenCavityMultiGPU" "configPhoenix8GPU_regressionTest.txt"
+mpirun -np 8 "./build/bin/DrivenCavityMultiGPU" "apps/gpu/LBM/DrivenCavityMultiGPU/configPhoenix8GPU_regressionTest.txt"
echo $'\n\n\n\n---Second test: SphereScaling on 8 GPUs\n\n'
-mpirun -np 8 "./build/bin/SphereScaling" "configPhoenix8GPU_regressionTest.txt"
\ No newline at end of file
+mpirun -np 8 "./build/bin/SphereScaling" "apps/gpu/LBM/SphereScaling/configPhoenix8GPU_regressionTest.txt"
\ No newline at end of file
diff --git a/regression-tests/multigpu_test/utilities/parsejobid.py b/regression-tests/multigpu_test/utilities/parsejobid.py
new file mode 100644
index 0000000000000000000000000000000000000000..f209f6d3d0ac20243a94d16f89d2aaddeeae24f7
--- /dev/null
+++ b/regression-tests/multigpu_test/utilities/parsejobid.py
@@ -0,0 +1,20 @@
+from pathlib import Path
+import sys
+
+LAUNCH_MESSAGE = "Launched job"
+
+
+def parsejobid(file: str) -> str:
+ file_path = Path(file)
+ if not file_path.exists():
+ raise FileNotFoundError(file)
+
+ text_content = file_path.read_text().strip()
+ launch_line = next(
+ filter(lambda line: LAUNCH_MESSAGE in line, text_content.splitlines())
+ )
+ return launch_line.split()[-1].strip()
+
+
+if __name__ == "__main__":
+ print(parsejobid(sys.argv[1]))
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 5894f9dec06953c3eeb909af96db9cb19d202d65..0000000000000000000000000000000000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-[metadata]
-name = pyfluids
-description = Python binding for VirtualFluids
-long_description = file: README.md
-long_description_content_type = text/markdown
-platforms = any
-url = https://git.rz.tu-bs.de/irmb/virtualfluids
-version = 0.1.0
-
-[options]
-python_requires = >=3.6
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 530431b3775970b5222bc87d32bfb407363f95d6..0000000000000000000000000000000000000000
--- a/setup.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import sys
-from pathlib import Path
-from typing import List
-
-import skbuild
-
-"""
-Install python wrapper of Virtual Fluids
-install via python:
- python setup.py install
- set CMAKE Flags via -DBUILD_VF_GPU:BOOL=ON
- CMAKE flags have to be separated by --
- example: python setup.py install -- -DBUILD_VF_CPU:BOOL=ON
-or install via pip:
- pip install .
- for pip>21:
- set CMAKE Flags via --config-settings "-DBUILD_VF_GPU=ON"
- example: pip install . --config-settings="-DBUILD_VF_GPU=ON"
- each option has to be passed in individually i.e --config-settings="-DOPT1=ON" --config-settings="-DOPT2=OFF"
- for pip <21:
- set CMAKE Flags via --global-option ="-DBUILD_VF_GPU=ON"
- example: pip install . --global-option="-DBUILD_VF_GPU=ON"
-"""
-
-package_name = "pyfluids"
-target = "python_bindings"
-src_dir = "pythonbindings"
-stub_package = package_name+"-stubs"
-
-stub_dir = Path(src_dir)/stub_package
-
-
-def add_subfiles(dir_path: Path, suffix: str, root_dir: Path) -> List[str]:
- files = []
- for f in dir_path.iterdir():
- if f.is_dir():
- files.extend(add_subfiles(f, suffix, root_dir))
- if f.is_file():
- if f.suffix != suffix:
- continue
- files.append(str(f.relative_to(root_dir)))
- return files
-
-def add_directory(dir_path: Path, suffix: str):
- return add_subfiles(dir_path, suffix, dir_path)
-
-stub_files = add_directory(stub_dir, ".pyi")
-
-# hack to get config-args for installation with pip>21
-cmake_args = []
-if "config_args" in locals():
- cmake_args.extend([f"{k}={v}" for k, v in locals()["config_args"].items()])
-
-cmake_args += [
- f"-DPython3_ROOT_DIR={Path(sys.prefix)}",
- "-DBUILD_VF_PYTHON_BINDINGS=ON",
- "-DBUILD_SHARED_LIBS=OFF",
- "-DBUILD_VF_DOUBLE_ACCURACY=OFF",
- "-DBUILD_VF_UNIT_TESTS:BOOL=OFF",
- "-DBUILD_WARNINGS_AS_ERRORS=OFF",
- ]
-
-skbuild.setup(
- name=package_name,
- packages=[package_name, "pymuparser", "pyfluids-stubs"],
- package_dir={"": src_dir},
- cmake_args=cmake_args,
- cmake_install_target=target,
- package_data={ "pyfluids": ["py.typed"],
- "pyfluids-stubs": stub_files},
- include_package_data=True,
-)
diff --git a/src/basics/StringUtilities/StringUtilTest.cpp b/src/basics/StringUtilities/StringUtilTest.cpp
index 52f9511b3774a03f6d6f1e19536839825eff1394..0b229dfd8696490a02f01c0ed3f4fac859c6157c 100644
--- a/src/basics/StringUtilities/StringUtilTest.cpp
+++ b/src/basics/StringUtilities/StringUtilTest.cpp
@@ -6,12 +6,6 @@
#include "StringUtil.h"
-int main(int argc, char *argv[])
-{
- testing::InitGoogleTest(&argc, argv);
- testing::InitGoogleMock(&argc, argv);
- return RUN_ALL_TESTS();
-}
TEST(StringUtilTest, endsWith_shouldReturnTrue)
{
diff --git a/src/basics/config/ConfigurationFile.cpp b/src/basics/config/ConfigurationFile.cpp
index 547468cd2fd6aadccbdc5017230fcf6cdb803733..b714203913b739998cce007d98dccacb1cc99a4e 100644
--- a/src/basics/config/ConfigurationFile.cpp
+++ b/src/basics/config/ConfigurationFile.cpp
@@ -67,27 +67,19 @@ bool ConfigurationFile::load(const std::string& file)
return true;
}
-//////////////////////////////////////////////////////////////////////////
-template<>
-bool ConfigurationFile::fromString<bool>(const std::string& str) const
-{
- return str == "true";
-}
-
//////////////////////////////////////////////////////////////////////////
bool ConfigurationFile::contains(const std::string& key) const
{
return data.find(key) != data.end();
}
//////////////////////////////////////////////////////////////////////////
-std::string ConfigurationFile::getString(const std::string& key) const
+std::string ConfigurationFile::getValue(const std::string& key) const
{
std::map<std::string, std::string>::const_iterator iter = data.find(key);
if (iter != data.end())
{
- std::string value = iter->second;
- return value;
+ return iter->second;
}
else
{
diff --git a/src/basics/config/ConfigurationFile.h b/src/basics/config/ConfigurationFile.h
index 8ca12306e0ef321832efb19a2a428e6dc753df41..6c651b7039d91c7312c4b98f32e1a97b8b6433de 100644
--- a/src/basics/config/ConfigurationFile.h
+++ b/src/basics/config/ConfigurationFile.h
@@ -1,7 +1,8 @@
#ifndef BASICS_CONFIGURATIONFILE_H
#define BASICS_CONFIGURATIONFILE_H
-#include "Logger.h"
+#include <logger/Logger.h>
+
#include <filesystem>
#include <map>
#include <vector>
@@ -9,7 +10,7 @@
#include <string>
#include <fstream>
#include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
#include <basics/utilities/UbException.h>
@@ -38,7 +39,7 @@
//!bool writeLogFile = config.getValue<bool>("writeLogFile");
//!string errorMessage = config.getValue<string>("errorMessage");
//!vector<double> origin = config.getVector<double>("origin");
-//!
+//!
//! \author Konstantin Kutscher
@@ -70,36 +71,20 @@ public:
template<class T>
T getValue(const std::string& key, T defaultValue) const;
- static ConfigurationFile loadConfig(int argc, char *argv[], std::string configPath = "./config.txt")
- {
- // the config file's default path can be replaced by passing a command line argument
-
- if (argc > 1)
- {
- configPath = argv[1];
- VF_LOG_INFO("Using command line argument for config path: {}", configPath);
- } else {
- VF_LOG_INFO("Using default config path: {}", configPath);
- }
-
- vf::basics::ConfigurationFile config;
- config.load(configPath);
- return config;
- }
+ //! the container is public to test this class
+ std::map<std::string, std::string> data;
private:
//! the container
- std::map<std::string, std::string> data;
-
//! get string with key
- std::string getString(const std::string& key) const;
+ std::string getValue(const std::string& key) const;
//! remove leading and trailing tabs and spaces
static std::string trim(const std::string& str);
//! convert string to data type T
template<class T>
- T fromString(const std::string& str) const;
+ T convert_to(const std::string& str) const;
void split(std::vector<std::string>& lst, const std::string& input, const std::string& separators, bool remove_empty = true) const;
};
@@ -109,56 +94,44 @@ private:
template<class T>
std::vector<T> ConfigurationFile::getVector(const std::string& key) const
{
- std::string str = getString(key);
- std::vector<T> v;
- std::vector<std::string> strings;
- split(strings, str, "\t\n\r;, ");
- for (std::vector<std::string>::iterator it = strings.begin(); it != strings.end(); ++it)
+ std::string string_value = getValue(key);
+ std::vector<T> values;
+ std::vector<std::string> string_vector;
+ split(string_vector, string_value, "\t\n\r;, ");
+ for (std::vector<std::string>::iterator it = string_vector.begin(); it != string_vector.end(); ++it)
{
if (*it != "")
{
- v.push_back(fromString<T>(*it));
+ values.push_back(convert_to<T>(*it));
}
}
- return v;
+ return values;
}
//////////////////////////////////////////////////////////////////////////
template<class T>
-T ConfigurationFile::fromString(const std::string& str) const
+T ConfigurationFile::convert_to(const std::string& value) const
{
- std::istringstream stream(str);
+ if constexpr (std::is_same_v<T, bool>)
+ {
+ return (value == "true");
+ }
+
+ std::istringstream stream(value);
T t;
stream >> t;
+ if (stream.fail())
+ throw UbException(UB_EXARGS, " cannot convert \"" + value + "\" to type <" + static_cast<std::string>(typeid(t).name()) + ">");
+
return t;
}
-template<>
-bool ConfigurationFile::fromString<bool>(const std::string& str) const;
-
//////////////////////////////////////////////////////////////////////////
template<class T>
T ConfigurationFile::getValue(const std::string& key) const
{
- std::string str = getString(key);
- bool bFlag = false;
- if ((std::string)typeid(T).name() == (std::string)typeid(bool).name())
- {
- bFlag = true;
- }
-
- std::istringstream iss(str);
- T x;
- iss >> x;
- if (!iss && !bFlag)
- UB_THROW(UbException(UB_EXARGS, " cannot convert \"" + str + "\" to type <" + static_cast<std::string>(typeid(x).name()) + ">"));
+ std::string value = getValue(key);
- if (bFlag)
- {
- bool value = (str == "true");
- x = value;
- }
-
- return x;
+ return convert_to<T>(value);
}
template<class T>
@@ -174,6 +147,24 @@ T ConfigurationFile::getValue(const std::string& key, T defaultValue) const
}
}
+static ConfigurationFile loadConfig(int argc, char *argv[], std::string configPath = "./config.txt")
+{
+ // the config file's default path can be replaced by passing a command line argument
+
+ if (argc > 1)
+ {
+ configPath = argv[1];
+ VF_LOG_INFO("Using command line argument for config path: {}", configPath);
+ } else {
+ VF_LOG_INFO("Using default config path: {}", configPath);
+ }
+
+ vf::basics::ConfigurationFile config;
+ config.load(configPath);
+ return config;
+}
+
+
}
#endif
diff --git a/src/basics/config/ConfigurationFileTest.cpp b/src/basics/config/ConfigurationFileTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f935b4ab95287cc8e2a20c882bd89b74d636cdf6
--- /dev/null
+++ b/src/basics/config/ConfigurationFileTest.cpp
@@ -0,0 +1,124 @@
+#include <gmock/gmock.h>
+
+#include "ConfigurationFile.h"
+
+using namespace vf::basics;
+
+TEST(ConfigurationFileTest, ContainsReturnsTrueForExistingKey)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "value1";
+ config.data["key2"] = "value2";
+
+ EXPECT_TRUE(config.contains("key1"));
+ EXPECT_TRUE(config.contains("key2"));
+}
+
+TEST(ConfigurationFileTest, ContainsReturnsFalseForMissingKey)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "value1";
+
+ EXPECT_FALSE(config.contains("key2"));
+}
+
+TEST(ConfigurationFileTest, GetValueReturnsCorrectValue)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "value1";
+ config.data["key2"] = "1234";
+
+ EXPECT_EQ(config.getValue<std::string>("key1"), "value1");
+ EXPECT_EQ(config.getValue<int>("key2"), 1234);
+}
+
+TEST(ConfigurationFileTest, GetValueThrowsExceptionForMissingKey)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "value1";
+
+ EXPECT_THROW(config.getValue<std::string>("key2"), UbException);
+}
+
+TEST(ConfigurationFileTest, GetVectorReturnsCorrectValues)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "1, 2, 3";
+ config.data["key2"] = "4; 5; 6";
+
+ std::vector<int> v1 = config.getVector<int>("key1");
+ std::vector<int> v2 = config.getVector<int>("key2");
+
+ EXPECT_EQ(v1.size(), 3);
+ EXPECT_EQ(v1[0], 1);
+ EXPECT_EQ(v1[1], 2);
+ EXPECT_EQ(v1[2], 3);
+
+ EXPECT_EQ(v2.size(), 3);
+ EXPECT_EQ(v2[0], 4);
+ EXPECT_EQ(v2[1], 5);
+ EXPECT_EQ(v2[2], 6);
+}
+
+TEST(ConfigurationFileTest, GetVectorThrowsExceptionForMissingKey)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "1, 2, 3";
+
+ EXPECT_THROW(config.getVector<int>("key2"), UbException);
+}
+
+TEST(ConfigurationFileTest, GetValueReturnsDefaultValueForMissingKey)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "value1";
+
+ int defaultValue = 42;
+ int value = config.getValue<int>("key2", defaultValue);
+
+ EXPECT_EQ(value, defaultValue);
+}
+
+TEST(ConfigurationFileTest, GetValueReturnsCorrectValueForExistingKey)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "42";
+
+ int defaultValue = 0;
+ int value = config.getValue<int>("key1", defaultValue);
+
+ EXPECT_EQ(value, 42);
+}
+
+TEST(ConfigurationFileTest, FromStringConvertsValueToBool)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "true";
+ config.data["key2"] = "false";
+
+ bool valueTrue = config.getValue<bool>("key1");
+ bool valueFalse = config.getValue<bool>("key2");
+
+ EXPECT_TRUE(valueTrue);
+ EXPECT_FALSE(valueFalse);
+}
+
+
+TEST(ConfigurationFileTest, GetValueThrowsExceptionForWrongTypeConversion)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "text";
+
+ EXPECT_THROW(config.getVector<int>("key1"), UbException);;
+}
+
+TEST(ConfigurationFileTest, ClearRemovesAllData)
+{
+ ConfigurationFile config;
+ config.data["key1"] = "value1";
+ config.data["key2"] = "value2";
+
+ config.clear();
+
+ EXPECT_TRUE(config.data.empty());
+}
\ No newline at end of file
diff --git a/src/basics/utilities/UbFileOutputBinary.cpp b/src/basics/utilities/UbFileOutputBinary.cpp
index ce9fca58f7eddd8d0ec3cc4a7d0ecf48fb2f4691..9b3ef2d26d920961fb20f825c5bd80a80a3d2185 100644
--- a/src/basics/utilities/UbFileOutputBinary.cpp
+++ b/src/basics/utilities/UbFileOutputBinary.cpp
@@ -68,7 +68,7 @@ UbFileOutputBinary::UbFileOutputBinary(const string &filename, UbFileOutput::CRE
string path = UbSystem::getPathFromString(filename);
if (path.size() > 0) {
outfile.clear(); // flags ruecksetzen (ansonsten liefert utern if(!outfile) weiterhin true!!!
- UbSystem::makeDirectory(path, 20);
+ UbSystem::makeDirectory(path);
this->open(filename, opt);
}
diff --git a/src/basics/utilities/UbSystem.h b/src/basics/utilities/UbSystem.h
index 0436a360c2b595115824e1b7906214621bd76314..ea25c4166dbc82adf1627a07cf1caecbd3448bf5 100644
--- a/src/basics/utilities/UbSystem.h
+++ b/src/basics/utilities/UbSystem.h
@@ -276,24 +276,26 @@ inline bool isDirectory(const std::string &dir, const unsigned & /*attemptions*/
#if defined(CAB_BOOST)
static boost::mutex mtx_makeDirectory;
#endif
-inline bool makeDirectory(const std::string &dir, const unsigned &attemptions = 3)
+inline bool makeDirectory(const std::string &dir)
{
- UBLOG(logDEBUG5, "UbSystem::makeDirectory - start, dir=" << dir << " #attemptions=" << attemptions);
+ UBLOG(logDEBUG5, "UbSystem::makeDirectory - start, dir=" << dir);
if (dir.empty())
UB_THROW(UbException(UB_EXARGS, "dir is empty"));
std::string path = UbSystem::replaceInString(dir, "\\", "/");
bool dirCreated = true;
-#if defined UBSYSTEM_WINDOWS
+
if (path[path.size() - 1] != '/')
path += "/";
size_t pos = 0;
+
while ((pos = path.find("/", pos + 1)) != std::string::npos) {
std::string tmpdir = path.substr(0, pos);
#if defined(CAB_BOOST)
boost::mutex::scoped_lock lock(mtx_makeDirectory);
#endif
+#if defined UBSYSTEM_WINDOWS
if (
#ifndef _UNICODE
_access(tmpdir.c_str(), 0) == -1 && _mkdir(tmpdir.c_str()) == -1
@@ -301,34 +303,23 @@ inline bool makeDirectory(const std::string &dir, const unsigned &attemptions =
_waccess(tmpdir.c_str(), 0) == -1 && _wmkdir(tmpdir.c_str()) == -1
#endif
) {
- UBLOG(logDEBUG5, "UbSystem::makeDirectory- dir=\"" << tmpdir << "\" doesn't exit or makedir failed");
+ UBLOG(logDEBUG5, "UbSystem::makeDirectory - dir=\"" << tmpdir << "\" - doesn't exist or makedir failed");
dirCreated = false;
break;
}
- }
#elif defined(UBSYSTEM_LINUX) || defined(UBSYSTEM_APPLE) || defined(UBSYSTEM_AIX)
- std::string command = "mkdir -p \"" + path + "\"";
- {
-#if defined(CAB_BOOST)
- boost::mutex::scoped_lock lock(mtx_makeDirectory);
-#endif
- if (system(command.c_str()) != 0) {
- UBLOG(logDEBUG5, "UbSystem::makeDirectory- dir=\"" << path << "\" doesn't exit or makedir failed");
+ int status = mkdir(tmpdir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+ if (status == 0) {
+ UBLOG(logDEBUG5,"UbSystem::makeDirectory - dir=\"" << tmpdir << " - directory created successfully.");
+ dirCreated = true;
+ } else {
+ UBLOG(logDEBUG5,"UbSystem::makeDirectory - dir=\"" << tmpdir << " - mkdir() failed" << " ERROR: " << strerror(errno));
dirCreated = false;
}
- }
#else
#error "UbSystem::makeDirectory - UnknownMachine"
#endif
-
- if (!dirCreated && attemptions > 1) {
- UBLOG(logDEBUG5, "UbSystem::makeDirectory - internal call of UbSystem::makeDirectory");
- UbSystem::sleepMs(500);
- dirCreated = UbSystem::makeDirectory(path, attemptions - 1);
}
-
- UBLOG(logDEBUG5,
- "UbSystem::makeDirectory - end (success=" << dirCreated << ", attemptions = " << attemptions << ")");
return dirCreated;
}
/*==========================================================*/
diff --git a/src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.cpp b/src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.cpp
index 9be87887a26d654d03dc8a32ed9e456ec352fef2..c745e8a67b5a628321e27ea1132b55fba4bebd95 100644
--- a/src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.cpp
+++ b/src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.cpp
@@ -70,7 +70,7 @@ void LiggghtsCouplingWrapper::setVariable(char const *name, std::string &value)
void LiggghtsCouplingWrapper::run(int nSteps)
{
std::stringstream cmd;
- cmd << "run " << nSteps;
+ cmd << "run " << nSteps << " pre no post no";
execCommand(cmd);
}
void LiggghtsCouplingWrapper::runUpto(int nSteps)
diff --git a/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.cpp b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.cpp
index ea39fc17d606498a4b977d77a5151f4fff6e216c..efe93f4c951684e41e6dd1c4d2b81c57c711727f 100644
--- a/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.cpp
+++ b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.cpp
@@ -27,7 +27,7 @@
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \file IBcumulantK17LBMKernel.cpp
-//! \ingroup LBM
+//! \ingroup LiggghtsCoupling
//! \author Konstantin Kutscher, Martin Geier
//=======================================================================================
#include "IBcumulantK17LBMKernel.h"
@@ -134,9 +134,9 @@ void IBcumulantK17LBMKernel::calculate(int step)
}
/////////////////////////////////////
- localDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getLocalDistributions();
- nonLocalDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
- restDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
+ localDistributionsF = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getLocalDistributions();
+ nonLocalDistributionsF = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
+ restDistributionsF = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
@@ -191,35 +191,35 @@ void IBcumulantK17LBMKernel::calculate(int step)
// a b c
//-1 0 1
- LBMReal mfcbb = (*this->localDistributions)(D3Q27System::ET_E, x1, x2, x3);
- LBMReal mfbcb = (*this->localDistributions)(D3Q27System::ET_N, x1, x2, x3);
- LBMReal mfbbc = (*this->localDistributions)(D3Q27System::ET_T, x1, x2, x3);
- LBMReal mfccb = (*this->localDistributions)(D3Q27System::ET_NE, x1, x2, x3);
- LBMReal mfacb = (*this->localDistributions)(D3Q27System::ET_NW, x1p, x2, x3);
- LBMReal mfcbc = (*this->localDistributions)(D3Q27System::ET_TE, x1, x2, x3);
- LBMReal mfabc = (*this->localDistributions)(D3Q27System::ET_TW, x1p, x2, x3);
- LBMReal mfbcc = (*this->localDistributions)(D3Q27System::ET_TN, x1, x2, x3);
- LBMReal mfbac = (*this->localDistributions)(D3Q27System::ET_TS, x1, x2p, x3);
- LBMReal mfccc = (*this->localDistributions)(D3Q27System::ET_TNE, x1, x2, x3);
- LBMReal mfacc = (*this->localDistributions)(D3Q27System::ET_TNW, x1p, x2, x3);
- LBMReal mfcac = (*this->localDistributions)(D3Q27System::ET_TSE, x1, x2p, x3);
- LBMReal mfaac = (*this->localDistributions)(D3Q27System::ET_TSW, x1p, x2p, x3);
-
- LBMReal mfabb = (*this->nonLocalDistributions)(D3Q27System::ET_W, x1p, x2, x3);
- LBMReal mfbab = (*this->nonLocalDistributions)(D3Q27System::ET_S, x1, x2p, x3);
- LBMReal mfbba = (*this->nonLocalDistributions)(D3Q27System::ET_B, x1, x2, x3p);
- LBMReal mfaab = (*this->nonLocalDistributions)(D3Q27System::ET_SW, x1p, x2p, x3);
- LBMReal mfcab = (*this->nonLocalDistributions)(D3Q27System::ET_SE, x1, x2p, x3);
- LBMReal mfaba = (*this->nonLocalDistributions)(D3Q27System::ET_BW, x1p, x2, x3p);
- LBMReal mfcba = (*this->nonLocalDistributions)(D3Q27System::ET_BE, x1, x2, x3p);
- LBMReal mfbaa = (*this->nonLocalDistributions)(D3Q27System::ET_BS, x1, x2p, x3p);
- LBMReal mfbca = (*this->nonLocalDistributions)(D3Q27System::ET_BN, x1, x2, x3p);
- LBMReal mfaaa = (*this->nonLocalDistributions)(D3Q27System::ET_BSW, x1p, x2p, x3p);
- LBMReal mfcaa = (*this->nonLocalDistributions)(D3Q27System::ET_BSE, x1, x2p, x3p);
- LBMReal mfaca = (*this->nonLocalDistributions)(D3Q27System::ET_BNW, x1p, x2, x3p);
- LBMReal mfcca = (*this->nonLocalDistributions)(D3Q27System::ET_BNE, x1, x2, x3p);
-
- LBMReal mfbbb = (*this->restDistributions)(x1, x2, x3);
+ LBMReal mfcbb = (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3);
+ LBMReal mfbcb = (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3);
+ LBMReal mfbbc = (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3);
+ LBMReal mfccb = (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3);
+ LBMReal mfacb = (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3);
+ LBMReal mfcbc = (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3);
+ LBMReal mfabc = (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3);
+ LBMReal mfbcc = (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3);
+ LBMReal mfbac = (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3);
+ LBMReal mfccc = (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3);
+ LBMReal mfacc = (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3);
+ LBMReal mfcac = (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3);
+ LBMReal mfaac = (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3);
+
+ LBMReal mfabb = (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3);
+ LBMReal mfbab = (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3);
+ LBMReal mfbba = (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p);
+ LBMReal mfaab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3);
+ LBMReal mfcab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3);
+ LBMReal mfaba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p);
+ LBMReal mfcba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p);
+ LBMReal mfbaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p);
+ LBMReal mfbca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p);
+ LBMReal mfaaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ LBMReal mfcaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ LBMReal mfaca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ LBMReal mfcca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p);
+
+ LBMReal mfbbb = (*this->restDistributionsF)(x1, x2, x3);
LBMReal f[D3Q27System::ENDF + 1];
LBMReal fEq[D3Q27System::ENDF + 1];
@@ -753,35 +753,35 @@ void IBcumulantK17LBMKernel::calculate(int step)
//! href="https://doi.org/10.3390/computation5020019"><b>[ M. Geier et al. (2017),
//! DOI:10.3390/computation5020019 ]</b></a>
//!
- (*this->localDistributions)(D3Q27System::ET_E, x1, x2, x3) = mfabb;
- (*this->localDistributions)(D3Q27System::ET_N, x1, x2, x3) = mfbab;
- (*this->localDistributions)(D3Q27System::ET_T, x1, x2, x3) = mfbba;
- (*this->localDistributions)(D3Q27System::ET_NE, x1, x2, x3) = mfaab;
- (*this->localDistributions)(D3Q27System::ET_NW, x1p, x2, x3) = mfcab;
- (*this->localDistributions)(D3Q27System::ET_TE, x1, x2, x3) = mfaba;
- (*this->localDistributions)(D3Q27System::ET_TW, x1p, x2, x3) = mfcba;
- (*this->localDistributions)(D3Q27System::ET_TN, x1, x2, x3) = mfbaa;
- (*this->localDistributions)(D3Q27System::ET_TS, x1, x2p, x3) = mfbca;
- (*this->localDistributions)(D3Q27System::ET_TNE, x1, x2, x3) = mfaaa;
- (*this->localDistributions)(D3Q27System::ET_TNW, x1p, x2, x3) = mfcaa;
- (*this->localDistributions)(D3Q27System::ET_TSE, x1, x2p, x3) = mfaca;
- (*this->localDistributions)(D3Q27System::ET_TSW, x1p, x2p, x3) = mfcca;
-
- (*this->nonLocalDistributions)(D3Q27System::ET_W, x1p, x2, x3) = mfcbb;
- (*this->nonLocalDistributions)(D3Q27System::ET_S, x1, x2p, x3) = mfbcb;
- (*this->nonLocalDistributions)(D3Q27System::ET_B, x1, x2, x3p) = mfbbc;
- (*this->nonLocalDistributions)(D3Q27System::ET_SW, x1p, x2p, x3) = mfccb;
- (*this->nonLocalDistributions)(D3Q27System::ET_SE, x1, x2p, x3) = mfacb;
- (*this->nonLocalDistributions)(D3Q27System::ET_BW, x1p, x2, x3p) = mfcbc;
- (*this->nonLocalDistributions)(D3Q27System::ET_BE, x1, x2, x3p) = mfabc;
- (*this->nonLocalDistributions)(D3Q27System::ET_BS, x1, x2p, x3p) = mfbcc;
- (*this->nonLocalDistributions)(D3Q27System::ET_BN, x1, x2, x3p) = mfbac;
- (*this->nonLocalDistributions)(D3Q27System::ET_BSW, x1p, x2p, x3p) = mfccc;
- (*this->nonLocalDistributions)(D3Q27System::ET_BSE, x1, x2p, x3p) = mfacc;
- (*this->nonLocalDistributions)(D3Q27System::ET_BNW, x1p, x2, x3p) = mfcac;
- (*this->nonLocalDistributions)(D3Q27System::ET_BNE, x1, x2, x3p) = mfaac;
-
- (*this->restDistributions)(x1, x2, x3) = mfbbb;
+ (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3) = mfabb;
+ (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3) = mfbab;
+ (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3) = mfbba;
+ (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3) = mfaab;
+ (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3) = mfcab;
+ (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3) = mfaba;
+ (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3) = mfcba;
+ (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3) = mfbaa;
+ (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3) = mfbca;
+ (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3) = mfaaa;
+ (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3) = mfcaa;
+ (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3) = mfaca;
+ (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3) = mfcca;
+
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3) = mfcbb;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3) = mfbcb;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p) = mfbbc;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3) = mfccb;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3) = mfacb;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p) = mfcbc;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p) = mfabc;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p) = mfbcc;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p) = mfbac;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p) = mfccc;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p) = mfacc;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p) = mfcac;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p) = mfaac;
+
+ (*this->restDistributionsF)(x1, x2, x3) = mfbbb;
//////////////////////////////////////////////////////////////////////////
f[vf::lbm::dir::DIR_000] = mfbbb;
@@ -813,91 +813,93 @@ void IBcumulantK17LBMKernel::calculate(int step)
f[vf::lbm::dir::DIR_MPM] = mfaca;
f[vf::lbm::dir::DIR_PPM] = mfcca;
}
- if ((*particleData)(x1, x2, x3)->solidFraction < SOLFRAC_MIN)
- continue;
-
- LBMReal vx1, vx2, vx3, drho;
- D3Q27System::calcCompMacroscopicValues(f, drho, vx1, vx2, vx3);
- D3Q27System::calcCompFeq(fEq, drho, vx1, vx2, vx3);
-
- std::array<double, 3> uPart;
- uPart[0] = (*particleData)(x1, x2, x3)->uPart[0] * (1. + drho);
- uPart[1] = (*particleData)(x1, x2, x3)->uPart[1] * (1. + drho);
- uPart[2] = (*particleData)(x1, x2, x3)->uPart[2] * (1. + drho);
-
- D3Q27System::calcCompFeq(fEqSolid, drho, uPart[0], uPart[1], uPart[2]);
-
- if ((*particleData)(x1, x2, x3)->solidFraction > SOLFRAC_MAX) {
- double const bb0 = fEq[vf::lbm::dir::DIR_000] - fEqSolid[vf::lbm::dir::DIR_000];
- f[vf::lbm::dir::DIR_000] = fPre[vf::lbm::dir::DIR_000] + bb0;
- for (int iPop = D3Q27System::FSTARTDIR; iPop <= D3Q27System::FENDDIR; iPop++) {
- const int iOpp = D3Q27System::INVDIR[iPop];
- double const bb = ((fPre[iOpp] - fEq[iOpp]) - (fPre[iPop] - fEqSolid[iPop]));
- double const bbOpp = ((fPre[iPop] - fEq[iPop]) - (fPre[iOpp] - fEqSolid[iOpp]));
-
-
- f[iPop] = fPre[iPop] + bb;
- f[iOpp] = fPre[iOpp] + bbOpp;
-
- (*particleData)(x1, x2, x3)->hydrodynamicForce[0] -= D3Q27System::DX1[iPop] * (bb - bbOpp);
- (*particleData)(x1, x2, x3)->hydrodynamicForce[1] -= D3Q27System::DX2[iPop] * (bb - bbOpp);
- (*particleData)(x1, x2, x3)->hydrodynamicForce[2] -= D3Q27System::DX3[iPop] * (bb - bbOpp);
- }
- } else { /* particleData.solidFraction < SOLFRAC_MAX */
-//#ifdef LBDEM_USE_WEIGHING
- double const ooo = 1. / omega - 0.5;
- double const B = (*particleData)(x1, x2, x3)->solidFraction * ooo / ((1. - (*particleData)(x1, x2, x3)->solidFraction) + ooo);
-//#else
-// T const B = particleData.solidFraction;
-//#endif
- double const oneMinB = 1. - B;
-
- double const bb0 = fEq[vf::lbm::dir::DIR_000] - fEqSolid[vf::lbm::dir::DIR_000];
- f[vf::lbm::dir::DIR_000] = fPre[vf::lbm::dir::DIR_000] + oneMinB * (f[vf::lbm::dir::DIR_000] - fPre[vf::lbm::dir::DIR_000]) + B * bb0;
-
- for (int iPop = D3Q27System::FSTARTDIR; iPop <= D3Q27System::FENDDIR; iPop++) {
- int const iOpp = D3Q27System::INVDIR[iPop];
- double const bb = B * ((fPre[iOpp] - fEq[iOpp]) - (fPre[iPop] - fEqSolid[iPop]));
- double const bbOpp = B * ((fPre[iPop] - fEq[iPop]) - (fPre[iOpp] - fEqSolid[iOpp]));
-
- f[iPop] = fPre[iPop] + oneMinB * (f[iPop] - fPre[iPop]) + bb;
- f[iOpp] = fPre[iOpp] + oneMinB * (f[iOpp] - fPre[iOpp]) + bbOpp;
-
- (*particleData)(x1, x2, x3)->hydrodynamicForce[0] -= D3Q27System::DX1[iPop] * (bb - bbOpp);
- (*particleData)(x1, x2, x3)->hydrodynamicForce[1] -= D3Q27System::DX2[iPop] * (bb - bbOpp);
- (*particleData)(x1, x2, x3)->hydrodynamicForce[2] -= D3Q27System::DX3[iPop] * (bb - bbOpp);
- }
- } /* if solidFraction > SOLFRAC_MAX */
-
- (*this->restDistributions)(x1, x2, x3) = f[vf::lbm::dir::DIR_000];
-
- (*this->localDistributions)(D3Q27System::ET_E, x1, x2, x3) = f[vf::lbm::dir::DIR_M00];
- (*this->localDistributions)(D3Q27System::ET_N, x1, x2, x3) = f[vf::lbm::dir::DIR_0M0];
- (*this->localDistributions)(D3Q27System::ET_T, x1, x2, x3) = f[vf::lbm::dir::DIR_00M];
- (*this->localDistributions)(D3Q27System::ET_NE, x1, x2, x3) = f[vf::lbm::dir::DIR_MM0];
- (*this->localDistributions)(D3Q27System::ET_NW, x1p, x2, x3) = f[vf::lbm::dir::DIR_PM0];
- (*this->localDistributions)(D3Q27System::ET_TE, x1, x2, x3) = f[vf::lbm::dir::DIR_M0M];
- (*this->localDistributions)(D3Q27System::ET_TW, x1p, x2, x3) = f[vf::lbm::dir::DIR_P0M];
- (*this->localDistributions)(D3Q27System::ET_TN, x1, x2, x3) = f[vf::lbm::dir::DIR_0MM];
- (*this->localDistributions)(D3Q27System::ET_TS, x1, x2p, x3) = f[vf::lbm::dir::DIR_0PM];
- (*this->localDistributions)(D3Q27System::ET_TNE, x1, x2, x3) = f[vf::lbm::dir::DIR_MMM];
- (*this->localDistributions)(D3Q27System::ET_TNW, x1p, x2, x3) = f[vf::lbm::dir::DIR_PMM];
- (*this->localDistributions)(D3Q27System::ET_TSE, x1, x2p, x3) = f[vf::lbm::dir::DIR_MPM];
- (*this->localDistributions)(D3Q27System::ET_TSW, x1p, x2p, x3) = f[vf::lbm::dir::DIR_PPM];
-
- (*this->nonLocalDistributions)(D3Q27System::ET_W, x1p, x2, x3) = f[vf::lbm::dir::DIR_P00];
- (*this->nonLocalDistributions)(D3Q27System::ET_S, x1, x2p, x3) = f[vf::lbm::dir::DIR_0P0];
- (*this->nonLocalDistributions)(D3Q27System::ET_B, x1, x2, x3p) = f[vf::lbm::dir::DIR_00P];
- (*this->nonLocalDistributions)(D3Q27System::ET_SW, x1p, x2p, x3) = f[vf::lbm::dir::DIR_PP0];
- (*this->nonLocalDistributions)(D3Q27System::ET_SE, x1, x2p, x3) = f[vf::lbm::dir::DIR_MP0];
- (*this->nonLocalDistributions)(D3Q27System::ET_BW, x1p, x2, x3p) = f[vf::lbm::dir::DIR_P0P];
- (*this->nonLocalDistributions)(D3Q27System::ET_BE, x1, x2, x3p) = f[vf::lbm::dir::DIR_M0P];
- (*this->nonLocalDistributions)(D3Q27System::ET_BS, x1, x2p, x3p) = f[vf::lbm::dir::DIR_0PP];
- (*this->nonLocalDistributions)(D3Q27System::ET_BN, x1, x2, x3p) = f[vf::lbm::dir::DIR_0MP];
- (*this->nonLocalDistributions)(D3Q27System::ET_BSW, x1p, x2p, x3p) = f[vf::lbm::dir::DIR_PPP];
- (*this->nonLocalDistributions)(D3Q27System::ET_BSE, x1, x2p, x3p) = f[vf::lbm::dir::DIR_MPP];
- (*this->nonLocalDistributions)(D3Q27System::ET_BNW, x1p, x2, x3p) = f[vf::lbm::dir::DIR_PMP];
- (*this->nonLocalDistributions)(D3Q27System::ET_BNE, x1, x2, x3p) = f[vf::lbm::dir::DIR_MMP];
+ if ((*particleData)(x1, x2, x3)->solidFraction >= SOLFRAC_MIN) {
+ // if ((*particleData)(x1, x2, x3)->solidFraction < SOLFRAC_MIN)
+ // continue;
+ //
+ LBMReal vx1, vx2, vx3, drho;
+ D3Q27System::calcCompMacroscopicValues(f, drho, vx1, vx2, vx3);
+ D3Q27System::calcCompFeq(fEq, drho, vx1, vx2, vx3);
+
+ std::array<double, 3> uPart;
+ uPart[0] = (*particleData)(x1, x2, x3)->uPart[0] * (1. + drho);
+ uPart[1] = (*particleData)(x1, x2, x3)->uPart[1] * (1. + drho);
+ uPart[2] = (*particleData)(x1, x2, x3)->uPart[2] * (1. + drho);
+
+ D3Q27System::calcCompFeq(fEqSolid, drho, uPart[0], uPart[1], uPart[2]);
+
+ if ((*particleData)(x1, x2, x3)->solidFraction > SOLFRAC_MAX) {
+ double const bb0 = fEq[vf::lbm::dir::DIR_000] - fEqSolid[vf::lbm::dir::DIR_000];
+ f[vf::lbm::dir::DIR_000] = fPre[vf::lbm::dir::DIR_000] + bb0;
+ for (int iPop = D3Q27System::FSTARTDIR; iPop <= D3Q27System::FENDDIR; iPop++) {
+ const int iOpp = D3Q27System::INVDIR[iPop];
+ double const bb = ((fPre[iOpp] - fEq[iOpp]) - (fPre[iPop] - fEqSolid[iPop]));
+ double const bbOpp = ((fPre[iPop] - fEq[iPop]) - (fPre[iOpp] - fEqSolid[iOpp]));
+
+
+ f[iPop] = fPre[iPop] + bb;
+ f[iOpp] = fPre[iOpp] + bbOpp;
+
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[0] -= D3Q27System::DX1[iPop] * (bb - bbOpp);
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[1] -= D3Q27System::DX2[iPop] * (bb - bbOpp);
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[2] -= D3Q27System::DX3[iPop] * (bb - bbOpp);
+ }
+ } else { /* particleData.solidFraction < SOLFRAC_MAX */
+ //#ifdef LBDEM_USE_WEIGHING
+ double const ooo = 1. / omega - 0.5;
+ double const B = (*particleData)(x1, x2, x3)->solidFraction * ooo / ((1. - (*particleData)(x1, x2, x3)->solidFraction) + ooo);
+ //#else
+ // T const B = particleData.solidFraction;
+ //#endif
+ double const oneMinB = 1. - B;
+
+ double const bb0 = fEq[vf::lbm::dir::DIR_000] - fEqSolid[vf::lbm::dir::DIR_000];
+ f[vf::lbm::dir::DIR_000] = fPre[vf::lbm::dir::DIR_000] + oneMinB * (f[vf::lbm::dir::DIR_000] - fPre[vf::lbm::dir::DIR_000]) + B * bb0;
+
+ for (int iPop = D3Q27System::FSTARTDIR; iPop <= D3Q27System::FENDDIR; iPop++) {
+ int const iOpp = D3Q27System::INVDIR[iPop];
+ double const bb = B * ((fPre[iOpp] - fEq[iOpp]) - (fPre[iPop] - fEqSolid[iPop]));
+ double const bbOpp = B * ((fPre[iPop] - fEq[iPop]) - (fPre[iOpp] - fEqSolid[iOpp]));
+
+ f[iPop] = fPre[iPop] + oneMinB * (f[iPop] - fPre[iPop]) + bb;
+ f[iOpp] = fPre[iOpp] + oneMinB * (f[iOpp] - fPre[iOpp]) + bbOpp;
+
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[0] -= D3Q27System::DX1[iPop] * (bb - bbOpp);
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[1] -= D3Q27System::DX2[iPop] * (bb - bbOpp);
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[2] -= D3Q27System::DX3[iPop] * (bb - bbOpp);
+ }
+ } /* if solidFraction > SOLFRAC_MAX */
+
+ (*this->restDistributionsF)(x1, x2, x3) = f[vf::lbm::dir::DIR_000];
+
+ (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3) = f[vf::lbm::dir::DIR_M00];
+ (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3) = f[vf::lbm::dir::DIR_0M0];
+ (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3) = f[vf::lbm::dir::DIR_00M];
+ (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3) = f[vf::lbm::dir::DIR_MM0];
+ (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3) = f[vf::lbm::dir::DIR_PM0];
+ (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3) = f[vf::lbm::dir::DIR_M0M];
+ (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3) = f[vf::lbm::dir::DIR_P0M];
+ (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3) = f[vf::lbm::dir::DIR_0MM];
+ (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3) = f[vf::lbm::dir::DIR_0PM];
+ (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3) = f[vf::lbm::dir::DIR_MMM];
+ (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3) = f[vf::lbm::dir::DIR_PMM];
+ (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3) = f[vf::lbm::dir::DIR_MPM];
+ (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3) = f[vf::lbm::dir::DIR_PPM];
+
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3) = f[vf::lbm::dir::DIR_P00];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3) = f[vf::lbm::dir::DIR_0P0];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p) = f[vf::lbm::dir::DIR_00P];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3) = f[vf::lbm::dir::DIR_PP0];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3) = f[vf::lbm::dir::DIR_MP0];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p) = f[vf::lbm::dir::DIR_P0P];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p) = f[vf::lbm::dir::DIR_M0P];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p) = f[vf::lbm::dir::DIR_0PP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p) = f[vf::lbm::dir::DIR_0MP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p) = f[vf::lbm::dir::DIR_PPP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p) = f[vf::lbm::dir::DIR_MPP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p) = f[vf::lbm::dir::DIR_PMP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p) = f[vf::lbm::dir::DIR_MMP];
+ }
}
}
}
diff --git a/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h
index 985ba75df5f0d726868e4ff854c384ad62eeb630..d675e72aabd3122a01e092e99fa22eb491270805 100644
--- a/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h
+++ b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h
@@ -34,7 +34,7 @@
#ifndef IBcumulantK17LBMKernel_h__
#define IBcumulantK17LBMKernel_h__
-#include "LBMKernel.h"
+#include "LiggghtsCouplingLBMKernel.h"
#include "BCSet.h"
#include "D3Q27System.h"
#include "UbTiming.h"
@@ -50,7 +50,7 @@
//! <a href="http://dx.doi.org/10.1016/j.jcp.2017.05.040"><b>[ Geier et al., (2017), 10.1016/j.jcp.2017.05.040]</b></a>,
//! <a href="http://dx.doi.org/10.1016/j.jcp.2017.07.004"><b>[ Geier et al., (2017), 10.1016/j.jcp.2017.07.004]</b></a>
//!
-class IBcumulantK17LBMKernel : public LBMKernel
+class IBcumulantK17LBMKernel : public LiggghtsCouplingLBMKernel
{
public:
IBcumulantK17LBMKernel();
@@ -58,11 +58,6 @@ public:
void calculate(int step) override;
SPtr<LBMKernel> clone() override;
double getCalculationTime() override { return .0; }
- CbArray3D<SPtr<IBdynamicsParticleData>, IndexerX3X2X1>::CbArray3DPtr getParticleData() { return particleData; };
- void setParticleData(CbArray3D<SPtr<IBdynamicsParticleData>, IndexerX3X2X1>::CbArray3DPtr particleData)
- {
- this->particleData = particleData;
- };
protected:
inline void forwardInverseChimeraWithK(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2, LBMReal Kinverse, LBMReal K);
@@ -72,9 +67,9 @@ protected:
virtual void initDataSet();
- CbArray4D<LBMReal, IndexerX4X3X2X1>::CbArray4DPtr localDistributions;
- CbArray4D<LBMReal, IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributions;
- CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr restDistributions;
+ CbArray4D<LBMReal, IndexerX4X3X2X1>::CbArray4DPtr localDistributionsF;
+ CbArray4D<LBMReal, IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributionsF;
+ CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr restDistributionsF;
mu::value_type muX1, muX2, muX3;
mu::value_type muDeltaT;
@@ -83,7 +78,6 @@ protected:
LBMReal forcingX2;
LBMReal forcingX3;
- CbArray3D<SPtr<IBdynamicsParticleData>, IndexerX3X2X1>::CbArray3DPtr particleData;
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/LiggghtsCoupling/LBM/IBsharpInterfaceLBMKernel.cpp b/src/cpu/LiggghtsCoupling/LBM/IBsharpInterfaceLBMKernel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c502c4b48150e558aa785fa1bdc8c16bbecc1986
--- /dev/null
+++ b/src/cpu/LiggghtsCoupling/LBM/IBsharpInterfaceLBMKernel.cpp
@@ -0,0 +1,1795 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file IBsharpInterfaceLBMKernel.cpp
+//! \ingroup LBMKernel
+//! \author M. Geier, K. Kutscher, Hesameddin Safari
+//=======================================================================================
+
+#include "BCArray3D.h"
+#include "Block3D.h"
+#include "D3Q27EsoTwist3DSplittedVector.h"
+#include "D3Q27System.h"
+#include "DataSet3D.h"
+#include "LBMKernel.h"
+#include "IBsharpInterfaceLBMKernel.h"
+#include "NonNewtonianFluids/LBM/Rheology.h"
+#include <cmath>
+#include <iostream>
+#include <string>
+
+#define PROOF_CORRECTNESS
+
+using namespace vf::lbm::dir;
+using namespace vf::basics::constant;
+
+//////////////////////////////////////////////////////////////////////////
+IBsharpInterfaceLBMKernel::IBsharpInterfaceLBMKernel()
+{
+ this->compressible = false;
+}
+//////////////////////////////////////////////////////////////////////////
+void IBsharpInterfaceLBMKernel::initDataSet()
+{
+ SPtr<DistributionArray3D> f(new D3Q27EsoTwist3DSplittedVector(nx[0] + 4, nx[1] + 4, nx[2] + 4, -999.9));
+ SPtr<DistributionArray3D> h(new D3Q27EsoTwist3DSplittedVector(nx[0] + 4, nx[1] + 4, nx[2] + 4, -999.9)); // For phase-field
+ // SPtr<DistributionArray3D> h2(new D3Q27EsoTwist3DSplittedVector(nx[0] + 4, nx[1] + 4, nx[2] + 4, -999.9));
+ // SPtr<PhaseFieldArray3D> divU1(new PhaseFieldArray3D( nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+ // CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr pressure(new CbArray3D<real, IndexerX3X2X1>( nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+ // pressureOld = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+ // p1Old = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+
+ rhoNode = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+ vxNode = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+ vyNode = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+ vzNode = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+ dataSet->setFdistributions(f);
+ dataSet->setHdistributions(h); // For phase-field
+ // dataSet->setH2distributions(h2);
+ // dataSet->setPhaseField(divU1);
+ // dataSet->setPressureField(pressure);
+
+ phaseField = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, -999.0));
+ phaseFieldOld = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 999.0));
+
+ particleData = std::make_shared<CbArray3D<SPtr<IBdynamicsParticleData>, IndexerX3X2X1>>(nx[0] + 4, nx[1] + 4, nx[2] + 4);
+
+ // divU = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+ int minX1 = 0;
+ int minX2 = 0;
+ int minX3 = 0;
+ int maxX1 = nx[0] + 4;
+ int maxX2 = nx[1] + 4;
+ int maxX3 = nx[2] + 4;
+
+ for (int x3 = minX3; x3 < maxX3; x3++) {
+ for (int x2 = minX2; x2 < maxX2; x2++) {
+ for (int x1 = minX1; x1 < maxX1; x1++) {
+ (*particleData)(x1, x2, x3) = std::make_shared<IBdynamicsParticleData>();
+ }
+ }
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+SPtr<LBMKernel> IBsharpInterfaceLBMKernel::clone()
+{
+ SPtr<LBMKernel> kernel(new IBsharpInterfaceLBMKernel());
+ kernel->setNX(nx);
+ dynamicPointerCast<IBsharpInterfaceLBMKernel>(kernel)->initDataSet();
+ kernel->setCollisionFactorMultiphase(this->collFactorL, this->collFactorG);
+ kernel->setDensityRatio(this->densityRatio);
+ // kernel->setMultiphaseModelParameters(this->beta, this->kappa);
+ kernel->setSigma(this->sigma);
+ kernel->setContactAngle(this->contactAngle);
+ kernel->setPhiL(this->phiL);
+ kernel->setPhiH(this->phiH);
+ kernel->setPhaseFieldRelaxation(this->tauH);
+ kernel->setMobility(this->mob);
+ kernel->setInterfaceWidth(this->interfaceWidth);
+
+ kernel->setBCSet(bcSet->clone(kernel));
+ kernel->setWithForcing(withForcing);
+ kernel->setForcingX1(muForcingX1);
+ kernel->setForcingX2(muForcingX2);
+ kernel->setForcingX3(muForcingX3);
+ kernel->setIndex(ix1, ix2, ix3);
+ kernel->setDeltaT(deltaT);
+ kernel->setGhostLayerWidth(2);
+ dynamicPointerCast<IBsharpInterfaceLBMKernel>(kernel)->initForcing();
+
+ return kernel;
+}
+//////////////////////////////////////////////////////////////////////////
+void IBsharpInterfaceLBMKernel::forwardInverseChimeraWithKincompressible(real &mfa, real &mfb, real &mfc, real vv, real v2, real Kinverse, real K, real oneMinusRho)
+{
+ // using namespace UbMath;
+ real m2 = mfa + mfc;
+ real m1 = mfc - mfa;
+ real m0 = m2 + mfb;
+ mfa = m0;
+ m0 *= Kinverse;
+ m0 += oneMinusRho;
+ mfb = (m1 * Kinverse - m0 * vv) * K;
+ mfc = ((m2 - c2o1 * m1 * vv) * Kinverse + v2 * m0) * K;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void IBsharpInterfaceLBMKernel::backwardInverseChimeraWithKincompressible(real &mfa, real &mfb, real &mfc, real vv, real v2, real Kinverse, real K, real oneMinusRho)
+{
+ // using namespace UbMath;
+ real m0 = (((mfc - mfb) * c1o2 + mfb * vv) * Kinverse + (mfa * Kinverse + oneMinusRho) * (v2 - vv) * c1o2) * K;
+ real m1 = (((mfa - mfc) - c2o1 * mfb * vv) * Kinverse + (mfa * Kinverse + oneMinusRho) * (-v2)) * K;
+ mfc = (((mfc + mfb) * c1o2 + mfb * vv) * Kinverse + (mfa * Kinverse + oneMinusRho) * (v2 + vv) * c1o2) * K;
+ mfa = m0;
+ mfb = m1;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void IBsharpInterfaceLBMKernel::forwardChimera(real &mfa, real &mfb, real &mfc, real vv, real v2)
+{
+ // using namespace UbMath;
+ real m1 = (mfa + mfc) + mfb;
+ real m2 = mfc - mfa;
+ mfc = (mfc + mfa) + (v2 * m1 - c2o1 * vv * m2);
+ mfb = m2 - vv * m1;
+ mfa = m1;
+}
+
+void IBsharpInterfaceLBMKernel::backwardChimera(real &mfa, real &mfb, real &mfc, real vv, real v2)
+{
+ // using namespace UbMath;
+ real ma = (mfc + mfa * (v2 - vv)) * c1o2 + mfb * (vv - c1o2);
+ real mb = ((mfa - mfc) - mfa * v2) - c2o1 * mfb * vv;
+ mfc = (mfc + mfa * (v2 + vv)) * c1o2 + mfb * (vv + c1o2);
+ mfb = mb;
+ mfa = ma;
+}
+
+void IBsharpInterfaceLBMKernel::calculate(int step)
+{
+ using namespace D3Q27System;
+ // using namespace UbMath;
+
+ forcingX1 = 0.0;
+ forcingX2 = 0.0;
+ forcingX3 = 0.0;
+
+ real oneOverInterfaceScale = c4o1 / interfaceWidth; // 1.0;//1.5;
+ /////////////////////////////////////
+
+ localDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getLocalDistributions();
+ nonLocalDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
+ restDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
+
+ localDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getLocalDistributions();
+ nonLocalDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getNonLocalDistributions();
+ restDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getZeroDistributions();
+
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr pressure = dataSet->getPressureField();
+
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
+
+ const int bcArrayMaxX1 = (int)bcArray->getNX1();
+ const int bcArrayMaxX2 = (int)bcArray->getNX2();
+ const int bcArrayMaxX3 = (int)bcArray->getNX3();
+
+ int minX1 = ghostLayerWidth;
+ int minX2 = ghostLayerWidth;
+ int minX3 = ghostLayerWidth;
+ int maxX1 = bcArrayMaxX1 - ghostLayerWidth;
+ int maxX2 = bcArrayMaxX2 - ghostLayerWidth;
+ int maxX3 = bcArrayMaxX3 - ghostLayerWidth;
+ // real omegaDRho = 1.0;// 1.25;// 1.3;
+ for (int x3 = minX3 - ghostLayerWidth; x3 < maxX3 + ghostLayerWidth; x3++) {
+ for (int x2 = minX2 - ghostLayerWidth; x2 < maxX2 + ghostLayerWidth; x2++) {
+ for (int x1 = minX1 - ghostLayerWidth; x1 < maxX1 + ghostLayerWidth; x1++) {
+ if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3)) {
+ int x1p = x1 + 1;
+ int x2p = x2 + 1;
+ int x3p = x3 + 1;
+
+ real mfcbb = (*this->localDistributionsH1)(D3Q27System::ET_E, x1, x2, x3);
+ real mfbcb = (*this->localDistributionsH1)(D3Q27System::ET_N, x1, x2, x3);
+ real mfbbc = (*this->localDistributionsH1)(D3Q27System::ET_T, x1, x2, x3);
+ real mfccb = (*this->localDistributionsH1)(D3Q27System::ET_NE, x1, x2, x3);
+ real mfacb = (*this->localDistributionsH1)(D3Q27System::ET_NW, x1p, x2, x3);
+ real mfcbc = (*this->localDistributionsH1)(D3Q27System::ET_TE, x1, x2, x3);
+ real mfabc = (*this->localDistributionsH1)(D3Q27System::ET_TW, x1p, x2, x3);
+ real mfbcc = (*this->localDistributionsH1)(D3Q27System::ET_TN, x1, x2, x3);
+ real mfbac = (*this->localDistributionsH1)(D3Q27System::ET_TS, x1, x2p, x3);
+ real mfccc = (*this->localDistributionsH1)(D3Q27System::ET_TNE, x1, x2, x3);
+ real mfacc = (*this->localDistributionsH1)(D3Q27System::ET_TNW, x1p, x2, x3);
+ real mfcac = (*this->localDistributionsH1)(D3Q27System::ET_TSE, x1, x2p, x3);
+ real mfaac = (*this->localDistributionsH1)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ real mfabb = (*this->nonLocalDistributionsH1)(D3Q27System::ET_W, x1p, x2, x3);
+ real mfbab = (*this->nonLocalDistributionsH1)(D3Q27System::ET_S, x1, x2p, x3);
+ real mfbba = (*this->nonLocalDistributionsH1)(D3Q27System::ET_B, x1, x2, x3p);
+ real mfaab = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SW, x1p, x2p, x3);
+ real mfcab = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SE, x1, x2p, x3);
+ real mfaba = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BW, x1p, x2, x3p);
+ real mfcba = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BE, x1, x2, x3p);
+ real mfbaa = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BS, x1, x2p, x3p);
+ real mfbca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BN, x1, x2, x3p);
+ real mfaaa = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ real mfcaa = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ real mfaca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ real mfcca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNE, x1, x2, x3p);
+ real mfbbb = (*this->restDistributionsH1)(x1, x2, x3);
+
+ // omegaDRho = 2.0;// 1.5;
+ // real phiOld = (*phaseField)(x1, x2, x3);
+
+ (*phaseField)(x1, x2, x3) =
+ (((mfaaa + mfccc) + (mfaca + mfcac)) + ((mfaac + mfcca) + (mfcaa + mfacc))) + (((mfaab + mfacb) + (mfcab + mfccb)) + ((mfaba + mfabc) + (mfcba + mfcbc)) + ((mfbaa + mfbac) + (mfbca + mfbcc))) + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc)) + mfbbb;
+
+ if ((*phaseField)(x1, x2, x3) > 1) {
+ (*phaseField)(x1, x2, x3) = c1o1;
+ }
+
+ if ((*phaseField)(x1, x2, x3) < 0) {
+ (*phaseField)(x1, x2, x3) = 0;
+ }
+ }
+ }
+ }
+ }
+
+ this->swapDistributions();
+ for (int x3 = minX3 - ghostLayerWidth + 1; x3 < maxX3 + ghostLayerWidth - 1; x3++) {
+ for (int x2 = minX2 - ghostLayerWidth + 1; x2 < maxX2 + ghostLayerWidth - 1; x2++) {
+ for (int x1 = minX1 - ghostLayerWidth + 1; x1 < maxX1 + ghostLayerWidth - 1; x1++) {
+ if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3)) {
+ // int x1p = x1 + 1;
+ // int x2p = x2 + 1;
+ // int x3p = x3 + 1;
+
+ SPtr<DistributionArray3D> distributionH = this->getDataSet()->getHdistributions();
+ real hh[27];
+ distributionH->getDistributionInv(hh, x1, x2, x3);
+ real phiD, vxP, vyP, vzP;
+
+ D3Q27System::calcIncompMacroscopicValues(hh, phiD, vxP, vyP, vzP);
+ (*phaseFieldOld)(x1, x2, x3) = phiD;
+
+ SPtr<DistributionArray3D> distribution = this->getDataSet()->getFdistributions();
+ real ff[27];
+ distribution->getDistributionInv(ff, x1, x2, x3);
+ real rhoG, vx, vy, vz;
+
+ D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+
+ (*rhoNode)(x1, x2, x3) = rhoG; // *((*phaseField)(x1, x2, x3) > c1o2 ? densityRatio : c1o1);
+ (*vxNode)(x1, x2, x3) = vx;
+ (*vyNode)(x1, x2, x3) = vy;
+ (*vzNode)(x1, x2, x3) = vz;
+ }
+ }
+ }
+ }
+
+ SPtr<DistributionArray3D> distribution = this->getDataSet()->getFdistributions();
+ real ff[27];
+ for (int x3 = minX3 - 1; x3 < maxX3 + 1; x3++) {
+ for (int x2 = minX2 - 1; x2 < maxX2 + 1; x2++) {
+ for (int x1 = minX1 - 1; x1 < maxX1 + 1; x1++) {
+ if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3)) {
+ // int x1p = x1 + 1;
+ // int x2p = x2 + 1;
+ // int x3p = x3 + 1;
+ findNeighbors(phaseFieldOld, x1, x2, x3);
+ ////////////////////////////////Momentum conservation experiment 06.03.2023
+ // surfacetension
+
+ if ((((*phaseField)(x1, x2, x3) <= c1o2) || phi[DIR_000] <= c1o2) &&
+ ((phi[DIR_P00] > c1o2) || (phi[DIR_M00] > c1o2) || (phi[DIR_00P] > c1o2) || (phi[DIR_00M] > c1o2) || (phi[DIR_0M0] > c1o2) || (phi[DIR_0P0] > c1o2) || (phi[DIR_PP0] > c1o2) || (phi[DIR_PM0] > c1o2) || (phi[DIR_P0P] > c1o2) || (phi[DIR_P0M] > c1o2) || (phi[DIR_MP0] > c1o2) ||
+ (phi[DIR_MM0] > c1o2) || (phi[DIR_M0P] > c1o2) || (phi[DIR_M0M] > c1o2) || (phi[DIR_0PM] > c1o2) || (phi[DIR_0MM] > c1o2) || (phi[DIR_0PP] > c1o2) || (phi[DIR_0MP] > c1o2) || (phi[DIR_PPP] > c1o2) || (phi[DIR_PMP] > c1o2) || (phi[DIR_MPP] > c1o2) || (phi[DIR_MMP] > c1o2) ||
+ (phi[DIR_PPM] > c1o2) || (phi[DIR_PMM] > c1o2) || (phi[DIR_MPM] > c1o2) || (phi[DIR_MMM] > c1o2))) {
+ real vx = (*vxNode)(x1, x2, x3);
+ real vy = (*vyNode)(x1, x2, x3);
+ real vz = (*vzNode)(x1, x2, x3);
+ findNeighbors(phaseField, x1, x2, x3);
+ real laplacePressure = c12o1 * sigma * computeCurvature_phi();
+ // if (step > 5000)
+ // UBLOG(logINFO, x1 << ","<< x2 << ","<< x3 << " "<< "3*dP=" << laplacePressure << " dP=" << laplacePressure / 3.0<< " phi=" << phi[DIR_000]<< "\n");
+ findNeighbors(phaseFieldOld, x1, x2, x3);
+
+ // 16.03.23 c: BB gas side with updated boundary velocity
+
+ distribution->getDistributionInv(ff, x1, x2, x3);
+ real rhoG;
+ if (phi[DIR_000] > c1o2) { // initialization necessary
+ real sumRho = 0;
+ real sumWeight = 1.e-100;
+ for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ if ((phi[fdir] <= c1o2)) {
+ sumRho += WEIGTH[fdir] * (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ sumWeight += WEIGTH[fdir];
+ }
+ }
+ rhoG = sumRho / sumWeight; // uncheck excpetion: what if there is no adequate neighbor?
+ for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ if ((phi[fdir] > c1o2)) {
+ real vxBC = ((*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real vyBC = ((*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real vzBC = ((*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ real vDir = (D3Q27System::DX1[fdir] * vx + D3Q27System::DX2[fdir] * vy + D3Q27System::DX3[fdir] * vz);
+ vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
+ real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+
+ if ((phi[D3Q27System::INVDIR[fdir]] > c1o2)) {
+ /// here we need reconstruction from scrach
+ real feqOLD = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real feqNew = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // real fBC = (fL - feqOLD) * (c1o1 / collFactorG - c1o1) / (c1o1 / collFactorL - c1o1) + feqNew;
+
+ // real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ // real fGEQOld = D3Q27System::getIncompFeqForDirection(fdir, (*rhoNode)(x1, x2, x3), vx, vy, vz);
+ // real fGEQNew = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
+ real fBC = (fL - feqOLD) * (c1o1 / collFactorG - c1o1) / (c1o1 / collFactorL - c1o1) + feqNew; // fL -feqOLD + feqNew;
+ // real fBC = fGG - c6o1 * WEIGTH[fdir] * (vBC);
+ distribution->setDistributionForDirection(fBC, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ ///// other possibility is tor replace the node itself instead of the neighbor (only c1o1 of them is allowed!)
+ // real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ // real feqOLD = D3Q27System::getIncompFeqForDirection(fdir, (*rhoNode)(x1 , x2 , x3 ), (*vxNode)(x1 , x2 , x3 ), (*vyNode)(x1 , x2 , x3 ), (*vzNode)(x1 , x2 , x3 ));
+ // real feqNew = D3Q27System::getIncompFeqForDirection(fdir, rhoG, (*vxNode)(x1 , x2 , x3 ), (*vyNode)(x1 , x2 , x3 ), (*vzNode)(x1, x2, x3 ));
+ // real fBC = fG - feqOLD + feqNew;
+ // distribution->setDistributionForDirection(fBC, x1, x2, x3, fdir);
+ }
+ }
+ }
+ // distribution->setDistributionForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, rhoG, vx, vy, vz), x1, x2, x3, DIR_000);
+ {
+ real fL = distribution->getDistributionInvForDirection(x1, x2, x3, DIR_000);
+ real feqOLD = D3Q27System::getIncompFeqForDirection(DIR_000, (*rhoNode)(x1, x2, x3), vx, vy, vz);
+ real feqNew = D3Q27System::getIncompFeqForDirection(DIR_000, rhoG, vx, vy, vz);
+ distribution->setDistributionForDirection(fL - feqOLD + feqNew, x1, x2, x3, DIR_000);
+ }
+
+ } else { // no refill of gas required
+ rhoG = (*rhoNode)(x1, x2, x3);
+ if ((*phaseField)(x1, x2, x3) <= c1o2) { // no refill liquid
+ for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ if ((phi[fdir] > c1o2)) {
+ real vxBC = ((*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real vyBC = ((*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real vzBC = ((*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ real vDir = (D3Q27System::DX1[fdir] * vx + D3Q27System::DX2[fdir] * vy + D3Q27System::DX3[fdir] * vz);
+ // real dvDir = vBC - vDir;
+ vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
+ real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ real fBC = fG - c6o1 * WEIGTH[fdir] * (vBC);
+ // real fGEQ = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
+ // real fBC = (-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+ // real fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+
+ // real feqOLD = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ // D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])); real feqNew =
+ // D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ // D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])); real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir); real fBC = (fL - feqOLD) * (c1o1 / collFactorG - c1o1) /
+ // (c1o1 / collFactorL - c1o1) + feqNew;
+
+ // if ((*phaseField)(x1, x2, x3) <= c1o2)
+ distribution->setDistributionForDirection(fBC, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ if (((*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) > c1o2) {
+ // real vxBC = c1o2 * (vx + (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // real vyBC = c1o2 * (vy + (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // real vzBC = c1o2 * (vz + (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // real feqL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ // D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])); real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz); real feqL =
+ // D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), (*vyNode)(x1 +
+ // D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) *
+ // (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir])); real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) *
+ // (D3Q27System::DX1[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ // D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir])); real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), vy * (D3Q27System::DX2[fdir]) *
+ // (D3Q27System::DX2[fdir]), vz * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
+
+ // distribution->setDistributionForDirection((fBC + fG) / densityRatio*0 - fL - (feqG - feqL) * (c1o1 / densityRatio*0 - c1o1) * vBC, x1, x2, x3, fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1,
+ // x2, x3, fdir); distribution->setDistributionForDirection((fBC + fG) / densityRatio * 0 - fL - (feqG - feqL-2*fL+2*feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1, x2, x3, fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC *
+ // D3Q27System::DX3[fdir]), x1, x2, x3, fdir); real flW = (fBC + fG) / densityRatio * 0 - fL - (feqG - feqL) * (c1o1 / densityRatio*0 - c1o1) * vBC; real flWW = (fBC + fG) / densityRatio * 0 - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio*0
+ // - c1o1) * vBC; real fLi = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], fdir); real number = 666; distribution->setDistributionForDirection((fBC + fG) / densityRatio *
+ // 0 - fL - (feqG - feqL) * (c1o1 / densityRatio * 0 - c1o1) * vBC, x1, x2, x3, fdir);
+ //// real eqBC= D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, vx, vy, vz);
+ //// real eqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
+ // real eqBC = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ //D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])); real eqG = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ //D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+
+ ////real flNew = (fBC + fG-eqBC-eqG) / densityRatio +eqBC+eqG - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC;
+ // distribution->setDistributionForDirection(c2o1*laplacePressure * WEIGTH[fdir] +(fBC + fG - eqBC - eqG) / densityRatio + (eqBC + eqG) - fL, x1, x2, x3, fdir);// -0* (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1, x2, x3,
+ //fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ // //if (vxBC != 0) {
+ // // int set = 0;
+ // //}
+
+ real feqL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]),
+ (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
+ real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]),
+ (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
+
+ real eqBC = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, vx, vy, vz);
+ real eqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
+ real eqBCN = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real eqGN = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+
+ // real flNew = (fBC + fG-eqBC-eqG) / densityRatio +eqBC+eqG - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC;
+ real laplacePressureBC;
+ if ((x1 + D3Q27System::DX1[fdir] > 0) && (x1 + D3Q27System::DX1[fdir] < maxX1 + 1) && (x2 + D3Q27System::DX2[fdir] > 0) && (x2 + D3Q27System::DX2[fdir] < maxX2 + 1) && (x3 + D3Q27System::DX3[fdir] > 0) && (x3 + D3Q27System::DX3[fdir] < maxX3 + 1)) {
+ findNeighbors(phaseField, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ laplacePressureBC = c6o1 * c2o1 * computeCurvature_phi() * sigma;
+ findNeighbors(phaseFieldOld, x1, x2, x3);
+ } else
+ laplacePressureBC = laplacePressure; // curv; // reset to the above
+ laplacePressureBC = laplacePressure * (c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) /
+ (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) +
+ laplacePressureBC * (-c1o1 + c2o1 * (*phaseField)(x1, x2, x3)) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // laplacePressureBC *= sigma;
+ distribution->setDistributionForDirection(laplacePressureBC * WEIGTH[fdir] + (fBC + fG - eqBC - eqG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio * 0) - fL - 0 * (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1,
+ x2, x3, fdir);
+ }
+ }
+ }
+ } else { // refill liquid
+
+ for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ if ((phi[fdir] > c1o2)) {
+ real vxBC = ((*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real vyBC = ((*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real vzBC = ((*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ real vDir = (D3Q27System::DX1[fdir] * vx + D3Q27System::DX2[fdir] * vy + D3Q27System::DX3[fdir] * vz);
+ // real dvDir = vBC - vDir;
+ vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
+ real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ real fBC = fG - c6o1 * WEIGTH[fdir] * (vBC);
+
+ // real fGEQ = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
+ // real fBC = (-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+ // real fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+
+ // real feqOLD = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ // D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])); real feqNew =
+ // D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ // D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])); real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir); real fBC = (fL - feqOLD) * (c1o1 / collFactorG - c1o1) /
+ // (c1o1 / collFactorL - c1o1) + feqNew;
+
+ ff[D3Q27System::INVDIR[fdir]] = fBC;
+ if (((*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) > c1o2) {
+ // real feqL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ // D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])); real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz); real feqL =
+ // D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), (*vyNode)(x1 +
+ // D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) *
+ // (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir])); real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) *
+ // (D3Q27System::DX1[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ // D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir])); real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), vy * (D3Q27System::DX2[fdir]) *
+ // (D3Q27System::DX2[fdir]), vz * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
+
+ // distribution->setDistributionForDirection((fBC + fG) / densityRatio*0 - fL- (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vBC), x1, x2, x3, fdir);
+ // distribution->setDistributionForDirection((fBC + fG) / densityRatio * 0 - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio*0 - c1o1) * vBC, x1, x2, x3, fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC *
+ // D3Q27System::DX3[fdir]), x1, x2, x3, fdir); distribution->setDistributionForDirection(0, x1, x2, x3, fdir); real flW = (fBC + fG) / densityRatio * 0 - fL - (feqG - feqL) * (c1o1 / densityRatio * 0 - c1o1) * vBC; real flWW = (fBC + fG) / densityRatio * 0
+ // - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio * 0 - c1o1) * vBC; real fLi = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], fdir);
+ // real eqBC = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ //D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])); real eqG = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 +
+ //D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // //real flNew = (fBC + fG - eqBC - eqG) / densityRatio + eqBC + eqG - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC;
+ // distribution->setDistributionForDirection(c2o1*laplacePressure* WEIGTH[fdir] + (fBC + fG - eqBC - eqG) / densityRatio + (eqBC + eqG) - fL, x1, x2, x3, fdir);// - 0*(feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1, x2, x3,
+ //fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+
+ //// real number = 666;
+
+ real feqL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]),
+ (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
+ real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]),
+ (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
+
+ real eqBC = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, vx, vy, vz);
+ real eqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
+ real eqBCN = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real eqGN = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+
+ // real flNew = (fBC + fG-eqBC-eqG) / densityRatio +eqBC+eqG - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC;
+ real laplacePressureBC;
+ if ((x1 + D3Q27System::DX1[fdir] > 0) && (x1 + D3Q27System::DX1[fdir] < maxX1 + 1) && (x2 + D3Q27System::DX2[fdir] > 0) && (x2 + D3Q27System::DX2[fdir] < maxX2 + 1) && (x3 + D3Q27System::DX3[fdir] > 0) && (x3 + D3Q27System::DX3[fdir] < maxX3 + 1)) {
+ findNeighbors(phaseField, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ laplacePressureBC = c12o1 * computeCurvature_phi() * sigma;
+ findNeighbors(phaseFieldOld, x1, x2, x3);
+ } else
+ laplacePressureBC = laplacePressure; // curv; // reset to the above
+ laplacePressureBC = laplacePressure * (c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) /
+ (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) +
+ laplacePressureBC * (-c1o1 + c2o1 * (*phaseField)(x1, x2, x3)) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // laplacePressureBC *= sigma;
+ distribution->setDistributionForDirection(laplacePressureBC * WEIGTH[fdir] + (fBC + fG - eqBC - eqG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio * 0) - fL - 0 * (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1,
+ x2, x3, fdir);
+ }
+
+ } else {
+ ff[D3Q27System::INVDIR[fdir]] = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ ;
+ }
+ }
+
+ real sum2 = 1e-100;
+ real sumRho = 0;
+ real sumVx = 0;
+ real sumVy = 0;
+ real sumVz = 0;
+ for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ if ((phi[fdir] > c1o2)) {
+
+ sumRho += WEIGTH[fdir] * (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]); // * tempRho;
+ sumVx += WEIGTH[fdir] * (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ sumVy += WEIGTH[fdir] * (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ sumVz += WEIGTH[fdir] * (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ sum2 += WEIGTH[fdir];
+ }
+ }
+ real rhoL;
+ D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+ rhoL = sumRho / sum2;
+ // vx = sumVx / sum2;
+ // vy = sumVy / sum2;
+ // vz = sumVz / sum2;
+ // rhoL = (*rhoNode)(x1, x2, x3)/densityRatio;
+
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // ff[D3Q27System::INVDIR[fdir]] = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // }
+
+ for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ if (((phi[fdir] <= c1o2))) //&& (((*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) > c1o2)))
+ {
+ real feqOLD = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, vx, vy, vz);
+ real feqNew = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoL, vx, vy, vz);
+ ff[D3Q27System::INVDIR[fdir]] = (ff[D3Q27System::INVDIR[fdir]] - feqOLD) * (c1o1 / collFactorL - c1o1) / (c1o1 / collFactorG - c1o1) + feqNew;
+ distribution->setDistributionForDirection(ff[D3Q27System::INVDIR[fdir]], x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ }
+ }
+
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if ((phi[D3Q27System::INVDIR[fdir]] <= c1o2) && (phi[fdir] > c1o2)) {
+ // //real vxBC = ((*vxNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ // //real vyBC = ((*vyNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ // //real vzBC = ((*vzNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ // //real vBC = -(D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX2[fdir] * vzBC);
+ // real vDir = -(D3Q27System::DX1[fdir] * vx + D3Q27System::DX2[fdir] * vy + D3Q27System::DX2[fdir] * vz);
+ // //vBC = (vBC + vDir) / (c2o1 -( vBC - vDir));
+ // //real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]) - c6o1 * WEIGTH[fdir] * vDir;
+ // //real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]) + c6o1 * WEIGTH[fdir] * (vx * D3Q27System::DX1[fdir] + vy * D3Q27System::DX2[fdir] + vz *
+ //D3Q27System::DX3[fdir]); real fL= D3Q27System::getIncompFeqForDirection(fdir, rhoL, vx, vy, vz); distribution->setDistributionForDirection(fL, x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir], fdir); ff[fdir] = fL;
+ // }
+ // if (!(phi[fdir] > c1o2)) {
+ // //std::cout << "Eq at dir=" << fdir << "\n";
+ // real vxBC = ((*vxNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ // real vyBC = ((*vyNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ // real vzBC = ((*vzNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ // real feqL = D3Q27System::getIncompFeqForDirection(fdir, rhoL, vx, vy, vz);
+ // distribution->setDistributionForDirection(feqL, x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir], fdir);
+ // ff[fdir] = feqL;
+ // }
+ // }
+ // real sumRho2= 0;
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // sumRho2 += ff[fdir];// -D3Q27System::getIncompFeqForDirection(fdir, 0, sumVx, sumVy, sumVz);
+ // }
+ // ff[DIR_000] = rhoL - sumRho2;
+ // rhoL = 27.0 / 18.0 * sumRho2;
+ // std::cout << "rhoL=" << rhoL <<" sumRho="<< 27.0 / 18.0 * sumRho2 << " vx=" << vx << " vy=" << vy << "\n";
+ D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
+ // std::cout << "RecalCrhoL=" << rhoL << " sumRho=" << 27.0 / 18.0 * sumRho2 << " vx=" << vx << " vy=" << vy << "ffRest="<<ff[DIR_000]<<"\n";
+ // distribution->setDistributionForDirection(ff[DIR_000], x1, x2, x3, DIR_000);
+ {
+ real fG = distribution->getDistributionInvForDirection(x1, x2, x3, DIR_000);
+ real feqOLD = D3Q27System::getIncompFeqForDirection(DIR_000, (*rhoNode)(x1, x2, x3), vx, vy, vz);
+ real feqNew = D3Q27System::getIncompFeqForDirection(DIR_000, rhoL, vx, vy, vz);
+ distribution->setDistributionForDirection(fG - feqOLD + feqNew, x1, x2, x3, DIR_000);
+ }
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // ff[D3Q27System::INVDIR[fdir]]=distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // }
+ // D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
+ // std::cout << "AfterRead rhoL=" << rhoL << " rhoGToL=" << rhoG/densityRatio << " vx=" << vx << " vy=" << vy << "ffRest=" << ff[DIR_000] <<" x="<<x1<<" y="<<x2<<" z="<<x3<< "\n";
+
+ // real feqL = D3Q27System::getIncompFeqForDirection(DIR_000, rhoL, vx, vy, vz);
+ // distribution->setDistributionForDirection(feqL, x1, x2, x3, DIR_000);
+ }
+ }
+
+ } // end Loop
+ }
+ }
+ }
+ }
+
+ this->swapDistributions();
+
+ real collFactorM;
+
+ for (int x3 = minX3; x3 < maxX3; x3++) {
+ for (int x2 = minX2; x2 < maxX2; x2++) {
+ for (int x1 = minX1; x1 < maxX1; x1++) {
+ if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3)) {
+ int x1p = x1 + 1;
+ int x2p = x2 + 1;
+ int x3p = x3 + 1;
+
+ findNeighbors(phaseField, x1, x2, x3);
+
+ real mfcbb = (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3);
+ real mfbcb = (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3);
+ real mfbbc = (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3);
+ real mfccb = (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3);
+ real mfacb = (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3);
+ real mfcbc = (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3);
+ real mfabc = (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3);
+ real mfbcc = (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3);
+ real mfbac = (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3);
+ real mfccc = (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3);
+ real mfacc = (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3);
+ real mfcac = (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3);
+ real mfaac = (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ real mfabb = (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3);
+ real mfbab = (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3);
+ real mfbba = (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p);
+ real mfaab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3);
+ real mfcab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3);
+ real mfaba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p);
+ real mfcba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p);
+ real mfbaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p);
+ real mfbca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p);
+ real mfaaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ real mfcaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ real mfaca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ real mfcca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p);
+ real mfbbb = (*this->restDistributionsF)(x1, x2, x3);
+
+ real f[D3Q27System::ENDF + 1];
+ real fEq[D3Q27System::ENDF + 1];
+ real fEqSolid[D3Q27System::ENDF + 1];
+ real fPre[D3Q27System::ENDF + 1];
+
+ f[vf::lbm::dir::DIR_000] = mfbbb;
+
+ f[vf::lbm::dir::DIR_P00] = mfcbb;
+ f[vf::lbm::dir::DIR_0P0] = mfbcb;
+ f[vf::lbm::dir::DIR_00P] = mfbbc;
+ f[vf::lbm::dir::DIR_PP0] = mfccb;
+ f[vf::lbm::dir::DIR_MP0] = mfacb;
+ f[vf::lbm::dir::DIR_P0P] = mfcbc;
+ f[vf::lbm::dir::DIR_M0P] = mfabc;
+ f[vf::lbm::dir::DIR_0PP] = mfbcc;
+ f[vf::lbm::dir::DIR_0MP] = mfbac;
+ f[vf::lbm::dir::DIR_PPP] = mfccc;
+ f[vf::lbm::dir::DIR_MPP] = mfacc;
+ f[vf::lbm::dir::DIR_PMP] = mfcac;
+ f[vf::lbm::dir::DIR_MMP] = mfaac;
+
+ f[vf::lbm::dir::DIR_M00] = mfabb;
+ f[vf::lbm::dir::DIR_0M0] = mfbab;
+ f[vf::lbm::dir::DIR_00M] = mfbba;
+ f[vf::lbm::dir::DIR_MM0] = mfaab;
+ f[vf::lbm::dir::DIR_PM0] = mfcab;
+ f[vf::lbm::dir::DIR_M0M] = mfaba;
+ f[vf::lbm::dir::DIR_P0M] = mfcba;
+ f[vf::lbm::dir::DIR_0MM] = mfbaa;
+ f[vf::lbm::dir::DIR_0PM] = mfbca;
+ f[vf::lbm::dir::DIR_MMM] = mfaaa;
+ f[vf::lbm::dir::DIR_PMM] = mfcaa;
+ f[vf::lbm::dir::DIR_MPM] = mfaca;
+ f[vf::lbm::dir::DIR_PPM] = mfcca;
+
+ if ((*particleData)(x1, x2, x3)->solidFraction > SOLFRAC_MIN) {
+ fPre[vf::lbm::dir::DIR_000] = mfbbb;
+
+ fPre[vf::lbm::dir::DIR_P00] = mfcbb;
+ fPre[vf::lbm::dir::DIR_0P0] = mfbcb;
+ fPre[vf::lbm::dir::DIR_00P] = mfbbc;
+ fPre[vf::lbm::dir::DIR_PP0] = mfccb;
+ fPre[vf::lbm::dir::DIR_MP0] = mfacb;
+ fPre[vf::lbm::dir::DIR_P0P] = mfcbc;
+ fPre[vf::lbm::dir::DIR_M0P] = mfabc;
+ fPre[vf::lbm::dir::DIR_0PP] = mfbcc;
+ fPre[vf::lbm::dir::DIR_0MP] = mfbac;
+ fPre[vf::lbm::dir::DIR_PPP] = mfccc;
+ fPre[vf::lbm::dir::DIR_MPP] = mfacc;
+ fPre[vf::lbm::dir::DIR_PMP] = mfcac;
+ fPre[vf::lbm::dir::DIR_MMP] = mfaac;
+
+ fPre[vf::lbm::dir::DIR_M00] = mfabb;
+ fPre[vf::lbm::dir::DIR_0M0] = mfbab;
+ fPre[vf::lbm::dir::DIR_00M] = mfbba;
+ fPre[vf::lbm::dir::DIR_MM0] = mfaab;
+ fPre[vf::lbm::dir::DIR_PM0] = mfcab;
+ fPre[vf::lbm::dir::DIR_M0M] = mfaba;
+ fPre[vf::lbm::dir::DIR_P0M] = mfcba;
+ fPre[vf::lbm::dir::DIR_0MM] = mfbaa;
+ fPre[vf::lbm::dir::DIR_0PM] = mfbca;
+ fPre[vf::lbm::dir::DIR_MMM] = mfaaa;
+ fPre[vf::lbm::dir::DIR_PMM] = mfcaa;
+ fPre[vf::lbm::dir::DIR_MPM] = mfaca;
+ fPre[vf::lbm::dir::DIR_PPM] = mfcca;
+ }
+
+ (*particleData)(x1, x2, x3)->hydrodynamicForce.fill(0.0);
+
+
+
+ real rhoH = 1.0;
+ real rhoL = 1.0 / densityRatio;
+
+ // real rhoToPhi = (rhoH - rhoL) / (phiH - phiL);
+
+ real dX1_phi = gradX1_phi();
+ real dX2_phi = gradX2_phi();
+ real dX3_phi = gradX3_phi();
+
+ real denom = sqrt(dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi) + 1.0e-20; //+ 1e-9+1e-3;
+ // 01.09.2022: unclear what value we have to add to the normal: lager values better cut of in gas phase?
+ real normX1 = dX1_phi / denom;
+ real normX2 = dX2_phi / denom;
+ real normX3 = dX3_phi / denom;
+
+ collFactorM = phi[DIR_000] > c1o2 ? collFactorL : collFactorG;
+ // real collFactorMInv = phi[DIR_000] > c1o2 ? collFactorG : collFactorL;
+
+ // real mu = 2 * beta * phi[DIR_000] * (phi[DIR_000] - 1) * (2 * phi[DIR_000] - 1) - kappa * nabla2_phi();
+
+ //----------- Calculating Macroscopic Values -------------
+ real rho = phi[DIR_000] > c1o2 ? rhoH : rhoL;
+
+ real m0, m1, m2;
+ real rhoRef = c1o1;
+
+ real vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) + (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) + (mfcbb - mfabb)) / rhoRef;
+ real vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) + (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) + (mfbcb - mfbab)) / rhoRef;
+ real vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) + (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) + (mfbbc - mfbba)) / rhoRef;
+ /////////////////////
+
+ forcingX1 = 0.0;
+ forcingX2 = 0.0;
+ forcingX3 = 0.0;
+
+ if (withForcing) {
+ muRho = rho;
+ muPhi = phi[DIR_000];
+ forcingX1 += muForcingX1.Eval();
+ forcingX2 += muForcingX2.Eval();
+ forcingX3 += muForcingX3.Eval();
+
+ vvx += (forcingX1)*deltaT * c1o2;
+ vvy += (forcingX2)*deltaT * c1o2;
+ vvz += (forcingX3)*deltaT * c1o2;
+ }
+ if ((*particleData)(x1, x2, x3)->solidFraction <= SOLFRAC_MAX) {
+ real vx2;
+ real vy2;
+ real vz2;
+ vx2 = vvx * vvx;
+ vy2 = vvy * vvy;
+ vz2 = vvz * vvz;
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ real oMdrho;
+ ///////////////
+
+ oMdrho = mfccc + mfaaa;
+ m0 = mfaca + mfcac;
+ m1 = mfacc + mfcaa;
+ m2 = mfaac + mfcca;
+ oMdrho += m0;
+ m1 += m2;
+ oMdrho += m1;
+ m0 = mfbac + mfbca;
+ m1 = mfbaa + mfbcc;
+ m0 += m1;
+ m1 = mfabc + mfcba;
+ m2 = mfaba + mfcbc;
+ m1 += m2;
+ m0 += m1;
+ m1 = mfacb + mfcab;
+ m2 = mfaab + mfccb;
+ m1 += m2;
+ m0 += m1;
+ oMdrho += m0;
+ m0 = mfabb + mfcbb;
+ m1 = mfbab + mfbcb;
+ m2 = mfbba + mfbbc;
+ m0 += m1 + m2;
+ m0 += mfbbb; // hat gefehlt
+ oMdrho = (rhoRef - (oMdrho + m0)) / rhoRef; // 12.03.21 check derivation!!!!
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ real wadjust;
+ // real qudricLimit = 0.01 / (c1o1 + 1.0e4 * phi[DIR_000] * (c1o1 - phi[DIR_000]));
+ // real qudricLimit = 0.01 / (c1o1 + (((*phaseField)(x1, x2, x3) > c1o2) ? 1.0e6 * phi[DIR_000] * (c1o1 - phi[DIR_000]):c0o1));
+ real qudricLimit = 0.01;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Chimera transform from well conditioned distributions to central moments as defined in Appendix J in \ref
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //! see also Eq. (6)-(14) in \ref
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ forwardInverseChimeraWithKincompressible(mfaaa, mfaab, mfaac, vvz, vz2, c36o1, c1o36, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfaba, mfabb, mfabc, vvz, vz2, c9o1, c1o9, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfaca, mfacb, mfacc, vvz, vz2, c36o1, c1o36, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfbaa, mfbab, mfbac, vvz, vz2, c9o1, c1o9, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfbba, mfbbb, mfbbc, vvz, vz2, c9o4, c4o9, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfbca, mfbcb, mfbcc, vvz, vz2, c9o1, c1o9, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfcaa, mfcab, mfcac, vvz, vz2, c36o1, c1o36, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfcba, mfcbb, mfcbc, vvz, vz2, c9o1, c1o9, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfcca, mfccb, mfccc, vvz, vz2, c36o1, c1o36, oMdrho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ forwardInverseChimeraWithKincompressible(mfaaa, mfaba, mfaca, vvy, vy2, c6o1, c1o6, oMdrho);
+ forwardChimera(mfaab, mfabb, mfacb, vvy, vy2);
+ forwardInverseChimeraWithKincompressible(mfaac, mfabc, mfacc, vvy, vy2, c18o1, c1o18, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfbaa, mfbba, mfbca, vvy, vy2, c3o2, c2o3, oMdrho);
+ forwardChimera(mfbab, mfbbb, mfbcb, vvy, vy2);
+ forwardInverseChimeraWithKincompressible(mfbac, mfbbc, mfbcc, vvy, vy2, c9o2, c2o9, oMdrho);
+ forwardInverseChimeraWithKincompressible(mfcaa, mfcba, mfcca, vvy, vy2, c6o1, c1o6, oMdrho);
+ forwardChimera(mfcab, mfcbb, mfccb, vvy, vy2);
+ forwardInverseChimeraWithKincompressible(mfcac, mfcbc, mfccc, vvy, vy2, c18o1, c1o18, oMdrho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // X - Dir
+ forwardInverseChimeraWithKincompressible(mfaaa, mfbaa, mfcaa, vvx, vx2, c1o1, c1o1, oMdrho);
+ forwardChimera(mfaba, mfbba, mfcba, vvx, vx2);
+ forwardInverseChimeraWithKincompressible(mfaca, mfbca, mfcca, vvx, vx2, c3o1, c1o3, oMdrho);
+ forwardChimera(mfaab, mfbab, mfcab, vvx, vx2);
+ forwardChimera(mfabb, mfbbb, mfcbb, vvx, vx2);
+ forwardChimera(mfacb, mfbcb, mfccb, vvx, vx2);
+ forwardInverseChimeraWithKincompressible(mfaac, mfbac, mfcac, vvx, vx2, c3o1, c1o3, oMdrho);
+ forwardChimera(mfabc, mfbbc, mfcbc, vvx, vx2);
+ forwardInverseChimeraWithKincompressible(mfacc, mfbcc, mfccc, vvx, vx2, c3o1, c1o9, oMdrho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Cumulants
+ ////////////////////////////////////////////////////////////////////////////////////
+
+ // mfaaa = 0.0;
+ real OxxPyyPzz = 1.0; // omega2 or bulk viscosity
+ // real OxyyPxzz = 1.;//-s9;//2+s9;//
+ // real OxyyMxzz = 1.;//2+s9;//
+ real O4 = 1.;
+ real O5 = 1.;
+ real O6 = 1.;
+ /////
+
+ /////fourth order parameters; here only for test. Move out of loop!
+
+ real OxyyPxzz = 8.0 * (collFactorM - 2.0) * (OxxPyyPzz * (3.0 * collFactorM - 1.0) - 5.0 * collFactorM) / (8.0 * (5.0 - 2.0 * collFactorM) * collFactorM + OxxPyyPzz * (8.0 + collFactorM * (9.0 * collFactorM - 26.0)));
+ real OxyyMxzz = 8.0 * (collFactorM - 2.0) * (collFactorM + OxxPyyPzz * (3.0 * collFactorM - 7.0)) / (OxxPyyPzz * (56.0 - 42.0 * collFactorM + 9.0 * collFactorM * collFactorM) - 8.0 * collFactorM);
+ real Oxyz = 24.0 * (collFactorM - 2.0) * (4.0 * collFactorM * collFactorM + collFactorM * OxxPyyPzz * (18.0 - 13.0 * collFactorM) + OxxPyyPzz * OxxPyyPzz * (2.0 + collFactorM * (6.0 * collFactorM - 11.0))) /
+ (16.0 * collFactorM * collFactorM * (collFactorM - 6.0) - 2.0 * collFactorM * OxxPyyPzz * (216.0 + 5.0 * collFactorM * (9.0 * collFactorM - 46.0)) + OxxPyyPzz * OxxPyyPzz * (collFactorM * (3.0 * collFactorM - 10.0) * (15.0 * collFactorM - 28.0) - 48.0));
+ real A = (4.0 * collFactorM * collFactorM + 2.0 * collFactorM * OxxPyyPzz * (collFactorM - 6.0) + OxxPyyPzz * OxxPyyPzz * (collFactorM * (10.0 - 3.0 * collFactorM) - 4.0)) / ((collFactorM - OxxPyyPzz) * (OxxPyyPzz * (2.0 + 3.0 * collFactorM) - 8.0 * collFactorM));
+ // FIXME: warning C4459: declaration of 'B' hides global declaration (message : see declaration of 'D3Q27System::B' )
+ real BB = (4.0 * collFactorM * OxxPyyPzz * (9.0 * collFactorM - 16.0) - 4.0 * collFactorM * collFactorM - 2.0 * OxxPyyPzz * OxxPyyPzz * (2.0 + 9.0 * collFactorM * (collFactorM - 2.0))) /
+ (3.0 * (collFactorM - OxxPyyPzz) * (OxxPyyPzz * (2.0 + 3.0 * collFactorM) - 8.0 * collFactorM));
+
+ // Cum 4.
+ real CUMcbb = mfcbb - ((mfcaa + c1o3) * mfabb + 2. * mfbba * mfbab);
+ real CUMbcb = mfbcb - ((mfaca + c1o3) * mfbab + 2. * mfbba * mfabb);
+ real CUMbbc = mfbbc - ((mfaac + c1o3) * mfbba + 2. * mfbab * mfabb);
+
+ real CUMcca = mfcca - ((mfcaa * mfaca + 2. * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9 * (oMdrho - c1o1) * oMdrho);
+ real CUMcac = mfcac - ((mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9 * (oMdrho - c1o1) * oMdrho);
+ real CUMacc = mfacc - ((mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9 * (oMdrho - c1o1) * oMdrho);
+
+ // Cum 5.
+ real CUMbcc = mfbcc - (mfaac * mfbca + mfaca * mfbac + 4. * mfabb * mfbbb + 2. * (mfbab * mfacb + mfbba * mfabc)) - c1o3 * (mfbca + mfbac) * oMdrho;
+ real CUMcbc = mfcbc - (mfaac * mfcba + mfcaa * mfabc + 4. * mfbab * mfbbb + 2. * (mfabb * mfcab + mfbba * mfbac)) - c1o3 * (mfcba + mfabc) * oMdrho;
+ real CUMccb = mfccb - (mfcaa * mfacb + mfaca * mfcab + 4. * mfbba * mfbbb + 2. * (mfbab * mfbca + mfabb * mfcba)) - c1o3 * (mfacb + mfcab) * oMdrho;
+
+ // Cum 6.
+ real CUMccc = mfccc +
+ ((-4. * mfbbb * mfbbb - (mfcaa * mfacc + mfaca * mfcac + mfaac * mfcca) - 4. * (mfabb * mfcbb + mfbab * mfbcb + mfbba * mfbbc) - 2. * (mfbca * mfbac + mfcba * mfabc + mfcab * mfacb)) +
+ (4. * (mfbab * mfbab * mfaca + mfabb * mfabb * mfcaa + mfbba * mfbba * mfaac) + 2. * (mfcaa * mfaca * mfaac) + 16. * mfbba * mfbab * mfabb) - c1o3 * (mfacc + mfcac + mfcca) * oMdrho - c1o9 * oMdrho * oMdrho -
+ c1o9 * (mfcaa + mfaca + mfaac) * oMdrho * (1. - 2. * oMdrho) - c1o27 * oMdrho * oMdrho * (-2. * oMdrho) + (2. * (mfbab * mfbab + mfabb * mfabb + mfbba * mfbba) + (mfaac * mfaca + mfaac * mfcaa + mfaca * mfcaa)) * c2o3 * oMdrho) +
+ c1o27 * oMdrho;
+
+ // 2.
+ // linear combinations
+ real mxxPyyPzz = mfcaa + mfaca + mfaac;
+ mxxPyyPzz -= mfaaa; // 12.03.21 shifted by mfaaa
+ // mxxPyyPzz-=(mfaaa+mfaaaS)*c1o2;//12.03.21 shifted by mfaaa
+ real mxxMyy = mfcaa - mfaca;
+ real mxxMzz = mfcaa - mfaac;
+
+ ///
+ real mmfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
+ real mmfaca = c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz);
+ real mmfaac = c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz);
+ real mmfabb = mfabb;
+ real mmfbab = mfbab;
+ real mmfbba = mfbba;
+ ///
+
+ real dxux = -c1o2 * collFactorM * (mxxMyy + mxxMzz) + c1o2 * OxxPyyPzz * (/*mfaaa*/ -mxxPyyPzz) * 0;
+ // real dxux = -c1o2 * (mxxMyy + mxxMzz) * collFactorM - mfaaa * c1o3* omegaDRho;
+ real dyuy = dxux + collFactorM * c3o2 * mxxMyy;
+ real dzuz = dxux + collFactorM * c3o2 * mxxMzz;
+ real Dxy = -c3o1 * collFactorM * mfbba;
+ real Dxz = -c3o1 * collFactorM * mfbab;
+ real Dyz = -c3o1 * collFactorM * mfabb;
+
+ if (phi[DIR_000] > c1o2) {
+ /// QR eddyviscosity:
+ real eddyR = -(Dxy * Dxy + Dxz * Dxz + c1o3 * dxux * dxux) * (dxux) - (Dxy * Dxy + Dyz * Dyz + c1o3 * dyuy * dyuy) * dyuy - (Dxz * Dxz + Dyz * Dyz + c1o3 * dzuz * dzuz) * dzuz - c2o1 * Dxy * Dxz * Dyz;
+ real eddyQ = Dxy * Dxz + Dxy * Dyz + Dxz * Dyz + c1o2 * (dxux * dxux + dyuy * dyuy + dzuz * dzuz);
+ real nuEddy = 5.0e1 * (eddyR / (eddyQ + 1e-100)) * (dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi);
+ nuEddy = (nuEddy < c1o1 / collFactorM) ? c1o1 / collFactorM : nuEddy;
+ collFactorM = c1o1 / nuEddy;
+ // collFactorM = c1o1 / (c1o1 / collFactorM +1.e2*nuEddy*(dX1_phi*dX1_phi+dX2_phi*dX2_phi+dX3_phi*dX3_phi));
+ collFactorM = (collFactorM < 1.8) ? 1.8 : collFactorM;
+ OxyyPxzz = 8.0 * (collFactorM - 2.0) * (OxxPyyPzz * (3.0 * collFactorM - 1.0) - 5.0 * collFactorM) / (8.0 * (5.0 - 2.0 * collFactorM) * collFactorM + OxxPyyPzz * (8.0 + collFactorM * (9.0 * collFactorM - 26.0)));
+ OxyyMxzz = 8.0 * (collFactorM - 2.0) * (collFactorM + OxxPyyPzz * (3.0 * collFactorM - 7.0)) / (OxxPyyPzz * (56.0 - 42.0 * collFactorM + 9.0 * collFactorM * collFactorM) - 8.0 * collFactorM);
+ Oxyz = 24.0 * (collFactorM - 2.0) * (4.0 * collFactorM * collFactorM + collFactorM * OxxPyyPzz * (18.0 - 13.0 * collFactorM) + OxxPyyPzz * OxxPyyPzz * (2.0 + collFactorM * (6.0 * collFactorM - 11.0))) /
+ (16.0 * collFactorM * collFactorM * (collFactorM - 6.0) - 2.0 * collFactorM * OxxPyyPzz * (216.0 + 5.0 * collFactorM * (9.0 * collFactorM - 46.0)) + OxxPyyPzz * OxxPyyPzz * (collFactorM * (3.0 * collFactorM - 10.0) * (15.0 * collFactorM - 28.0) - 48.0));
+ A = (4.0 * collFactorM * collFactorM + 2.0 * collFactorM * OxxPyyPzz * (collFactorM - 6.0) + OxxPyyPzz * OxxPyyPzz * (collFactorM * (10.0 - 3.0 * collFactorM) - 4.0)) / ((collFactorM - OxxPyyPzz) * (OxxPyyPzz * (2.0 + 3.0 * collFactorM) - 8.0 * collFactorM));
+ BB = (4.0 * collFactorM * OxxPyyPzz * (9.0 * collFactorM - 16.0) - 4.0 * collFactorM * collFactorM - 2.0 * OxxPyyPzz * OxxPyyPzz * (2.0 + 9.0 * collFactorM * (collFactorM - 2.0))) /
+ (3.0 * (collFactorM - OxxPyyPzz) * (OxxPyyPzz * (2.0 + 3.0 * collFactorM) - 8.0 * collFactorM));
+ }
+
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // non Newtonian fluid collision factor
+ if (phi[DIR_000] > c1o2) {
+ real shearRate = sqrt(c2o1 * (dxux * dxux + dyuy * dyuy + dzuz * dzuz) + Dxy * Dxy + Dxz * Dxz + Dyz * Dyz);
+ collFactorM = Rheology::getBinghamCollFactor(collFactorM, shearRate, c1o1);
+ collFactorM = (collFactorM < c1o1) ? c1o1 : collFactorM;
+ }
+ // omega = Rheology::getHerschelBulkleyCollFactor(omega, shearRate, drho);
+ // omega = Rheology::getBinghamCollFactor(omega, shearRate, drho);
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+ /////////
+ // real mxxMyyh = -c2o1 * (dxux - dyuy) / collFactorMInv * c1o3;
+ // real mxxMzzh = -c2o1 * (dxux - dzuz) / collFactorMInv * c1o3;
+
+ // relax
+ mxxPyyPzz += OxxPyyPzz * (/*mfaaa*/ -mxxPyyPzz) - 3. * (1. - c1o2 * OxxPyyPzz) * (vx2 * dxux + vy2 * dyuy + vz2 * dzuz);
+ mxxMyy += collFactorM * (-mxxMyy) - 3. * (1. - c1o2 * collFactorM) * (vx2 * dxux - vy2 * dyuy);
+ mxxMzz += collFactorM * (-mxxMzz) - 3. * (1. - c1o2 * collFactorM) * (vx2 * dxux - vz2 * dzuz);
+
+ mfabb += collFactorM * (-mfabb);
+ mfbab += collFactorM * (-mfbab);
+ mfbba += collFactorM * (-mfbba);
+
+ // mxxMyyh += collFactorMInv * (-mxxMyyh) - 3. * (1. - c1o2 * collFactorMInv) * (vx2 * dxux - vy2 * dyuy);
+ // mxxMzzh += collFactorMInv * (-mxxMzzh) - 3. * (1. - c1o2 * collFactorMInv) * (vx2 * dxux - vz2 * dzuz);
+
+ mxxPyyPzz += mfaaa; // 12.03.21 shifted by mfaaa
+
+ // mxxPyyPzz += (mfaaa + mfaaaS) * c1o2;
+ // mfaaa = mfaaaS;
+ // linear combinations back
+ mfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
+ mfaca = c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz);
+ mfaac = c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz);
+
+ // 3.
+ // linear combinations
+ real mxxyPyzz = mfcba + mfabc;
+ real mxxyMyzz = mfcba - mfabc;
+
+ real mxxzPyyz = mfcab + mfacb;
+ real mxxzMyyz = mfcab - mfacb;
+
+ real mxyyPxzz = mfbca + mfbac;
+ real mxyyMxzz = mfbca - mfbac;
+
+ mmfcaa += c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz - mfaaa);
+ mmfaca += c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz - mfaaa);
+ mmfaac += c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz - mfaaa);
+ mmfabb += mfabb;
+ mmfbab += mfbab;
+ mmfbba += mfbba;
+
+ // relax
+ wadjust = Oxyz + (1. - Oxyz) * fabs(mfbbb) / (fabs(mfbbb) + qudricLimit);
+ mfbbb += wadjust * (-mfbbb);
+ wadjust = OxyyPxzz + (1. - OxyyPxzz) * fabs(mxxyPyzz) / (fabs(mxxyPyzz) + qudricLimit);
+ mxxyPyzz += wadjust * (-mxxyPyzz);
+ wadjust = OxyyMxzz + (1. - OxyyMxzz) * fabs(mxxyMyzz) / (fabs(mxxyMyzz) + qudricLimit);
+ mxxyMyzz += wadjust * (-mxxyMyzz);
+ wadjust = OxyyPxzz + (1. - OxyyPxzz) * fabs(mxxzPyyz) / (fabs(mxxzPyyz) + qudricLimit);
+ mxxzPyyz += wadjust * (-mxxzPyyz);
+ wadjust = OxyyMxzz + (1. - OxyyMxzz) * fabs(mxxzMyyz) / (fabs(mxxzMyyz) + qudricLimit);
+ mxxzMyyz += wadjust * (-mxxzMyyz);
+ wadjust = OxyyPxzz + (1. - OxyyPxzz) * fabs(mxyyPxzz) / (fabs(mxyyPxzz) + qudricLimit);
+ mxyyPxzz += wadjust * (-mxyyPxzz);
+ wadjust = OxyyMxzz + (1. - OxyyMxzz) * fabs(mxyyMxzz) / (fabs(mxyyMxzz) + qudricLimit);
+ mxyyMxzz += wadjust * (-mxyyMxzz);
+
+ // linear combinations back
+ mfcba = (mxxyMyzz + mxxyPyzz) * c1o2;
+ mfabc = (-mxxyMyzz + mxxyPyzz) * c1o2;
+ mfcab = (mxxzMyyz + mxxzPyyz) * c1o2;
+ mfacb = (-mxxzMyyz + mxxzPyyz) * c1o2;
+ mfbca = (mxyyMxzz + mxyyPxzz) * c1o2;
+ mfbac = (-mxyyMxzz + mxyyPxzz) * c1o2;
+
+ // 4.
+ CUMacc = -O4 * (c1o1 / collFactorM - c1o2) * (dyuy + dzuz) * c2o3 * A + (c1o1 - O4) * (CUMacc);
+ CUMcac = -O4 * (c1o1 / collFactorM - c1o2) * (dxux + dzuz) * c2o3 * A + (c1o1 - O4) * (CUMcac);
+ CUMcca = -O4 * (c1o1 / collFactorM - c1o2) * (dyuy + dxux) * c2o3 * A + (c1o1 - O4) * (CUMcca);
+ CUMbbc = -O4 * (c1o1 / collFactorM - c1o2) * Dxy * c1o3 * BB + (c1o1 - O4) * (CUMbbc);
+ CUMbcb = -O4 * (c1o1 / collFactorM - c1o2) * Dxz * c1o3 * BB + (c1o1 - O4) * (CUMbcb);
+ CUMcbb = -O4 * (c1o1 / collFactorM - c1o2) * Dyz * c1o3 * BB + (c1o1 - O4) * (CUMcbb);
+
+ // 5.
+ CUMbcc += O5 * (-CUMbcc);
+ CUMcbc += O5 * (-CUMcbc);
+ CUMccb += O5 * (-CUMccb);
+
+ // 6.
+ CUMccc += O6 * (-CUMccc);
+
+ // back cumulants to central moments
+ // 4.
+ mfcbb = CUMcbb + ((mfcaa + c1o3) * mfabb + 2. * mfbba * mfbab);
+ mfbcb = CUMbcb + ((mfaca + c1o3) * mfbab + 2. * mfbba * mfabb);
+ mfbbc = CUMbbc + ((mfaac + c1o3) * mfbba + 2. * mfbab * mfabb);
+
+ mfcca = CUMcca + (mfcaa * mfaca + 2. * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9 * (oMdrho - c1o1) * oMdrho;
+ mfcac = CUMcac + (mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9 * (oMdrho - c1o1) * oMdrho;
+ mfacc = CUMacc + (mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9 * (oMdrho - c1o1) * oMdrho;
+
+ // 5.
+ mfbcc = CUMbcc + (mfaac * mfbca + mfaca * mfbac + 4. * mfabb * mfbbb + 2. * (mfbab * mfacb + mfbba * mfabc)) + c1o3 * (mfbca + mfbac) * oMdrho;
+ mfcbc = CUMcbc + (mfaac * mfcba + mfcaa * mfabc + 4. * mfbab * mfbbb + 2. * (mfabb * mfcab + mfbba * mfbac)) + c1o3 * (mfcba + mfabc) * oMdrho;
+ mfccb = CUMccb + (mfcaa * mfacb + mfaca * mfcab + 4. * mfbba * mfbbb + 2. * (mfbab * mfbca + mfabb * mfcba)) + c1o3 * (mfacb + mfcab) * oMdrho;
+
+ // 6.
+ mfccc = CUMccc -
+ ((-4. * mfbbb * mfbbb - (mfcaa * mfacc + mfaca * mfcac + mfaac * mfcca) - 4. * (mfabb * mfcbb + mfbac * mfbca + mfbba * mfbbc) - 2. * (mfbca * mfbac + mfcba * mfabc + mfcab * mfacb)) +
+ (4. * (mfbab * mfbab * mfaca + mfabb * mfabb * mfcaa + mfbba * mfbba * mfaac) + 2. * (mfcaa * mfaca * mfaac) + 16. * mfbba * mfbab * mfabb) - c1o3 * (mfacc + mfcac + mfcca) * oMdrho - c1o9 * oMdrho * oMdrho -
+ c1o9 * (mfcaa + mfaca + mfaac) * oMdrho * (1. - 2. * oMdrho) - c1o27 * oMdrho * oMdrho * (-2. * oMdrho) + (2. * (mfbab * mfbab + mfabb * mfabb + mfbba * mfbba) + (mfaac * mfaca + mfaac * mfcaa + mfaca * mfcaa)) * c2o3 * oMdrho) -
+ c1o27 * oMdrho;
+
+ ////////
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // forcing
+ mfbaa = -mfbaa;
+ mfaba = -mfaba;
+ mfaab = -mfaab;
+
+ backwardInverseChimeraWithKincompressible(mfaaa, mfbaa, mfcaa, vvx, vx2, c1o1, c1o1, oMdrho);
+ backwardChimera(mfaba, mfbba, mfcba, vvx, vx2);
+ backwardInverseChimeraWithKincompressible(mfaca, mfbca, mfcca, vvx, vx2, c3o1, c1o3, oMdrho);
+ backwardChimera(mfaab, mfbab, mfcab, vvx, vx2);
+ backwardChimera(mfabb, mfbbb, mfcbb, vvx, vx2);
+ backwardChimera(mfacb, mfbcb, mfccb, vvx, vx2);
+ backwardInverseChimeraWithKincompressible(mfaac, mfbac, mfcac, vvx, vx2, c3o1, c1o3, oMdrho);
+ backwardChimera(mfabc, mfbbc, mfcbc, vvx, vx2);
+ backwardInverseChimeraWithKincompressible(mfacc, mfbcc, mfccc, vvx, vx2, c9o1, c1o9, oMdrho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ backwardInverseChimeraWithKincompressible(mfaaa, mfaba, mfaca, vvy, vy2, c6o1, c1o6, oMdrho);
+ backwardChimera(mfaab, mfabb, mfacb, vvy, vy2);
+ backwardInverseChimeraWithKincompressible(mfaac, mfabc, mfacc, vvy, vy2, c18o1, c1o18, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfbaa, mfbba, mfbca, vvy, vy2, c3o2, c2o3, oMdrho);
+ backwardChimera(mfbab, mfbbb, mfbcb, vvy, vy2);
+ backwardInverseChimeraWithKincompressible(mfbac, mfbbc, mfbcc, vvy, vy2, c9o2, c2o9, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfcaa, mfcba, mfcca, vvy, vy2, c6o1, c1o6, oMdrho);
+ backwardChimera(mfcab, mfcbb, mfccb, vvy, vy2);
+ backwardInverseChimeraWithKincompressible(mfcac, mfcbc, mfccc, vvy, vy2, c18o1, c1o18, oMdrho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ backwardInverseChimeraWithKincompressible(mfaaa, mfaab, mfaac, vvz, vz2, c36o1, c1o36, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfaba, mfabb, mfabc, vvz, vz2, c9o1, c1o9, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfaca, mfacb, mfacc, vvz, vz2, c36o1, c1o36, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfbaa, mfbab, mfbac, vvz, vz2, c9o1, c1o9, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfbba, mfbbb, mfbbc, vvz, vz2, c9o4, c4o9, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfbca, mfbcb, mfbcc, vvz, vz2, c9o1, c1o9, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfcaa, mfcab, mfcac, vvz, vz2, c36o1, c1o36, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfcba, mfcbb, mfcbc, vvz, vz2, c9o1, c1o9, oMdrho);
+ backwardInverseChimeraWithKincompressible(mfcca, mfccb, mfccc, vvz, vz2, c36o1, c1o36, oMdrho);
+ //////////////////////////////////////////////////////////////////////////
+ // proof correctness
+ //////////////////////////////////////////////////////////////////////////
+ // #ifdef PROOF_CORRECTNESS
+ real rho_post = (mfaaa + mfaac + mfaca + mfcaa + mfacc + mfcac + mfccc + mfcca) + (mfaab + mfacb + mfcab + mfccb) + (mfaba + mfabc + mfcba + mfcbc) + (mfbaa + mfbac + mfbca + mfbcc) + (mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc) + mfbbb;
+
+ if (UbMath::isNaN(rho_post) || UbMath::isInfinity(rho_post)) UB_THROW(UbException(UB_EXARGS, "rho_post is not a number (nan or -1.#IND) or infinity number -1.#INF, node=" + UbSystem::toString(x1) + "," + UbSystem::toString(x2) + "," + UbSystem::toString(x3)));
+
+ //////////////////////////////////////////////////////////////////////////
+ // write distribution
+ //////////////////////////////////////////////////////////////////////////
+ // if (phi[DIR_000] < c1o2) {
+ (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3) = mfabb; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3) = mfbab; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3) = mfbba; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3) = mfaab; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3) = mfcab; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3) = mfaba; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3) = mfcba; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3) = mfbaa; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3) = mfbca; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3) = mfaaa; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3) = mfcaa; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3) = mfaca; //* rho * c1o3;
+ (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3) = mfcca; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3) = mfcbb; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3) = mfbcb; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p) = mfbbc; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3) = mfccb; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3) = mfacb; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p) = mfcbc; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p) = mfabc; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p) = mfbcc; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p) = mfbac; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p) = mfccc; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p) = mfacc; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p) = mfcac; //* rho * c1o3;
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p) = mfaac; //* rho * c1o3;
+
+ (*this->restDistributionsF)(x1, x2, x3) = mfbbb; // *rho* c1o3;
+
+ f[vf::lbm::dir::DIR_000] = mfbbb;
+
+ f[vf::lbm::dir::DIR_P00] = mfcbb;
+ f[vf::lbm::dir::DIR_0P0] = mfbcb;
+ f[vf::lbm::dir::DIR_00P] = mfbbc;
+ f[vf::lbm::dir::DIR_PP0] = mfccb;
+ f[vf::lbm::dir::DIR_MP0] = mfacb;
+ f[vf::lbm::dir::DIR_P0P] = mfcbc;
+ f[vf::lbm::dir::DIR_M0P] = mfabc;
+ f[vf::lbm::dir::DIR_0PP] = mfbcc;
+ f[vf::lbm::dir::DIR_0MP] = mfbac;
+ f[vf::lbm::dir::DIR_PPP] = mfccc;
+ f[vf::lbm::dir::DIR_MPP] = mfacc;
+ f[vf::lbm::dir::DIR_PMP] = mfcac;
+ f[vf::lbm::dir::DIR_MMP] = mfaac;
+
+ f[vf::lbm::dir::DIR_M00] = mfabb;
+ f[vf::lbm::dir::DIR_0M0] = mfbab;
+ f[vf::lbm::dir::DIR_00M] = mfbba;
+ f[vf::lbm::dir::DIR_MM0] = mfaab;
+ f[vf::lbm::dir::DIR_PM0] = mfcab;
+ f[vf::lbm::dir::DIR_M0M] = mfaba;
+ f[vf::lbm::dir::DIR_P0M] = mfcba;
+ f[vf::lbm::dir::DIR_0MM] = mfbaa;
+ f[vf::lbm::dir::DIR_0PM] = mfbca;
+ f[vf::lbm::dir::DIR_MMM] = mfaaa;
+ f[vf::lbm::dir::DIR_PMM] = mfcaa;
+ f[vf::lbm::dir::DIR_MPM] = mfaca;
+ f[vf::lbm::dir::DIR_PPM] = mfcca;
+ }
+ if ((*particleData)(x1, x2, x3)->solidFraction >= SOLFRAC_MIN) {
+ real vx1, vx2, vx3, drho;
+ D3Q27System::calcIncompMacroscopicValues(f, drho, vx1, vx2, vx3);
+ D3Q27System::calcIncompFeq(fEq, drho, vx1, vx2, vx3);
+
+ std::array<double, 3> uPart;
+ uPart[0] = (*particleData)(x1, x2, x3)->uPart[0];
+ uPart[1] = (*particleData)(x1, x2, x3)->uPart[1];
+ uPart[2] = (*particleData)(x1, x2, x3)->uPart[2];
+
+ D3Q27System::calcIncompFeq(fEqSolid, drho, uPart[0], uPart[1], uPart[2]);
+ real rhoPhaseField = (phi[DIR_000] > c1o2) ? c1o1 : c1o1 / densityRatio;
+ if ((*particleData)(x1, x2, x3)->solidFraction > SOLFRAC_MAX) {
+ double const bb0 = fEq[vf::lbm::dir::DIR_000] - fEqSolid[vf::lbm::dir::DIR_000];
+ f[vf::lbm::dir::DIR_000] = fPre[vf::lbm::dir::DIR_000] + bb0;
+ for (int iPop = D3Q27System::FSTARTDIR; iPop <= D3Q27System::FENDDIR; iPop++) {
+ const int iOpp = D3Q27System::INVDIR[iPop];
+ double const bb = ((fPre[iOpp] - fEq[iOpp]) - (fPre[iPop] - fEqSolid[iPop]));
+ double const bbOpp = ((fPre[iPop] - fEq[iPop]) - (fPre[iOpp] - fEqSolid[iOpp]));
+
+ f[iPop] = fPre[iPop] + bb;
+ f[iOpp] = fPre[iOpp] + bbOpp;
+
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[0] -= D3Q27System::DX1[iPop] * (bb - bbOpp) * rhoPhaseField;
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[1] -= D3Q27System::DX2[iPop] * (bb - bbOpp) * rhoPhaseField;
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[2] -= D3Q27System::DX3[iPop] * (bb - bbOpp) * rhoPhaseField;
+ }
+ } else { /* particleData.solidFraction < SOLFRAC_MAX */
+ // #ifdef LBDEM_USE_WEIGHING
+ double const ooo = 1. / collFactorM - 0.5;
+ double const B = (*particleData)(x1, x2, x3)->solidFraction * ooo / ((1. - (*particleData)(x1, x2, x3)->solidFraction) + ooo);
+ // #else
+ // T const B = particleData.solidFraction;
+ // #endif
+ double const oneMinB = 1. - B;
+
+ double const bb0 = fEq[vf::lbm::dir::DIR_000] - fEqSolid[vf::lbm::dir::DIR_000];
+ f[vf::lbm::dir::DIR_000] = fPre[vf::lbm::dir::DIR_000] + oneMinB * (f[vf::lbm::dir::DIR_000] - fPre[vf::lbm::dir::DIR_000]) + B * bb0;
+
+ for (int iPop = D3Q27System::FSTARTDIR; iPop <= D3Q27System::FENDDIR; iPop++) {
+ int const iOpp = D3Q27System::INVDIR[iPop];
+ double const bb = B * ((fPre[iOpp] - fEq[iOpp]) - (fPre[iPop] - fEqSolid[iPop]));
+ double const bbOpp = B * ((fPre[iPop] - fEq[iPop]) - (fPre[iOpp] - fEqSolid[iOpp]));
+
+ f[iPop] = fPre[iPop] + oneMinB * (f[iPop] - fPre[iPop]) + bb;
+ f[iOpp] = fPre[iOpp] + oneMinB * (f[iOpp] - fPre[iOpp]) + bbOpp;
+
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[0] -= D3Q27System::DX1[iPop] * (bb - bbOpp) * rhoPhaseField;
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[1] -= D3Q27System::DX2[iPop] * (bb - bbOpp) * rhoPhaseField;
+ (*particleData)(x1, x2, x3)->hydrodynamicForce[2] -= D3Q27System::DX3[iPop] * (bb - bbOpp) * rhoPhaseField;
+ }
+ } /* if solidFraction > SOLFRAC_MAX */
+
+ (*this->restDistributionsF)(x1, x2, x3) = f[vf::lbm::dir::DIR_000];
+
+ (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3) = f[vf::lbm::dir::DIR_M00];
+ (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3) = f[vf::lbm::dir::DIR_0M0];
+ (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3) = f[vf::lbm::dir::DIR_00M];
+ (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3) = f[vf::lbm::dir::DIR_MM0];
+ (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3) = f[vf::lbm::dir::DIR_PM0];
+ (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3) = f[vf::lbm::dir::DIR_M0M];
+ (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3) = f[vf::lbm::dir::DIR_P0M];
+ (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3) = f[vf::lbm::dir::DIR_0MM];
+ (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3) = f[vf::lbm::dir::DIR_0PM];
+ (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3) = f[vf::lbm::dir::DIR_MMM];
+ (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3) = f[vf::lbm::dir::DIR_PMM];
+ (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3) = f[vf::lbm::dir::DIR_MPM];
+ (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3) = f[vf::lbm::dir::DIR_PPM];
+
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3) = f[vf::lbm::dir::DIR_P00];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3) = f[vf::lbm::dir::DIR_0P0];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p) = f[vf::lbm::dir::DIR_00P];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3) = f[vf::lbm::dir::DIR_PP0];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3) = f[vf::lbm::dir::DIR_MP0];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p) = f[vf::lbm::dir::DIR_P0P];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p) = f[vf::lbm::dir::DIR_M0P];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p) = f[vf::lbm::dir::DIR_0PP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p) = f[vf::lbm::dir::DIR_0MP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p) = f[vf::lbm::dir::DIR_PPP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p) = f[vf::lbm::dir::DIR_MPP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p) = f[vf::lbm::dir::DIR_PMP];
+ (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p) = f[vf::lbm::dir::DIR_MMP];
+ }
+
+
+
+ ///////////////////// P H A S E - F I E L D S O L V E R
+ ////////////////////////////////////////////
+ /////CUMULANT PHASE-FIELD
+ real omegaD = 1.0 / (3.0 * mob + 0.5);
+ {
+ mfcbb = (*this->localDistributionsH1)(D3Q27System::ET_E, x1, x2, x3);
+ mfbcb = (*this->localDistributionsH1)(D3Q27System::ET_N, x1, x2, x3);
+ mfbbc = (*this->localDistributionsH1)(D3Q27System::ET_T, x1, x2, x3);
+ mfccb = (*this->localDistributionsH1)(D3Q27System::ET_NE, x1, x2, x3);
+ mfacb = (*this->localDistributionsH1)(D3Q27System::ET_NW, x1p, x2, x3);
+ mfcbc = (*this->localDistributionsH1)(D3Q27System::ET_TE, x1, x2, x3);
+ mfabc = (*this->localDistributionsH1)(D3Q27System::ET_TW, x1p, x2, x3);
+ mfbcc = (*this->localDistributionsH1)(D3Q27System::ET_TN, x1, x2, x3);
+ mfbac = (*this->localDistributionsH1)(D3Q27System::ET_TS, x1, x2p, x3);
+ mfccc = (*this->localDistributionsH1)(D3Q27System::ET_TNE, x1, x2, x3);
+ mfacc = (*this->localDistributionsH1)(D3Q27System::ET_TNW, x1p, x2, x3);
+ mfcac = (*this->localDistributionsH1)(D3Q27System::ET_TSE, x1, x2p, x3);
+ mfaac = (*this->localDistributionsH1)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ mfabb = (*this->nonLocalDistributionsH1)(D3Q27System::ET_W, x1p, x2, x3);
+ mfbab = (*this->nonLocalDistributionsH1)(D3Q27System::ET_S, x1, x2p, x3);
+ mfbba = (*this->nonLocalDistributionsH1)(D3Q27System::ET_B, x1, x2, x3p);
+ mfaab = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SW, x1p, x2p, x3);
+ mfcab = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SE, x1, x2p, x3);
+ mfaba = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BW, x1p, x2, x3p);
+ mfcba = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BE, x1, x2, x3p);
+ mfbaa = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BS, x1, x2p, x3p);
+ mfbca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BN, x1, x2, x3p);
+ mfaaa = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ mfcaa = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ mfaca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ mfcca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNE, x1, x2, x3p);
+ mfbbb = (*this->restDistributionsH1)(x1, x2, x3);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Calculate density and velocity using pyramid summation for low round-off errors as in Eq. (J1)-(J3) \ref
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //!
+ ////////////////////////////////////////////////////////////////////////////////////
+ // second component
+ real concentration =
+ ((((mfccc + mfaaa) + (mfaca + mfcac)) + ((mfacc + mfcaa) + (mfaac + mfcca))) + (((mfbac + mfbca) + (mfbaa + mfbcc)) + ((mfabc + mfcba) + (mfaba + mfcbc)) + ((mfacb + mfcab) + (mfaab + mfccb))) + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb;
+ ////////////////////////////////////////////////////////////////////////////////////
+ real oneMinusRho = c1o1 - concentration;
+
+ real cx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) + (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) + (mfcbb - mfabb));
+ real cy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) + (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) + (mfbcb - mfbab));
+ real cz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) + (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) + (mfbbc - mfbba));
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // calculate the square of velocities for this lattice node
+ real cx2 = cx * cx;
+ real cy2 = cy * cy;
+ real cz2 = cz * cz;
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Chimera transform from well conditioned distributions to central moments as defined in Appendix J in \ref
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //! see also Eq. (6)-(14) in \ref
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ forwardInverseChimeraWithKincompressible(mfaaa, mfaab, mfaac, cz, cz2, c36o1, c1o36, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfaba, mfabb, mfabc, cz, cz2, c9o1, c1o9, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfaca, mfacb, mfacc, cz, cz2, c36o1, c1o36, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfbaa, mfbab, mfbac, cz, cz2, c9o1, c1o9, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfbba, mfbbb, mfbbc, cz, cz2, c9o4, c4o9, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfbca, mfbcb, mfbcc, cz, cz2, c9o1, c1o9, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfcaa, mfcab, mfcac, cz, cz2, c36o1, c1o36, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfcba, mfcbb, mfcbc, cz, cz2, c9o1, c1o9, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfcca, mfccb, mfccc, cz, cz2, c36o1, c1o36, oneMinusRho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ forwardInverseChimeraWithKincompressible(mfaaa, mfaba, mfaca, cy, cy2, c6o1, c1o6, oneMinusRho);
+ forwardChimera(mfaab, mfabb, mfacb, cy, cy2);
+ forwardInverseChimeraWithKincompressible(mfaac, mfabc, mfacc, cy, cy2, c18o1, c1o18, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfbaa, mfbba, mfbca, cy, cy2, c3o2, c2o3, oneMinusRho);
+ forwardChimera(mfbab, mfbbb, mfbcb, cy, cy2);
+ forwardInverseChimeraWithKincompressible(mfbac, mfbbc, mfbcc, cy, cy2, c9o2, c2o9, oneMinusRho);
+ forwardInverseChimeraWithKincompressible(mfcaa, mfcba, mfcca, cy, cy2, c6o1, c1o6, oneMinusRho);
+ forwardChimera(mfcab, mfcbb, mfccb, cy, cy2);
+ forwardInverseChimeraWithKincompressible(mfcac, mfcbc, mfccc, cy, cy2, c18o1, c1o18, oneMinusRho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // X - Dir
+ forwardInverseChimeraWithKincompressible(mfaaa, mfbaa, mfcaa, cx, cx2, c1o1, c1o1, oneMinusRho);
+ forwardChimera(mfaba, mfbba, mfcba, cx, cx2);
+ forwardInverseChimeraWithKincompressible(mfaca, mfbca, mfcca, cx, cx2, c3o1, c1o3, oneMinusRho);
+ forwardChimera(mfaab, mfbab, mfcab, cx, cx2);
+ forwardChimera(mfabb, mfbbb, mfcbb, cx, cx2);
+ forwardChimera(mfacb, mfbcb, mfccb, cx, cx2);
+ forwardInverseChimeraWithKincompressible(mfaac, mfbac, mfcac, cx, cx2, c3o1, c1o3, oneMinusRho);
+ forwardChimera(mfabc, mfbbc, mfcbc, cx, cx2);
+ forwardInverseChimeraWithKincompressible(mfacc, mfbcc, mfccc, cx, cx2, c3o1, c1o9, oneMinusRho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - experimental Cumulant ... to be published ... hopefully
+ //!
+
+ // linearized orthogonalization of 3rd order central moments
+ real Mabc = mfabc - mfaba * c1o3;
+ real Mbca = mfbca - mfbaa * c1o3;
+ real Macb = mfacb - mfaab * c1o3;
+ real Mcba = mfcba - mfaba * c1o3;
+ real Mcab = mfcab - mfaab * c1o3;
+ real Mbac = mfbac - mfbaa * c1o3;
+ // linearized orthogonalization of 5th order central moments
+ real Mcbc = mfcbc - mfaba * c1o9;
+ real Mbcc = mfbcc - mfbaa * c1o9;
+ real Mccb = mfccb - mfaab * c1o9;
+
+ // 31.05.2022 addaptive mobility
+ // omegaD = c1o1 + (sqrt((cx - vvx * concentration) * (cx - vvx * concentration) + (cy - vvy * concentration) * (cy - vvy * concentration) + (cz - vvz * concentration) * (cz - vvz * concentration))) / (sqrt((cx - vvx * concentration) * (cx - vvx * concentration) + (cy - vvy *
+ // concentration) * (cy - vvy * concentration) + (cz - vvz * concentration) * (cz - vvz * concentration)) + fabs((1.0 - concentration) * (concentration)) * c1o6 * oneOverInterfaceScale+1.0e-200); omegaD = c2o1 * (concentration * (concentration - c1o1)) / (-c6o1 * (sqrt((cx -
+ // vvx * concentration) * (cx - vvx * concentration) + (cy - vvy * concentration) * (cy - vvy * concentration) + (cz - vvz * concentration) * (cz - vvz * concentration))) + (concentration * (concentration - c1o1))+1.0e-200);
+ // collision of 1st order moments
+ cx = cx * (c1o1 - omegaD) + omegaD * vvx * concentration + normX1 * (c1o1 - 0.5 * omegaD) * (1.0 - concentration) * (concentration)*c1o3 * oneOverInterfaceScale;
+ cy = cy * (c1o1 - omegaD) + omegaD * vvy * concentration + normX2 * (c1o1 - 0.5 * omegaD) * (1.0 - concentration) * (concentration)*c1o3 * oneOverInterfaceScale;
+ cz = cz * (c1o1 - omegaD) + omegaD * vvz * concentration + normX3 * (c1o1 - 0.5 * omegaD) * (1.0 - concentration) * (concentration)*c1o3 * oneOverInterfaceScale;
+
+ cx2 = cx * cx;
+ cy2 = cy * cy;
+ cz2 = cz * cz;
+
+ // equilibration of 2nd order moments
+ mfbba = c0o1;
+ mfbab = c0o1;
+ mfabb = c0o1;
+
+ mfcaa = c1o3 * concentration;
+ mfaca = c1o3 * concentration;
+ mfaac = c1o3 * concentration;
+
+ // equilibration of 3rd order moments
+ Mabc = c0o1;
+ Mbca = c0o1;
+ Macb = c0o1;
+ Mcba = c0o1;
+ Mcab = c0o1;
+ Mbac = c0o1;
+ mfbbb = c0o1;
+
+ // from linearized orthogonalization 3rd order central moments to central moments
+ mfabc = Mabc + mfaba * c1o3;
+ mfbca = Mbca + mfbaa * c1o3;
+ mfacb = Macb + mfaab * c1o3;
+ mfcba = Mcba + mfaba * c1o3;
+ mfcab = Mcab + mfaab * c1o3;
+ mfbac = Mbac + mfbaa * c1o3;
+
+ // equilibration of 4th order moments
+ mfacc = c1o9 * concentration;
+ mfcac = c1o9 * concentration;
+ mfcca = c1o9 * concentration;
+
+ mfcbb = c0o1;
+ mfbcb = c0o1;
+ mfbbc = c0o1;
+
+ // equilibration of 5th order moments
+ Mcbc = c0o1;
+ Mbcc = c0o1;
+ Mccb = c0o1;
+
+ // from linearized orthogonalization 5th order central moments to central moments
+ mfcbc = Mcbc + mfaba * c1o9;
+ mfbcc = Mbcc + mfbaa * c1o9;
+ mfccb = Mccb + mfaab * c1o9;
+
+ // equilibration of 6th order moment
+ mfccc = c1o27 * concentration;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Chimera transform from central moments to well conditioned distributions as defined in Appendix J in
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //! see also Eq. (88)-(96) in
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ ////////////////////////////////////////////////////////////////////////////////////
+ // X - Dir
+ backwardInverseChimeraWithKincompressible(mfaaa, mfbaa, mfcaa, cx, cx2, c1o1, c1o1, oneMinusRho);
+ backwardChimera(mfaba, mfbba, mfcba, cx, cx2);
+ backwardInverseChimeraWithKincompressible(mfaca, mfbca, mfcca, cx, cx2, c3o1, c1o3, oneMinusRho);
+ backwardChimera(mfaab, mfbab, mfcab, cx, cx2);
+ backwardChimera(mfabb, mfbbb, mfcbb, cx, cx2);
+ backwardChimera(mfacb, mfbcb, mfccb, cx, cx2);
+ backwardInverseChimeraWithKincompressible(mfaac, mfbac, mfcac, cx, cx2, c3o1, c1o3, oneMinusRho);
+ backwardChimera(mfabc, mfbbc, mfcbc, cx, cx2);
+ backwardInverseChimeraWithKincompressible(mfacc, mfbcc, mfccc, cx, cx2, c9o1, c1o9, oneMinusRho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ backwardInverseChimeraWithKincompressible(mfaaa, mfaba, mfaca, cy, cy2, c6o1, c1o6, oneMinusRho);
+ backwardChimera(mfaab, mfabb, mfacb, cy, cy2);
+ backwardInverseChimeraWithKincompressible(mfaac, mfabc, mfacc, cy, cy2, c18o1, c1o18, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfbaa, mfbba, mfbca, cy, cy2, c3o2, c2o3, oneMinusRho);
+ backwardChimera(mfbab, mfbbb, mfbcb, cy, cy2);
+ backwardInverseChimeraWithKincompressible(mfbac, mfbbc, mfbcc, cy, cy2, c9o2, c2o9, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfcaa, mfcba, mfcca, cy, cy2, c6o1, c1o6, oneMinusRho);
+ backwardChimera(mfcab, mfcbb, mfccb, cy, cy2);
+ backwardInverseChimeraWithKincompressible(mfcac, mfcbc, mfccc, cy, cy2, c18o1, c1o18, oneMinusRho);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ backwardInverseChimeraWithKincompressible(mfaaa, mfaab, mfaac, cz, cz2, c36o1, c1o36, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfaba, mfabb, mfabc, cz, cz2, c9o1, c1o9, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfaca, mfacb, mfacc, cz, cz2, c36o1, c1o36, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfbaa, mfbab, mfbac, cz, cz2, c9o1, c1o9, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfbba, mfbbb, mfbbc, cz, cz2, c9o4, c4o9, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfbca, mfbcb, mfbcc, cz, cz2, c9o1, c1o9, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfcaa, mfcab, mfcac, cz, cz2, c36o1, c1o36, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfcba, mfcbb, mfcbc, cz, cz2, c9o1, c1o9, oneMinusRho);
+ backwardInverseChimeraWithKincompressible(mfcca, mfccb, mfccc, cz, cz2, c36o1, c1o36, oneMinusRho);
+
+ (*this->localDistributionsH1)(D3Q27System::ET_E, x1, x2, x3) = mfabb;
+ (*this->localDistributionsH1)(D3Q27System::ET_N, x1, x2, x3) = mfbab;
+ (*this->localDistributionsH1)(D3Q27System::ET_T, x1, x2, x3) = mfbba;
+ (*this->localDistributionsH1)(D3Q27System::ET_NE, x1, x2, x3) = mfaab;
+ (*this->localDistributionsH1)(D3Q27System::ET_NW, x1p, x2, x3) = mfcab;
+ (*this->localDistributionsH1)(D3Q27System::ET_TE, x1, x2, x3) = mfaba;
+ (*this->localDistributionsH1)(D3Q27System::ET_TW, x1p, x2, x3) = mfcba;
+ (*this->localDistributionsH1)(D3Q27System::ET_TN, x1, x2, x3) = mfbaa;
+ (*this->localDistributionsH1)(D3Q27System::ET_TS, x1, x2p, x3) = mfbca;
+ (*this->localDistributionsH1)(D3Q27System::ET_TNE, x1, x2, x3) = mfaaa;
+ (*this->localDistributionsH1)(D3Q27System::ET_TNW, x1p, x2, x3) = mfcaa;
+ (*this->localDistributionsH1)(D3Q27System::ET_TSE, x1, x2p, x3) = mfaca;
+ (*this->localDistributionsH1)(D3Q27System::ET_TSW, x1p, x2p, x3) = mfcca;
+
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_W, x1p, x2, x3) = mfcbb;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_S, x1, x2p, x3) = mfbcb;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_B, x1, x2, x3p) = mfbbc;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_SW, x1p, x2p, x3) = mfccb;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_SE, x1, x2p, x3) = mfacb;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_BW, x1p, x2, x3p) = mfcbc;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_BE, x1, x2, x3p) = mfabc;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_BS, x1, x2p, x3p) = mfbcc;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_BN, x1, x2, x3p) = mfbac;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSW, x1p, x2p, x3p) = mfccc;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSE, x1, x2p, x3p) = mfacc;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNW, x1p, x2, x3p) = mfcac;
+ (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNE, x1, x2, x3p) = mfaac;
+
+ (*this->restDistributionsH1)(x1, x2, x3) = mfbbb;
+
+ }
+ }
+ }
+ }
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+
+real IBsharpInterfaceLBMKernel::gradX1_phi()
+{
+ using namespace D3Q27System;
+ return 3.0 * ((WEIGTH[DIR_PPP] * (((phi[DIR_PPP] - phi[DIR_MMM]) + (phi[DIR_PMM] - phi[DIR_MPP])) + ((phi[DIR_PMP] - phi[DIR_MPM]) + (phi[DIR_PPM] - phi[DIR_MMP]))) +
+ WEIGTH[DIR_PP0] * (((phi[DIR_P0P] - phi[DIR_M0M]) + (phi[DIR_P0M] - phi[DIR_M0P])) + ((phi[DIR_PM0] - phi[DIR_MP0]) + (phi[DIR_PP0] - phi[DIR_MM0])))) +
+ +WEIGTH[DIR_0P0] * (phi[DIR_P00] - phi[DIR_M00]));
+}
+
+real IBsharpInterfaceLBMKernel::gradX2_phi()
+{
+ using namespace D3Q27System;
+ return 3.0 * ((WEIGTH[DIR_PPP] * (((phi[DIR_PPP] - phi[DIR_MMM]) - (phi[DIR_PMM] - phi[DIR_MPP])) + ((phi[DIR_PPM] - phi[DIR_MMP]) - (phi[DIR_PMP] - phi[DIR_MPM]))) +
+ WEIGTH[DIR_PP0] * (((phi[DIR_0PP] - phi[DIR_0MM]) + (phi[DIR_0PM] - phi[DIR_0MP])) + ((phi[DIR_PP0] - phi[DIR_MM0]) - (phi[DIR_PM0] - phi[DIR_MP0])))) +
+ +WEIGTH[DIR_0P0] * (phi[DIR_0P0] - phi[DIR_0M0]));
+}
+
+real IBsharpInterfaceLBMKernel::gradX3_phi()
+{
+ using namespace D3Q27System;
+ return 3.0 * ((WEIGTH[DIR_PPP] * (((phi[DIR_PPP] - phi[DIR_MMM]) - (phi[DIR_PMM] - phi[DIR_MPP])) + ((phi[DIR_PMP] - phi[DIR_MPM]) - (phi[DIR_PPM] - phi[DIR_MMP]))) +
+ WEIGTH[DIR_PP0] * (((phi[DIR_P0P] - phi[DIR_M0M]) - (phi[DIR_P0M] - phi[DIR_M0P])) + ((phi[DIR_0MP] - phi[DIR_0PM]) + (phi[DIR_0PP] - phi[DIR_0MM])))) +
+ +WEIGTH[DIR_0P0] * (phi[DIR_00P] - phi[DIR_00M]));
+}
+
+real IBsharpInterfaceLBMKernel::gradX1_rhoInv(real rhoL, real rhoDIV)
+{
+ using namespace D3Q27System;
+ return 3.0 * ((WEIGTH[DIR_PPP] * (((1.0 / (rhoL + rhoDIV * phi[DIR_PPP]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MMM])) + (1.0 / (rhoL + rhoDIV * phi[DIR_PMM]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MPP]))) +
+ ((1.0 / (rhoL + rhoDIV * phi[DIR_PMP]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MPM])) + (1.0 / (rhoL + rhoDIV * phi[DIR_PPM]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MMP])))) +
+ WEIGTH[DIR_PP0] * (((1.0 / (rhoL + rhoDIV * phi[DIR_P0P]) - 1.0 / (rhoL + rhoDIV * phi[DIR_M0M])) + (1.0 / (rhoL + rhoDIV * phi[DIR_P0M]) - 1.0 / (rhoL + rhoDIV * phi[DIR_M0P]))) +
+ ((1.0 / (rhoL + rhoDIV * phi[DIR_PM0]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MP0])) + (1.0 / (rhoL + rhoDIV * phi[DIR_PP0]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MM0]))))) +
+ +WEIGTH[DIR_0P0] * (1.0 / (rhoL + rhoDIV * phi[DIR_P00]) - 1.0 / (rhoL + rhoDIV * phi[DIR_M00])));
+}
+
+real IBsharpInterfaceLBMKernel::gradX2_rhoInv(real rhoL, real rhoDIV)
+{
+ using namespace D3Q27System;
+ return 3.0 * ((WEIGTH[DIR_PPP] * (((1.0 / (rhoL + rhoDIV * phi[DIR_PPP]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MMM])) - (1.0 / (rhoL + rhoDIV * phi[DIR_PMM]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MPP]))) +
+ ((1.0 / (rhoL + rhoDIV * phi[DIR_PPM]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MMP])) - (1.0 / (rhoL + rhoDIV * phi[DIR_PMP]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MPM])))) +
+ WEIGTH[DIR_PP0] * (((1.0 / (rhoL + rhoDIV * phi[DIR_0PP]) - 1.0 / (rhoL + rhoDIV * phi[DIR_0MM])) + (1.0 / (rhoL + rhoDIV * phi[DIR_0PM]) - 1.0 / (rhoL + rhoDIV * phi[DIR_0MP]))) +
+ ((1.0 / (rhoL + rhoDIV * phi[DIR_PP0]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MM0])) - (1.0 / (rhoL + rhoDIV * phi[DIR_PM0]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MP0]))))) +
+ +WEIGTH[DIR_0P0] * (1.0 / (rhoL + rhoDIV * phi[DIR_0P0]) - 1.0 / (rhoL + rhoDIV * phi[DIR_0M0])));
+}
+
+real IBsharpInterfaceLBMKernel::gradX3_rhoInv(real rhoL, real rhoDIV)
+{
+ using namespace D3Q27System;
+ return 3.0 * ((WEIGTH[DIR_PPP] * (((1.0 / (rhoL + rhoDIV * phi[DIR_PPP]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MMM])) - (1.0 / (rhoL + rhoDIV * phi[DIR_PMM]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MPP]))) +
+ ((1.0 / (rhoL + rhoDIV * phi[DIR_PMP]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MPM])) - (1.0 / (rhoL + rhoDIV * phi[DIR_PPM]) - 1.0 / (rhoL + rhoDIV * phi[DIR_MMP])))) +
+ WEIGTH[DIR_PP0] * (((1.0 / (rhoL + rhoDIV * phi[DIR_P0P]) - 1.0 / (rhoL + rhoDIV * phi[DIR_M0M])) - (1.0 / (rhoL + rhoDIV * phi[DIR_P0M]) - 1.0 / (rhoL + rhoDIV * phi[DIR_M0P]))) +
+ ((1.0 / (rhoL + rhoDIV * phi[DIR_0MP]) - 1.0 / (rhoL + rhoDIV * phi[DIR_0PM])) + (1.0 / (rhoL + rhoDIV * phi[DIR_0PP]) - 1.0 / (rhoL + rhoDIV * phi[DIR_0MM]))))) +
+ +WEIGTH[DIR_0P0] * (1.0 / (rhoL + rhoDIV * phi[DIR_00P]) - 1.0 / (rhoL + rhoDIV * phi[DIR_00M])));
+}
+
+real IBsharpInterfaceLBMKernel::gradX1_phi2()
+{
+ using namespace D3Q27System;
+ return 3.0 * ((WEIGTH[DIR_PPP] * (((phi2[DIR_PPP] - phi2[DIR_MMM]) + (phi2[DIR_PMM] - phi2[DIR_MPP])) + ((phi2[DIR_PMP] - phi2[DIR_MPM]) + (phi2[DIR_PPM] - phi2[DIR_MMP]))) +
+ WEIGTH[DIR_PP0] * (((phi2[DIR_P0P] - phi2[DIR_M0M]) + (phi2[DIR_P0M] - phi2[DIR_M0P])) + ((phi2[DIR_PM0] - phi2[DIR_MP0]) + (phi2[DIR_PP0] - phi2[DIR_MM0])))) +
+ +WEIGTH[DIR_0P0] * (phi2[DIR_P00] - phi2[DIR_M00]));
+}
+
+real IBsharpInterfaceLBMKernel::gradX2_phi2()
+{
+ using namespace D3Q27System;
+ return 3.0 * ((WEIGTH[DIR_PPP] * (((phi2[DIR_PPP] - phi2[DIR_MMM]) - (phi2[DIR_PMM] - phi2[DIR_MPP])) + ((phi2[DIR_PPM] - phi2[DIR_MMP]) - (phi2[DIR_PMP] - phi2[DIR_MPM]))) +
+ WEIGTH[DIR_PP0] * (((phi2[DIR_0PP] - phi2[DIR_0MM]) + (phi2[DIR_0PM] - phi2[DIR_0MP])) + ((phi2[DIR_PP0] - phi2[DIR_MM0]) - (phi2[DIR_PM0] - phi2[DIR_MP0])))) +
+ +WEIGTH[DIR_0P0] * (phi2[DIR_0P0] - phi2[DIR_0M0]));
+}
+
+real IBsharpInterfaceLBMKernel::gradX3_phi2()
+{
+ using namespace D3Q27System;
+ return 3.0 * ((WEIGTH[DIR_PPP] * (((phi2[DIR_PPP] - phi2[DIR_MMM]) - (phi2[DIR_PMM] - phi2[DIR_MPP])) + ((phi2[DIR_PMP] - phi2[DIR_MPM]) - (phi2[DIR_PPM] - phi2[DIR_MMP]))) +
+ WEIGTH[DIR_PP0] * (((phi2[DIR_P0P] - phi2[DIR_M0M]) - (phi2[DIR_P0M] - phi2[DIR_M0P])) + ((phi2[DIR_0MP] - phi2[DIR_0PM]) + (phi2[DIR_0PP] - phi2[DIR_0MM])))) +
+ +WEIGTH[DIR_0P0] * (phi2[DIR_00P] - phi2[DIR_00M]));
+}
+
+real IBsharpInterfaceLBMKernel::nabla2_phi()
+{
+ using namespace D3Q27System;
+ real sum = 0.0;
+ sum += WEIGTH[DIR_PPP] * ((((phi[DIR_PPP] - phi[DIR_000]) + (phi[DIR_MMM] - phi[DIR_000])) + ((phi[DIR_MMP] - phi[DIR_000]) + (phi[DIR_PPM] - phi[DIR_000]))) + (((phi[DIR_MPP] - phi[DIR_000]) + (phi[DIR_PMM] - phi[DIR_000])) + ((phi[DIR_PMP] - phi[DIR_000]) + (phi[DIR_MPM] - phi[DIR_000]))));
+ sum += WEIGTH[DIR_0PP] * ((((phi[DIR_0PP] - phi[DIR_000]) + (phi[DIR_0MM] - phi[DIR_000])) + ((phi[DIR_0MP] - phi[DIR_000]) + (phi[DIR_0PM] - phi[DIR_000]))) + (((phi[DIR_P0P] - phi[DIR_000]) + (phi[DIR_M0M] - phi[DIR_000])) + ((phi[DIR_M0P] - phi[DIR_000]) + (phi[DIR_P0M] - phi[DIR_000]))) +
+ (((phi[DIR_PP0] - phi[DIR_000]) + (phi[DIR_MM0] - phi[DIR_000])) + ((phi[DIR_MP0] - phi[DIR_000]) + (phi[DIR_PM0] - phi[DIR_000]))));
+ sum += WEIGTH[DIR_00P] * (((phi[DIR_00P] - phi[DIR_000]) + (phi[DIR_00M] - phi[DIR_000])) + ((phi[DIR_0P0] - phi[DIR_000]) + (phi[DIR_0M0] - phi[DIR_000])) + ((phi[DIR_P00] - phi[DIR_000]) + (phi[DIR_M00] - phi[DIR_000])));
+
+ return 6.0 * sum;
+}
+
+real IBsharpInterfaceLBMKernel::computeCurvature_phi()
+{
+ using namespace D3Q27System;
+ using namespace UbMath;
+
+ real phiX = gradX1_phi();
+ real phiY = gradX2_phi();
+ real phiZ = gradX3_phi();
+ real phiXX =
+ c4o9 * (phi[DIR_P00] - c2o1 * phi[DIR_000] + phi[DIR_M00]) + (c1o9 * (((phi[DIR_PP0] - c2o1 * phi[DIR_0P0] + phi[DIR_MP0]) + (phi[DIR_PM0] - c2o1 * phi[DIR_0M0] + phi[DIR_MM0])) + ((phi[DIR_P0P] - c2o1 * phi[DIR_00P] + phi[DIR_M0P]) + (phi[DIR_P0M] - c2o1 * phi[DIR_00M] + phi[DIR_M0M]))) +
+ c1o36 * (((phi[DIR_PPP] - c2o1 * phi[DIR_0PP] + phi[DIR_MPP]) + (phi[DIR_PMP] - c2o1 * phi[DIR_0MP] + phi[DIR_MMP])) + ((phi[DIR_PPM] - c2o1 * phi[DIR_0PM] + phi[DIR_MPM]) + (phi[DIR_PMM] - c2o1 * phi[DIR_0MM] + phi[DIR_MMM]))));
+ real phiYY =
+ c4o9 * (phi[DIR_0P0] - c2o1 * phi[DIR_000] + phi[DIR_0M0]) + (c1o9 * (((phi[DIR_PP0] - c2o1 * phi[DIR_P00] + phi[DIR_PM0]) + (phi[DIR_MP0] - c2o1 * phi[DIR_M00] + phi[DIR_MM0])) + ((phi[DIR_0PP] - c2o1 * phi[DIR_00P] + phi[DIR_0MP]) + (phi[DIR_0PM] - c2o1 * phi[DIR_00M] + phi[DIR_0MM]))) +
+ c1o36 * (((phi[DIR_PPP] - c2o1 * phi[DIR_P0P] + phi[DIR_PMP]) + (phi[DIR_MPM] - c2o1 * phi[DIR_M0M] + phi[DIR_MMM])) + ((phi[DIR_MPP] - c2o1 * phi[DIR_M0P] + phi[DIR_MMP]) + (phi[DIR_PPM] - c2o1 * phi[DIR_P0M] + phi[DIR_PMM]))));
+ real phiZZ =
+ c4o9 * (phi[DIR_00P] - c2o1 * phi[DIR_000] + phi[DIR_00M]) + (c1o9 * (((phi[DIR_M0P] - c2o1 * phi[DIR_M00] + phi[DIR_M0M]) + (phi[DIR_P0P] - c2o1 * phi[DIR_P00] + phi[DIR_P0M])) + ((phi[DIR_0MP] - c2o1 * phi[DIR_0M0] + phi[DIR_0MM]) + (phi[DIR_0PP] - c2o1 * phi[DIR_0P0] + phi[DIR_0PM]))) +
+ c1o36 * (((phi[DIR_MPP] - c2o1 * phi[DIR_MP0] + phi[DIR_MPM]) + (phi[DIR_PMP] - c2o1 * phi[DIR_PM0] + phi[DIR_PMM])) + ((phi[DIR_MMP] - c2o1 * phi[DIR_MM0] + phi[DIR_MMM]) + (phi[DIR_PPP] - c2o1 * phi[DIR_PP0] + phi[DIR_PPM]))));
+ real phiXY = c1o4 * (c2o3 * (phi[DIR_MM0] - phi[DIR_PM0] + phi[DIR_PP0] - phi[DIR_MP0]) + c1o6 * ((phi[DIR_MMP] - phi[DIR_PMP] + phi[DIR_PPP] - phi[DIR_MPP]) + (phi[DIR_MMM] - phi[DIR_PMM] + phi[DIR_PPM] - phi[DIR_MPM])));
+ real phiXZ = c1o4 * (c2o3 * (phi[DIR_M0M] - phi[DIR_P0M] + phi[DIR_P0P] - phi[DIR_M0P]) + c1o6 * ((phi[DIR_MPM] - phi[DIR_PPM] + phi[DIR_PPP] - phi[DIR_MPP]) + (phi[DIR_MMM] - phi[DIR_PMM] + phi[DIR_PMP] - phi[DIR_MMP])));
+ real phiYZ = c1o4 * (c2o3 * (phi[DIR_0MM] - phi[DIR_0MP] + phi[DIR_0PP] - phi[DIR_0PM]) + c1o6 * ((phi[DIR_MMM] - phi[DIR_MMP] + phi[DIR_MPP] - phi[DIR_MPM]) + (phi[DIR_PMM] - phi[DIR_PMP] + phi[DIR_PPP] - phi[DIR_PPM])));
+
+ // non isotropic FD (to be improved):
+ // real phiX = (phi[DIR_P00] - phi[DIR_M00]) * c1o2; //gradX1_phi();
+ // real phiY = (phi[DIR_0P0] - phi[DIR_0M0]) * c1o2; //gradX2_phi();
+ // real phiZ = (phi[DIR_00P] - phi[DIR_00M]) * c1o2; //gradX3_phi();
+
+ // real phiXX = phi[DIR_P00] - c2o1 * phi[DIR_000] + phi[DIR_M00];
+ // real phiYY = phi[DIR_0P0] - c2o1 * phi[DIR_000] + phi[DIR_0M0];
+ // real phiZZ =( phi[DIR_00P] - c2o1 * phi[DIR_000] + phi[DIR_00M]);
+ // real phiXY = c1o4 * (phi[DIR_MM0] - phi[DIR_PM0] + phi[DIR_PP0] - phi[DIR_MP0]);
+ // real phiXZ = c1o4 * (phi[DIR_M0M] - phi[DIR_P0M] + phi[DIR_P0P] - phi[DIR_M0P]);
+ // real phiYZ = c1o4 * (phi[DIR_0MM] - phi[DIR_0MP] + phi[DIR_0PP] - phi[DIR_0PM]);
+ // real back= (c2o1 * (phiX * phiY * phiXY + phiX * phiZ * phiXZ + phiY * phiZ * phiYZ) - phiXX * (phiY * phiY + phiZ * phiZ) - phiYY * (phiX * phiX + phiZ * phiZ) - phiZZ * (phiX * phiX + phiY * phiY)) / (c2o1 * pow(phiX * phiX + phiY * phiY + phiZ * phiZ, c3o2));
+ return (c2o1 * (phiX * phiY * phiXY + phiX * phiZ * phiXZ + phiY * phiZ * phiYZ) - phiXX * (phiY * phiY + phiZ * phiZ) - phiYY * (phiX * phiX + phiZ * phiZ) - phiZZ * (phiX * phiX + phiY * phiY)) / (c2o1 * pow(phiX * phiX + phiY * phiY + phiZ * phiZ, c3o2));
+}
+
+void IBsharpInterfaceLBMKernel::computePhasefield()
+{
+ using namespace D3Q27System;
+ SPtr<DistributionArray3D> distributionsH = dataSet->getHdistributions();
+
+ int minX1 = ghostLayerWidth;
+ int minX2 = ghostLayerWidth;
+ int minX3 = ghostLayerWidth;
+ int maxX1 = (int)distributionsH->getNX1() - ghostLayerWidth;
+ int maxX2 = (int)distributionsH->getNX2() - ghostLayerWidth;
+ int maxX3 = (int)distributionsH->getNX3() - ghostLayerWidth;
+
+ //------------- Computing the phase-field ------------------
+ for (int x3 = minX3; x3 < maxX3; x3++) {
+ for (int x2 = minX2; x2 < maxX2; x2++) {
+ for (int x1 = minX1; x1 < maxX1; x1++) {
+ // if(!bcArray->isSolid(x1,x2,x3) && !bcArray->isUndefined(x1,x2,x3))
+ {
+ int x1p = x1 + 1;
+ int x2p = x2 + 1;
+ int x3p = x3 + 1;
+
+ h[DIR_P00] = (*this->localDistributionsH1)(D3Q27System::ET_E, x1, x2, x3);
+ h[DIR_0P0] = (*this->localDistributionsH1)(D3Q27System::ET_N, x1, x2, x3);
+ h[DIR_00P] = (*this->localDistributionsH1)(D3Q27System::ET_T, x1, x2, x3);
+ h[DIR_PP0] = (*this->localDistributionsH1)(D3Q27System::ET_NE, x1, x2, x3);
+ h[DIR_MP0] = (*this->localDistributionsH1)(D3Q27System::ET_NW, x1p, x2, x3);
+ h[DIR_P0P] = (*this->localDistributionsH1)(D3Q27System::ET_TE, x1, x2, x3);
+ h[DIR_M0P] = (*this->localDistributionsH1)(D3Q27System::ET_TW, x1p, x2, x3);
+ h[DIR_0PP] = (*this->localDistributionsH1)(D3Q27System::ET_TN, x1, x2, x3);
+ h[DIR_0MP] = (*this->localDistributionsH1)(D3Q27System::ET_TS, x1, x2p, x3);
+ h[DIR_PPP] = (*this->localDistributionsH1)(D3Q27System::ET_TNE, x1, x2, x3);
+ h[DIR_MPP] = (*this->localDistributionsH1)(D3Q27System::ET_TNW, x1p, x2, x3);
+ h[DIR_PMP] = (*this->localDistributionsH1)(D3Q27System::ET_TSE, x1, x2p, x3);
+ h[DIR_MMP] = (*this->localDistributionsH1)(D3Q27System::ET_TSW, x1p, x2p, x3);
+
+ h[DIR_M00] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_W, x1p, x2, x3);
+ h[DIR_0M0] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_S, x1, x2p, x3);
+ h[DIR_00M] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_B, x1, x2, x3p);
+ h[DIR_MM0] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SW, x1p, x2p, x3);
+ h[DIR_PM0] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SE, x1, x2p, x3);
+ h[DIR_M0M] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BW, x1p, x2, x3p);
+ h[DIR_P0M] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BE, x1, x2, x3p);
+ h[DIR_0MM] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BS, x1, x2p, x3p);
+ h[DIR_0PM] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BN, x1, x2, x3p);
+ h[DIR_MMM] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ h[DIR_PMM] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ h[DIR_MPM] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ h[DIR_PPM] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNE, x1, x2, x3p);
+
+ h[DIR_000] = (*this->restDistributionsH1)(x1, x2, x3);
+ }
+ }
+ }
+ }
+}
+
+void IBsharpInterfaceLBMKernel::findNeighbors(CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr ph, int x1, int x2, int x3)
+{
+ using namespace D3Q27System;
+
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
+
+ phi[DIR_000] = (*ph)(x1, x2, x3);
+
+ for (int k = FSTARTDIR; k <= FENDDIR; k++) {
+
+ if (!bcArray->isSolid(x1 + DX1[k], x2 + DX2[k], x3 + DX3[k])) {
+ phi[k] = (*ph)(x1 + DX1[k], x2 + DX2[k], x3 + DX3[k]);
+ } else {
+ phi[k] = (*ph)(x1, x2, x3); // neutral wetting
+ // phi[k] = 0.0;//unwetting
+ }
+ }
+}
+
+void IBsharpInterfaceLBMKernel::findNeighbors2(CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr ph, int x1, int x2, int x3)
+{
+ using namespace D3Q27System;
+
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
+
+ phi2[DIR_000] = (*ph)(x1, x2, x3);
+
+ for (int k = FSTARTDIR; k <= FENDDIR; k++) {
+
+ if (!bcArray->isSolid(x1 + DX1[k], x2 + DX2[k], x3 + DX3[k])) {
+ phi2[k] = (*ph)(x1 + DX1[k], x2 + DX2[k], x3 + DX3[k]);
+ } else {
+ phi2[k] = 0.05;
+ }
+ }
+}
+
+void IBsharpInterfaceLBMKernel::swapDistributions()
+{
+ LBMKernel::swapDistributions();
+ dataSet->getHdistributions()->swap();
+}
+
+void IBsharpInterfaceLBMKernel::initForcing()
+{
+ muForcingX1.DefineVar("x1", &muX1);
+ muForcingX1.DefineVar("x2", &muX2);
+ muForcingX1.DefineVar("x3", &muX3);
+ muForcingX2.DefineVar("x1", &muX1);
+ muForcingX2.DefineVar("x2", &muX2);
+ muForcingX2.DefineVar("x3", &muX3);
+ muForcingX3.DefineVar("x1", &muX1);
+ muForcingX3.DefineVar("x2", &muX2);
+ muForcingX3.DefineVar("x3", &muX3);
+
+ muDeltaT = deltaT;
+
+ muForcingX1.DefineVar("dt", &muDeltaT);
+ muForcingX2.DefineVar("dt", &muDeltaT);
+ muForcingX3.DefineVar("dt", &muDeltaT);
+
+ muNu = (1.0 / 3.0) * (1.0 / collFactor - 1.0 / 2.0);
+
+ muForcingX1.DefineVar("nu", &muNu);
+ muForcingX2.DefineVar("nu", &muNu);
+ muForcingX3.DefineVar("nu", &muNu);
+
+ muForcingX1.DefineVar("rho", &muRho);
+ muForcingX2.DefineVar("rho", &muRho);
+ muForcingX3.DefineVar("rho", &muRho);
+}
diff --git a/src/cpu/LiggghtsCoupling/LBM/IBsharpInterfaceLBMKernel.h b/src/cpu/LiggghtsCoupling/LBM/IBsharpInterfaceLBMKernel.h
new file mode 100644
index 0000000000000000000000000000000000000000..a24131488a642a0a44712dd73fe4188cfeafaab2
--- /dev/null
+++ b/src/cpu/LiggghtsCoupling/LBM/IBsharpInterfaceLBMKernel.h
@@ -0,0 +1,133 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file IBsharpInterfaceLBMKernel.h
+//! \ingroup LBMKernel
+//! \author M. Geier, K. Kutscher, Hesameddin Safari
+//=======================================================================================
+
+#ifndef IBsharpInterfaceLBMKernel_H
+#define IBsharpInterfaceLBMKernel_H
+
+#include "BCSet.h"
+#include "D3Q27System.h"
+#include "LiggghtsCouplingLBMKernel.h"
+#include "basics/container/CbArray3D.h"
+#include "basics/container/CbArray4D.h"
+#include "basics/utilities/UbTiming.h"
+#include "IBdynamicsParticleData.h"
+
+//! \brief Multiphase Cascaded Cumulant LBM kernel.
+//! \details CFD solver that use Cascaded Cumulant Lattice Boltzmann method for D3Q27 model
+//! \author M. Geier, K. Kutscher, Hesameddin Safari
+class IBsharpInterfaceLBMKernel : public LiggghtsCouplingLBMKernel
+{
+public:
+ IBsharpInterfaceLBMKernel();
+ virtual ~IBsharpInterfaceLBMKernel(void) = default;
+ void calculate(int step) override;
+ SPtr<LBMKernel> clone() override;
+
+ /// refactor
+ // CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr pressure;
+
+ double getCalculationTime() override
+ {
+ return .0;
+ }
+
+protected:
+ virtual void initDataSet();
+ void swapDistributions() override;
+
+ void initForcing();
+
+ void forwardInverseChimeraWithKincompressible(real &mfa, real &mfb, real &mfc, real vv, real v2, real Kinverse, real K, real oneMinusRho);
+ void backwardInverseChimeraWithKincompressible(real &mfa, real &mfb, real &mfc, real vv, real v2, real Kinverse, real K, real oneMinusRho);
+ void forwardChimera(real &mfa, real &mfb, real &mfc, real vv, real v2);
+ void backwardChimera(real &mfa, real &mfb, real &mfc, real vv, real v2);
+
+ real f1[D3Q27System::ENDF + 1];
+
+ CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr localDistributionsF;
+ CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributionsF;
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr restDistributionsF;
+
+ CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr localDistributionsH1;
+ CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributionsH1;
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr restDistributionsH1;
+
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr pressureOld;
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr p1Old;
+
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr phaseField;
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr phaseFieldOld;
+ // CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr divU;
+
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr rhoNode;
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr vxNode;
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr vyNode;
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr vzNode;
+
+ real h[D3Q27System::ENDF + 1];
+ // real h2[D3Q27System::ENDF + 1];
+ // real g [D3Q27System::ENDF+1];
+ real phi[D3Q27System::ENDF + 1];
+ real phi2[D3Q27System::ENDF + 1];
+ // real pr1[D3Q27System::ENDF+1];
+ real phi_cutoff[D3Q27System::ENDF + 1];
+
+ real gradX1_phi();
+ real gradX2_phi();
+ real gradX3_phi();
+ real gradX1_rhoInv(real rhoL, real rhoDIV);
+ real gradX2_rhoInv(real rhoL, real rhoDIV);
+ real gradX3_rhoInv(real rhoL, real rhoDIV);
+ real gradX1_phi2();
+ real gradX2_phi2();
+ real gradX3_phi2();
+ void computePhasefield();
+ void findNeighbors(CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr ph /*Phase-Field*/, int x1, int x2, int x3);
+ void findNeighbors2(CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr ph, int x1, int x2, int x3);
+
+ real nabla2_phi();
+
+ real computeCurvature_phi();
+
+ mu::value_type muX1, muX2, muX3;
+ mu::value_type muDeltaT;
+ mu::value_type muNu;
+ mu::value_type muRho;
+ mu::value_type muPhi;
+ real forcingX1;
+ real forcingX2;
+ real forcingX3;
+
+};
+
+#endif
diff --git a/src/cpu/LiggghtsCoupling/LBM/LiggghtsCouplingLBMKernel.cpp b/src/cpu/LiggghtsCoupling/LBM/LiggghtsCouplingLBMKernel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ff7a3bf1b19d5efd626f638d47dc05727fc2bc89
--- /dev/null
+++ b/src/cpu/LiggghtsCoupling/LBM/LiggghtsCouplingLBMKernel.cpp
@@ -0,0 +1,92 @@
+#include "LiggghtsCouplingLBMKernel.h"
+#include "D3Q27System.h"
+
+//void LiggghtsCouplingLBMKernel::collisionOperator(int x1, int x2, int x3, real collFactorM, real fPre[])
+//{
+// //if ((*particleData)(x1, x2, x3)->solidFraction >= SOLFRAC_MIN) {
+// LBMReal f[D3Q27System::ENDF + 1];
+// LBMReal fEq[D3Q27System::ENDF + 1];
+// LBMReal fEqSolid[D3Q27System::ENDF + 1];
+// LBMReal vx1, vx2, vx3, drho;
+// D3Q27System::calcIncompMacroscopicValues(f, drho, vx1, vx2, vx3);
+// D3Q27System::calcIncompFeq(fEq, drho, vx1, vx2, vx3);
+//
+// std::array<double, 3> uPart;
+// uPart[0] = (*particleData)(x1, x2, x3)->uPart[0];
+// uPart[1] = (*particleData)(x1, x2, x3)->uPart[1];
+// uPart[2] = (*particleData)(x1, x2, x3)->uPart[2];
+//
+// D3Q27System::calcIncompFeq(fEqSolid, drho, uPart[0], uPart[1], uPart[2]);
+// real rhoPhaseField = (phi[DIR_000] > c1o2) ? c1o1 : c1o1 / densityRatio;
+// if ((*particleData)(x1, x2, x3)->solidFraction > SOLFRAC_MAX) {
+// double const bb0 = fEq[vf::lbm::dir::DIR_000] - fEqSolid[vf::lbm::dir::DIR_000];
+// f[vf::lbm::dir::DIR_000] = fPre[vf::lbm::dir::DIR_000] + bb0;
+// for (int iPop = D3Q27System::FSTARTDIR; iPop <= D3Q27System::FENDDIR; iPop++) {
+// const int iOpp = D3Q27System::INVDIR[iPop];
+// double const bb = ((fPre[iOpp] - fEq[iOpp]) - (fPre[iPop] - fEqSolid[iPop]));
+// double const bbOpp = ((fPre[iPop] - fEq[iPop]) - (fPre[iOpp] - fEqSolid[iOpp]));
+//
+// f[iPop] = fPre[iPop] + bb;
+// f[iOpp] = fPre[iOpp] + bbOpp;
+//
+// (*particleData)(x1, x2, x3)->hydrodynamicForce[0] -= D3Q27System::DX1[iPop] * (bb - bbOpp) * rhoPhaseField;
+// (*particleData)(x1, x2, x3)->hydrodynamicForce[1] -= D3Q27System::DX2[iPop] * (bb - bbOpp) * rhoPhaseField;
+// (*particleData)(x1, x2, x3)->hydrodynamicForce[2] -= D3Q27System::DX3[iPop] * (bb - bbOpp) * rhoPhaseField;
+// }
+// } else { /* particleData.solidFraction < SOLFRAC_MAX */
+// // #ifdef LBDEM_USE_WEIGHING
+// double const ooo = 1. / collFactorM - 0.5;
+// double const B = (*particleData)(x1, x2, x3)->solidFraction * ooo / ((1. - (*particleData)(x1, x2, x3)->solidFraction) + ooo);
+// // #else
+// // T const B = particleData.solidFraction;
+// // #endif
+// double const oneMinB = 1. - B;
+//
+// double const bb0 = fEq[vf::lbm::dir::DIR_000] - fEqSolid[vf::lbm::dir::DIR_000];
+// f[vf::lbm::dir::DIR_000] = fPre[vf::lbm::dir::DIR_000] + oneMinB * (f[vf::lbm::dir::DIR_000] - fPre[vf::lbm::dir::DIR_000]) + B * bb0;
+//
+// for (int iPop = D3Q27System::FSTARTDIR; iPop <= D3Q27System::FENDDIR; iPop++) {
+// int const iOpp = D3Q27System::INVDIR[iPop];
+// double const bb = B * ((fPre[iOpp] - fEq[iOpp]) - (fPre[iPop] - fEqSolid[iPop]));
+// double const bbOpp = B * ((fPre[iPop] - fEq[iPop]) - (fPre[iOpp] - fEqSolid[iOpp]));
+//
+// f[iPop] = fPre[iPop] + oneMinB * (f[iPop] - fPre[iPop]) + bb;
+// f[iOpp] = fPre[iOpp] + oneMinB * (f[iOpp] - fPre[iOpp]) + bbOpp;
+//
+// (*particleData)(x1, x2, x3)->hydrodynamicForce[0] -= D3Q27System::DX1[iPop] * (bb - bbOpp) * rhoPhaseField;
+// (*particleData)(x1, x2, x3)->hydrodynamicForce[1] -= D3Q27System::DX2[iPop] * (bb - bbOpp) * rhoPhaseField;
+// (*particleData)(x1, x2, x3)->hydrodynamicForce[2] -= D3Q27System::DX3[iPop] * (bb - bbOpp) * rhoPhaseField;
+// }
+// } /* if solidFraction > SOLFRAC_MAX */
+//
+// // (*this->restDistributionsF)(x1, x2, x3) = f[vf::lbm::dir::DIR_000];
+//
+// // (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3) = f[vf::lbm::dir::DIR_M00];
+// // (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3) = f[vf::lbm::dir::DIR_0M0];
+// // (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3) = f[vf::lbm::dir::DIR_00M];
+// // (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3) = f[vf::lbm::dir::DIR_MM0];
+// // (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3) = f[vf::lbm::dir::DIR_PM0];
+// // (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3) = f[vf::lbm::dir::DIR_M0M];
+// // (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3) = f[vf::lbm::dir::DIR_P0M];
+// // (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3) = f[vf::lbm::dir::DIR_0MM];
+// // (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3) = f[vf::lbm::dir::DIR_0PM];
+// // (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3) = f[vf::lbm::dir::DIR_MMM];
+// // (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3) = f[vf::lbm::dir::DIR_PMM];
+// // (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3) = f[vf::lbm::dir::DIR_MPM];
+// // (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3) = f[vf::lbm::dir::DIR_PPM];
+//
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3) = f[vf::lbm::dir::DIR_P00];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3) = f[vf::lbm::dir::DIR_0P0];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p) = f[vf::lbm::dir::DIR_00P];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3) = f[vf::lbm::dir::DIR_PP0];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3) = f[vf::lbm::dir::DIR_MP0];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p) = f[vf::lbm::dir::DIR_P0P];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p) = f[vf::lbm::dir::DIR_M0P];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p) = f[vf::lbm::dir::DIR_0PP];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p) = f[vf::lbm::dir::DIR_0MP];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p) = f[vf::lbm::dir::DIR_PPP];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p) = f[vf::lbm::dir::DIR_MPP];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p) = f[vf::lbm::dir::DIR_PMP];
+// // (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p) = f[vf::lbm::dir::DIR_MMP];
+// //}
+//}
\ No newline at end of file
diff --git a/src/cpu/LiggghtsCoupling/LBM/LiggghtsCouplingLBMKernel.h b/src/cpu/LiggghtsCoupling/LBM/LiggghtsCouplingLBMKernel.h
new file mode 100644
index 0000000000000000000000000000000000000000..86ac895486d357e9facc30c210b325af527dfbf2
--- /dev/null
+++ b/src/cpu/LiggghtsCoupling/LBM/LiggghtsCouplingLBMKernel.h
@@ -0,0 +1,66 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file LiggghtsCouplingLBMKernel.h
+//! \ingroup LBM
+//! \author Konstantin Kutscher
+//=======================================================================================
+
+#ifndef LiggghtsCouplingLBMKernel_h
+#define LiggghtsCouplingLBMKernel_h
+
+#include "LBMKernel.h"
+#include "IBdynamicsParticleData.h"
+#include "basics/container/CbArray3D.h"
+#include "basics/container/CbArray4D.h"
+
+class LiggghtsCouplingLBMKernel : public LBMKernel
+{
+public:
+ virtual ~LiggghtsCouplingLBMKernel() = default;
+
+ CbArray3D<SPtr<IBdynamicsParticleData>, IndexerX3X2X1>::CbArray3DPtr getParticleData()
+ {
+ return particleData;
+ };
+ void setParticleData(CbArray3D<SPtr<IBdynamicsParticleData>, IndexerX3X2X1>::CbArray3DPtr particleData)
+ {
+ this->particleData = particleData;
+ };
+
+
+ protected:
+ //void collisionOperator();
+ CbArray3D<SPtr<IBdynamicsParticleData>, IndexerX3X2X1>::CbArray3DPtr particleData;
+
+ //CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr localDistributionsF;
+ //CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributionsF;
+ //CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr restDistributionsF;
+};
+
+#endif
\ No newline at end of file
diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCoupling.h b/src/cpu/LiggghtsCoupling/LiggghtsCoupling.h
index 88e5be001b5f71f97b4369ab3795ee5e3e972210..42b127f730e1c6ba58d9da93fe7653e5f9f7407c 100644
--- a/src/cpu/LiggghtsCoupling/LiggghtsCoupling.h
+++ b/src/cpu/LiggghtsCoupling/LiggghtsCoupling.h
@@ -26,13 +26,18 @@
// You should have received a copy of the GNU General Public License along
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
-//! \file MultiphasePressureBCStrategy.h
-//! \ingroup BoundarConditions
-//! \author Hesameddin Safari
+//! \file LiggghtsCoupling.h
+//! \ingroup LiggghtsCoupling
+//! \author Konstantin Kutscher
//=======================================================================================
-#pragma once
+#ifndef LiggghtsCoupling_h
+#define LiggghtsCoupling_h
#include "LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h"
#include "LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h"
-#include "LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.h"
\ No newline at end of file
+#include "LiggghtsCoupling/LBM/IBsharpInterfaceLBMKernel.h"
+#include "LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.h"
+#include "LiggghtsCoupling/Parallel/LiggghtsPartitioningGridVisitor.h"
+
+#endif
\ No newline at end of file
diff --git a/src/cpu/LiggghtsCoupling/Parallel/LiggghtsPartitioningGridVisitor.cpp b/src/cpu/LiggghtsCoupling/Parallel/LiggghtsPartitioningGridVisitor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..487077f080205cb33ca11748d1f611ca1f1a423d
--- /dev/null
+++ b/src/cpu/LiggghtsCoupling/Parallel/LiggghtsPartitioningGridVisitor.cpp
@@ -0,0 +1,82 @@
+#include "LiggghtsPartitioningGridVisitor.h"
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file LiggghtsPartitioningGridVisitor.cpp
+//! \ingroup LiggghtsCoupling
+//! \author Konstantin Kutscher
+//=======================================================================================
+
+#include <comm.h>
+#include "LiggghtsPartitioningGridVisitor.h"
+#include "VirtualFluidsCore/Simulation/Grid3D.h"
+#include "VirtualFluidsCore/Simulation/Block3D.h"
+
+LiggghtsPartitioningGridVisitor::LiggghtsPartitioningGridVisitor(int nx, int ny, int nz, LAMMPS_NS::LAMMPS *lmp) : nx(nx), ny(ny), nz(nz), lmp(*lmp)
+{
+
+}
+
+LiggghtsPartitioningGridVisitor::~LiggghtsPartitioningGridVisitor()
+{
+
+}
+
+void LiggghtsPartitioningGridVisitor::visit(SPtr<Grid3D> grid)
+{
+ npx = lmp.comm->procgrid[0];
+ npy = lmp.comm->procgrid[1];
+ npz = lmp.comm->procgrid[2];
+
+ for (int i = 0; i <= npx; i++)
+ xVal.push_back(round(lmp.comm->xsplit[i] * (double)nx));
+ for (int i = 0; i <= npy; i++)
+ yVal.push_back(round(lmp.comm->ysplit[i] * (double)ny));
+ for (int i = 0; i <= npz; i++)
+ zVal.push_back(round(lmp.comm->zsplit[i] * (double)nz));
+
+ UbTupleInt3 blockNX = grid->getBlockNX();
+
+ for (int iX = 0; iX < xVal.size() - 1; ++iX) {
+ for (int iY = 0; iY < yVal.size() - 1; ++iY) {
+ for (int iZ = 0; iZ < zVal.size() - 1; ++iZ) {
+
+ int rank = (int)lmp.comm->grid2proc[iX][iY][iZ];
+ int blockX1 = xVal[iX] / val<1>(blockNX);
+ int blockX2 = yVal[iY] / val<2>(blockNX);
+ int blockX3 = zVal[iZ] / val<3>(blockNX);
+ SPtr<Block3D> block = grid->getBlock(blockX1, blockX2, blockX3, 0);
+ block->setRank(rank);
+ }
+ }
+ }
+
+ xVal.clear();
+ yVal.clear();
+ zVal.clear();
+}
diff --git a/src/cpu/LiggghtsCoupling/Parallel/LiggghtsPartitioningGridVisitor.h b/src/cpu/LiggghtsCoupling/Parallel/LiggghtsPartitioningGridVisitor.h
new file mode 100644
index 0000000000000000000000000000000000000000..6fb5560ad7a93ca13005a24fcf976d4019576dd1
--- /dev/null
+++ b/src/cpu/LiggghtsCoupling/Parallel/LiggghtsPartitioningGridVisitor.h
@@ -0,0 +1,59 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file LiggghtsPartitioningGridVisitor.h
+//! \ingroup LiggghtsCoupling
+//! \author Konstantin Kutscher
+//=======================================================================================
+#ifndef LiggghtsPartitioningGridVisitor_h
+#define LiggghtsPartitioningGridVisitor_h
+
+#include <lammps.h>
+#include <vector>
+#include "basics/PointerDefinitions.h"
+#include "VirtualFluidsCore/Visitors/Grid3DVisitor.h"
+
+class LiggghtsCouplingWrapper;
+class Grid3D;
+
+class LiggghtsPartitioningGridVisitor : public Grid3DVisitor
+{
+public:
+ LiggghtsPartitioningGridVisitor(int nx, int ny, int nz, LAMMPS_NS::LAMMPS *lmp);
+
+ ~LiggghtsPartitioningGridVisitor() override;
+
+ void visit(SPtr<Grid3D> grid) override;
+
+private:
+ int nx, ny, nz;
+ LAMMPS_NS::LAMMPS &lmp;
+ int npx{ 0 }, npy{ 0 }, npz{ 0 };
+ std::vector<int> xVal, yVal, zVal;
+};
+#endif
\ No newline at end of file
diff --git a/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
index 7b7fafd8a653f9a33559d9f569c6add4fba929f9..651421bd11312fcfa99cd002c5ce2a4a4a44a63f 100644
--- a/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
+++ b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
@@ -9,6 +9,7 @@
#include "DistributionArray3D.h"
#include "DataSet3D.h"
#include "LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h"
+#include "LiggghtsCoupling/LBM/IBsharpInterfaceLBMKernel.h"
#include "LBMUnitConverter.h"
#include "fix_lb_coupling_onetoone.h"
@@ -27,8 +28,8 @@ LiggghtsCouplingSimulationObserver::~LiggghtsCouplingSimulationObserver()
void LiggghtsCouplingSimulationObserver::update(double actualTimeStep)
{
- if (comm->getProcessID() == 0)
- std::cout << "LiggghtsCouplingSimulationObserver step: " << actualTimeStep << "\n";
+ //if (comm->getProcessID() == 0)
+ // std::cout << "LiggghtsCouplingSimulationObserver step: " << actualTimeStep << "\n";
//comm->barrier();
@@ -104,22 +105,44 @@ void LiggghtsCouplingSimulationObserver::setSingleSphere3D(double *x, double *v,
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
CbArray3D<SPtr<IBdynamicsParticleData>, IndexerX3X2X1>::CbArray3DPtr particleData =
- dynamicPointerCast<IBcumulantK17LBMKernel>(kernel)->getParticleData();
+ dynamicPointerCast<LiggghtsCouplingLBMKernel>(kernel)->getParticleData();
if (!particleData)
continue;
- int minX1 = 1;
- int minX2 = 1;
- int minX3 = 1;
+ int minX1b = 1;
+ int minX2b = 1;
+ int minX3b = 1;
- int maxX1 = (int)(distributions->getNX1()) - 1;
- int maxX2 = (int)(distributions->getNX2()) - 1;
- int maxX3 = (int)(distributions->getNX3()) - 1;
+ int maxX1b = (int)(distributions->getNX1()) - 2;
+ int maxX2b = (int)(distributions->getNX2()) - 2;
+ int maxX3b = (int)(distributions->getNX3()) - 2;
- for (int ix3 = minX3; ix3 < maxX3; ix3++) {
- for (int ix2 = minX2; ix2 < maxX2; ix2++) {
- for (int ix1 = minX1; ix1 < maxX1; ix1++) {
+ real deltax = grid->getDeltaX(block);
+
+ UbTupleInt3 nodesMin = grid->getNodeIndexes(block, x[0] - r - deltax, x[1] - r - deltax, x[2] - r - deltax);
+ UbTupleInt3 nodesMax = grid->getNodeIndexes(block, x[0] + r + deltax, x[1] + r + deltax, x[2] + r + deltax);
+
+ int minX1 = (val<1>(nodesMin) < minX1b) ? minX1b : val<1>(nodesMin);
+ int minX2 = (val<2>(nodesMin) < minX2b) ? minX2b : val<2>(nodesMin);
+ int minX3 = (val<3>(nodesMin) < minX3b) ? minX3b : val<3>(nodesMin);
+
+ int maxX1 = (val<1>(nodesMax) > maxX1b) ? maxX1b : val<1>(nodesMax);
+ int maxX2 = (val<2>(nodesMax) > maxX2b) ? maxX2b : val<2>(nodesMax);
+ int maxX3 = (val<3>(nodesMax) > maxX3b) ? maxX3b : val<3>(nodesMax);
+
+ //int minX1 = minX1b;
+ //int minX2 = minX2b;
+ //int minX3 = minX3b;
+
+ //int maxX1 = maxX1b;
+ //int maxX2 = maxX2b;
+ //int maxX3 = maxX3b;
+
+
+ for (int ix3 = minX3; ix3 <= maxX3; ix3++) {
+ for (int ix2 = minX2; ix2 <= maxX2; ix2++) {
+ for (int ix1 = minX1; ix1 <= maxX1; ix1++) {
//UbTupleInt3 blockNX = grid->getBlockNX();
@@ -334,7 +357,7 @@ void LiggghtsCouplingSimulationObserver::SumForceTorque3D(ParticleData::Particle
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
CbArray3D<SPtr<IBdynamicsParticleData>, IndexerX3X2X1>::CbArray3DPtr particleData =
- dynamicPointerCast<IBcumulantK17LBMKernel>(kernel)->getParticleData();
+ dynamicPointerCast<LiggghtsCouplingLBMKernel>(kernel)->getParticleData();
if (!particleData)
continue;
@@ -358,6 +381,8 @@ void LiggghtsCouplingSimulationObserver::SumForceTorque3D(ParticleData::Particle
int const ind = wrapper.lmp->atom->map(id);
+ if (ind < 0) continue; // no particle here
+
Vector3D worldCoordinates = grid->getNodeCoordinates(block, ix1, ix2, ix3);
double dx = (worldCoordinates[0] - x[ind][0]) * units->getFactorLentghWToLb();
diff --git a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.cpp
index d2bb9f083fd433d60e0d1f5054b2238e963d9efc..f85d3c6503fbe645ecef115351c6e8fd11c287d1 100644
--- a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.cpp
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.cpp
@@ -88,19 +88,6 @@ void MultiphasePressureBCStrategy::applyBC()
calcMacrosFct(f, p1, vx1, vx2, vx3);
p1 = 0.0;
- int nx1 = x1;
- int nx2 = x2;
- int nx3 = x3;
-
- //flag points in direction of fluid
- if (bcPtr->hasVelocityBoundaryFlag(DIR_P00)) { nx1 -= 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_M00)) { nx1 += 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_0P0)) { nx2 -= 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_0M0)) { nx2 += 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_00P)) { nx3 -= 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_00M)) { nx3 += 1; }
- //else UB_THROW(UbException(UB_EXARGS, "Danger...no orthogonal BC-Flag on velocity boundary..."));
-
phiBC = bcPtr->getBoundaryPhaseField();
LBMReal rhoBC = bcPtr->getBoundaryDensity();
D3Q27System::calcIncompFeq(feq, rhoBC, vx1, vx2, vx3);
diff --git a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h
index e01237cf96e14bffbbfeac43469d32c907d56dd7..8618d797245a641b8c6ce7fc30fee46a3bfeed22 100644
--- a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h
@@ -79,8 +79,8 @@ class UbFileInput;
//! \code{.cpp}
//! mu::Parser fct;
//! fct.SetExpr("max(vmax*(1.0-4.0*((x2-x2_vmax)^2+(x3-x3_vmax)^2)/H^2),0.0)"); //paraboloid (with vmax for
-//! (0/x2_vmax/x3_vmax) fct.DefineConst("x2Vmax", 0.0 ); //x2-Pos für vmax fct.DefineConst("x3Vmax", 0.0
-//! ); //x3-Pos für vmax fct.DefineConst("H" , diameterOfPipe); fct.DefineConst("vmax" , vmax );
+//! (0/x2_vmax/x3_vmax) fct.DefineConst("x2Vmax", 0.0 ); //x2-Pos for vmax fct.DefineConst("x3Vmax", 0.0
+//! ); //x3-Pos for vmax fct.DefineConst("H" , diameterOfPipe); fct.DefineConst("vmax" , vmax );
//! VelocityBC velBC(true, false ,false ,fct, 0, BCFunction::INFCONST);
//! \endcode
diff --git a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.cpp
index a9b8391a8296fbbaf2709bb36863880985790a45..a0b334d8ee7a88471ca3e5c640e04a914f4171bd 100644
--- a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.cpp
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.cpp
@@ -95,19 +95,6 @@ void MultiphaseVelocityBCStrategy::applyBC()
///// added for phase field //////
- int nx1 = x1;
- int nx2 = x2;
- int nx3 = x3;
-
- //flag points in direction of fluid
- if (bcPtr->hasVelocityBoundaryFlag(DIR_P00)) { nx1 -= 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_M00)) { nx1 += 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_0P0)) { nx2 -= 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_0M0)) { nx2 += 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_00P)) { nx3 -= 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(DIR_00M)) { nx3 += 1; }
- //else UB_THROW(UbException(UB_EXARGS, "Danger...no orthogonal BC-Flag on velocity boundary..."));
-
phiBC = bcPtr->getBoundaryPhaseField();
D3Q27System::calcMultiphaseHeq(htemp, phiBC, vx1, vx2, vx3);
diff --git a/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp
index f898f2543a0bf3fec74b84d7cf62dbf76195a0c2..50363564d466d217be13adaea8c776e4e0c18f97 100644
--- a/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp
@@ -90,6 +90,7 @@ SPtr<LBMKernel> MultiphaseScaleDistributionLBMKernel::clone()
kernel->setPhaseFieldRelaxation(this->tauH);
kernel->setMobility(this->mob);
kernel->setInterfaceWidth(this->interfaceWidth);
+ kernel->setSigma(this->sigma);
kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
@@ -187,7 +188,7 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
int maxX1 = bcArrayMaxX1 - ghostLayerWidth;
int maxX2 = bcArrayMaxX2 - ghostLayerWidth;
int maxX3 = bcArrayMaxX3 - ghostLayerWidth;
- //real omegaDRho = 1.0;// 1.25;// 1.3;
+ real omegaDRho = 1.0;// 1.25;// 1.3;
for (int x3 = minX3 - ghostLayerWidth; x3 < maxX3 + ghostLayerWidth; x3++) {
for (int x2 = minX2 - ghostLayerWidth; x2 < maxX2 + ghostLayerWidth; x2++) {
for (int x1 = minX1 - ghostLayerWidth; x1 < maxX1 + ghostLayerWidth; x1++) {
@@ -226,8 +227,8 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real mfcca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNE, x1, x2, x3p);
real mfbbb = (*this->zeroDistributionsH1)(x1, x2, x3);
- //omegaDRho = 2.0;// 1.5;
- //real phiOld = (*phaseField)(x1, x2, x3);
+ omegaDRho = 2.0;// 1.5;
+ real phiOld = (*phaseField)(x1, x2, x3);
(*phaseField)(x1, x2, x3) = (((mfaaa + mfccc) + (mfaca + mfcac)) + ((mfaac + mfcca) + (mfcaa + mfacc))) +
(((mfaab + mfacb) + (mfcab + mfccb)) + ((mfaba + mfabc) + (mfcba + mfcbc)) +
@@ -254,9 +255,9 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
for (int x2 = minX2 - ghostLayerWidth+1; x2 < maxX2 + ghostLayerWidth-1; x2++) {
for (int x1 = minX1 - ghostLayerWidth+1; x1 < maxX1 + ghostLayerWidth-1; x1++) {
if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3)) {
- //int x1p = x1 + 1;
- //int x2p = x2 + 1;
- //int x3p = x3 + 1;
+ int x1p = x1 + 1;
+ int x2p = x2 + 1;
+ int x3p = x3 + 1;
//real mfabb = (*this->localDistributionsH1)(D3Q27System::ET_E, x1, x2, x3);//* rho * c1o3;
// real mfbab = (*this->localDistributionsH1)(D3Q27System::ET_N, x1, x2, x3);//* rho * c1o3;
@@ -460,9 +461,9 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
for (int x2 = minX2 - 1; x2 < maxX2 + 1; x2++) {
for (int x1 = minX1 - 1; x1 < maxX1 + 1; x1++) {
if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3)) {
- //int x1p = x1 + 1;
- //int x2p = x2 + 1;
- //int x3p = x3 + 1;
+ int x1p = x1 + 1;
+ int x2p = x2 + 1;
+ int x3p = x3 + 1;
findNeighbors(phaseFieldOld, x1, x2, x3);
////////////////////////////////Momentum conservation experiment 06.03.2023
//surfacetension
@@ -498,10 +499,20 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real vx = (*vxNode)(x1, x2, x3);
real vy = (*vyNode)(x1, x2, x3);
real vz = (*vzNode)(x1, x2, x3);
+ real rho = (*rhoNode)(x1, x2, x3);
findNeighbors(phaseField, x1, x2, x3);
- real curv = computeCurvature_phi();
+ real dX1_phi = gradX1_phi();
+ real dX2_phi = gradX2_phi();
+ real dX3_phi = gradX3_phi();
+ //real curv = computeCurvature_phi();
+ real laplacePressure = c12o1 * sigma * computeCurvature_phi();
findNeighbors(phaseFieldOld, x1, x2, x3);
- real sigma = c3o1*c2o1*1e-1;
+
+
+ //real sigma = c3o1*c2o1*1e-3;
+
+ real flowDirection = vx * dX1_phi + vy * dX2_phi + vy * dX3_phi;
+
//16.03.23 c: BB gas side with updated boundary velocity
@@ -517,17 +528,36 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
}
}
+
+ for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ ff[D3Q27System::INVDIR[fdir]] = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ }
rhoG = sumRho / sumWeight;// uncheck excpetion: what if there is no adequate neighbor?
for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
if ((phi[fdir] > c1o2) ) {
real vxBC = ((*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real vyBC = ((*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real vzBC = ((*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
- real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ //vx = vxBC;
+ //vy = vyBC;
+ //vz = vzBC;
+ real fPEQNeighbor = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir],c0o1 , (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real fPEQHere = D3Q27System::getIncompFeqForDirection(fdir,c0o1 , vx,vy,vz);
+ real vBC = (fPEQHere - fPEQNeighbor) / WEIGTH[fdir] * c1o6;
+ //real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
real vDir = (D3Q27System::DX1[fdir] * vx + D3Q27System::DX2[fdir] * vy + D3Q27System::DX3[fdir] * vz);
- vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
- real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ //vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
+ // real dvDir = vBC - vDir;
+ // 27.04.23
+ real vxI = ((*vxNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vyI = ((*vyNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vzI = ((*vzNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vIDir = (D3Q27System::DX1[fdir] * vxI + D3Q27System::DX2[fdir] * vyI + D3Q27System::DX3[fdir] * vzI);
+ // real dvDir = (vBC - vIDir) * c1o2;
+ real dvDir = (vBC - vDir) ;
+ real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+
if ((phi[D3Q27System::INVDIR[fdir]] > c1o2)) {
///here we need reconstruction from scrach
real feqOLD = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
@@ -537,9 +567,21 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
//real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
//real fGEQOld = D3Q27System::getIncompFeqForDirection(fdir, (*rhoNode)(x1, x2, x3), vx, vy, vz);
//real fGEQNew = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
- real fBC = (fL - feqOLD) * (c1o1 / collFactorG - c1o1) / (c1o1 / collFactorL - c1o1) + feqNew;// fL -feqOLD + feqNew;
+ real fGEQ = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
+ //real fBC = ( fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+ //real fBC = (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+ real fBC = (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG )) - c6o1 * WEIGTH[fdir] * (vDir);
+ //real vNG = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ //real fBC = (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG)) - c6o1 * WEIGTH[fdir] * (vDir)/(c1o1-vDir+vNG);
+ // 15.5.23
+ //real fBC = (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG)) - c6o1 * WEIGTH[fdir] * (vDir);
+ //real fBC = (c2o1 * (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1))) - c6o1 * WEIGTH[fdir] * (vBC)-fG;
+ //real fBC = (distribution->getDistributionInvForDirection(x1, x2, x3, D3Q27System::INVDIR[fdir]) - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) ;
+ //real fBC = (fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (collFactorG )/(c3o1-collFactorG)) - c6o1 * WEIGTH[fdir] * (vBC);
+ //real fBC = (fL - feqOLD) * (c1o1 / collFactorG - c1o1) / (c1o1 / collFactorL - c1o1) + feqNew;// fL -feqOLD + feqNew;
//real fBC = fGG - c6o1 * WEIGTH[fdir] * (vBC);
distribution->setDistributionForDirection(fBC, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ ff[D3Q27System::INVDIR[fdir]] = fBC;
///// other possibility is tor replace the node itself instead of the neighbor (only c1o1 of them is allowed!)
//real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
//real feqOLD = D3Q27System::getIncompFeqForDirection(fdir, (*rhoNode)(x1 , x2 , x3 ), (*vxNode)(x1 , x2 , x3 ), (*vyNode)(x1 , x2 , x3 ), (*vzNode)(x1 , x2 , x3 ));
@@ -558,6 +600,11 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real feqNew = D3Q27System::getIncompFeqForDirection(DIR_000, rhoG,vx,vy,vz);
distribution->setDistributionForDirection(fL-feqOLD+feqNew, x1, x2, x3, DIR_000);
}
+ D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+ ff[DIR_000] = vx * vx + vy * vy + vz * vz +
+ (((ff[DIR_MM0] + ff[DIR_PP0]) + (ff[DIR_MP0] + ff[DIR_PM0])) + ((ff[DIR_0MM] + ff[DIR_0PP]) + (ff[DIR_0MP] + ff[DIR_0PM])) + ((ff[DIR_M0M] + ff[DIR_P0P]) + (ff[DIR_M0P] + ff[DIR_P0M])) +
+ c2o1 * ((((ff[DIR_MMM] + ff[DIR_PPP]) + (ff[DIR_MMP] + ff[DIR_PPM]))) + (((ff[DIR_MPM] + ff[DIR_PMP]) + (ff[DIR_MPP] + ff[DIR_PMM])))));
+ distribution->setDistributionForDirection(ff[DIR_000], x1, x2, x3, DIR_000);
}
else {//no refill of gas required
@@ -568,10 +615,25 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real vxBC = ((*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real vyBC = ((*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real vzBC = ((*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
- real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ //vx = vxBC;
+ //vy = vyBC;
+ //vz = vzBC;
+ //real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ real fPEQNeighbor = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir],c0o1 , (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real fPEQHere = D3Q27System::getIncompFeqForDirection(fdir,c0o1 , vx,vy,vz);
+ real vBC = (fPEQHere - fPEQNeighbor) / WEIGTH[fdir] * c1o6;
real vDir = (D3Q27System::DX1[fdir] * vx + D3Q27System::DX2[fdir] * vy + D3Q27System::DX3[fdir] * vz);
- real dvDir = vBC - vDir;
- vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
+ //real dvDir = vBC - vDir;
+ // real dvDir = vBC - vDir;
+ // 27.04.23
+ real vxI = ((*vxNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vyI = ((*vyNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vzI = ((*vzNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vIDir = (D3Q27System::DX1[fdir] * vxI + D3Q27System::DX2[fdir] * vyI + D3Q27System::DX3[fdir] * vzI);
+ // real dvDir = (vBC - vIDir) * c1o2;
+ real dvDir = (vBC - vDir) ;
+
+ //vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
//real fBC = fG - c6o1 * WEIGTH[fdir] * (vBC);
@@ -579,7 +641,21 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
//real fGInvEQ = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, vx, vy, vz);
real fGEQ = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
//real fBC = (-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1) )- c6o1 * WEIGTH[fdir] * (vBC);
- real fBC = ( fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+ //real fBC = ( fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+ real fBC = (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+
+ //real qq = c1o1 - ((c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) /
+ // (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])));
+ //real vNG = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ //real fBC = fGEQ + (-WEIGTH[fdir] * dvDir * ((c1o1 + qq) / collFactorG - c2o1 * qq) - c6o1 * WEIGTH[fdir] * (vDir + qq * vNG)) / (c1o1 + qq);
+ //real fBC = fGEQ + (-WEIGTH[fdir] * dvDir * ((c1o1 + qq) / collFactorG - c2o1 * qq) - c6o1 * WEIGTH[fdir] * (vDir + qq * (vDir + qq * (vNG - vDir))) / (c1o1 - vDir + vNG)) / (c1o1 + qq);
+
+ //real fBC = (c2o1*(fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1))) - c6o1 * WEIGTH[fdir] * (vBC)-fG;
+ //real fBC = (c2o1*(fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1))) - c6o1 * WEIGTH[fdir] * (vBC)-fG;
+ //real fBC = (fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (collFactorG) / (c3o1 - collFactorG)) - c6o1 * WEIGTH[fdir] * (vBC);
+ //26.04.23 flux BC:
+ //real fBC = (c2o1*(fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1))) - c6o1 * WEIGTH[fdir] * (vBC)-fG;
+ //if (flowDirection > 0) fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
//if (fabsf(-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1) - fGEQ) >1000* (fabsf(fG - fGEQ))) fBC = fG - c6o1 * WEIGTH[fdir] * (vBC);
//if (fGEQ > 1.0e-8&& step>30&& vyBC!=0) {
// std::cout << D3Q27System::DX1[fdir] <<","<< D3Q27System::DX2[fdir] << "," << D3Q27System::DX3[fdir] <<" " << -fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1) - fGEQ << " fg:" << fG - fGEQ << " ratio=" << (-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1) - fGEQ) / (fG - fGEQ) << " feq" << fGEQ << " vy =" << vy << "vyBC=" << vyBC << "\n";
@@ -598,8 +674,8 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
//real vzBC = c1o2 * (vz + (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
//real feqL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
//real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
- //real feqL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
- //real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
+ real feqL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
+ real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
//real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), vy * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), vz * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
//distribution->setDistributionForDirection((fBC + fG) / densityRatio*0 - fL - (feqG - feqL) * (c1o1 / densityRatio*0 - c1o1) * vBC, x1, x2, x3, fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
@@ -609,27 +685,77 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
//real fLi = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], fdir);
//real number = 666;
//distribution->setDistributionForDirection((fBC + fG) / densityRatio * 0 - fL - (feqG - feqL) * (c1o1 / densityRatio * 0 - c1o1) * vBC, x1, x2, x3, fdir);
- //real eqBC= D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, vx, vy, vz);
- //real eqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
+ real eqBC= D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, vx, vy, vz);
+ real eqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
real eqBCN = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real eqGN = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
//real flNew = (fBC + fG-eqBC-eqG) / densityRatio +eqBC+eqG - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC;
- real curvBC;
- if ((x1 + D3Q27System::DX1[fdir] > 0) && (x1 + D3Q27System::DX1[fdir] < maxX1 + 1) && (x2 + D3Q27System::DX2[fdir] > 0) && (x2 + D3Q27System::DX2[fdir] < maxX2 + 1) && (x3 + D3Q27System::DX3[fdir] > 0) && (x3 + D3Q27System::DX3[fdir] < maxX3 + 1)) {
- findNeighbors(phaseField, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
- curvBC = computeCurvature_phi();
- findNeighbors(phaseFieldOld, x1, x2, x3);
- }
- else curvBC = curv;//reset to the above
- real LaplacePressure = curv *(c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) + curvBC * (-c1o1 + c2o1 * (*phaseField)(x1, x2, x3)) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
- //16.04.23
- real eqLL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
- fL = fL*0.99 +0.01*(eqLL - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorL - c1o1));
- LaplacePressure *= sigma;
- //eqBCN = eqBC;
- //distribution->setDistributionForDirection(LaplacePressure * WEIGTH[fdir] +(fBC + fG - eqBC - eqG) / densityRatio + (eqBCN + eqGN) * (c1o1-c1o1 / densityRatio*0 ) - fL -0* (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1, x2, x3, fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
- distribution->setDistributionForDirection(LaplacePressure* WEIGTH[fdir] + (fBC + fG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio ) - fL, x1, x2, x3, fdir);
+
+
+
+
+ // real flNew = (fBC + fG-eqBC-eqG) / densityRatio +eqBC+eqG - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC;
+ real laplacePressureBC;
+ if ((x1 + D3Q27System::DX1[fdir] > 0) && (x1 + D3Q27System::DX1[fdir] < maxX1 + 1) && (x2 + D3Q27System::DX2[fdir] > 0) && (x2 + D3Q27System::DX2[fdir] < maxX2 + 1) && (x3 + D3Q27System::DX3[fdir] > 0) && (x3 + D3Q27System::DX3[fdir] < maxX3 + 1) &&
+ (*phaseField)(x1, x2, x3) != (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) {
+ findNeighbors(phaseField, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ laplacePressureBC = c6o1 * c2o1 * computeCurvature_phi() * sigma;
+ findNeighbors(phaseFieldOld, x1, x2, x3);
+ } else
+ laplacePressureBC = laplacePressure;
+ //if (UbMath::isNaN(laplacePressureBC) || UbMath::isInfinity(laplacePressureBC)) {
+ // laplacePressureBC = laplacePressure;
+ // }
+ // curv; // reset to the above
+ if ( (*phaseField)(x1, x2, x3) != (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]))
+ {
+
+ laplacePressureBC = laplacePressure * (c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) /
+ (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) +
+ laplacePressureBC * (-c1o1 + c2o1 * (*phaseField)(x1, x2, x3)) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ }
+ else
+ laplacePressureBC = laplacePressure;
+ // laplacePressureBC *= sigma;
+ // eqBCN = eqBC;
+ // distribution->setDistributionForDirection(LaplacePressure* WEIGTH[fdir] + (fBC + fG - eqBC - eqG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio*0) - fL - 0*(feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1, x2,
+ // x3, fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ distribution->setDistributionForDirection(laplacePressureBC * WEIGTH[fdir] + (fBC + fG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio) - fL, x1, x2, x3, fdir);
+
+
+
+
+ //real laplacePressureBC;
+ // if ((x1 + D3Q27System::DX1[fdir] > 0) && (x1 + D3Q27System::DX1[fdir] < maxX1 + 1) && (x2 + D3Q27System::DX2[fdir] > 0) && (x2 + D3Q27System::DX2[fdir] < maxX2 + 1) && (x3 + D3Q27System::DX3[fdir] > 0) && (x3 + D3Q27System::DX3[fdir] < maxX3 + 1)) {
+ // findNeighbors(phaseField, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // laplacePressureBC = c6o1 * c2o1 * computeCurvature_phi() * sigma;
+ // findNeighbors(phaseFieldOld, x1, x2, x3);
+ // } else
+ // laplacePressureBC = laplacePressure; // curv; // reset to the above
+ // laplacePressureBC = laplacePressure * (c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) /
+ // (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) +
+ // laplacePressureBC * (-c1o1 + c2o1 * (*phaseField)(x1, x2, x3)) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // // laplacePressureBC *= sigma;
+ //
+ // }
+
+ //
+ // //real curvBC;
+ // //if ((x1 + D3Q27System::DX1[fdir] > 0) && (x1 + D3Q27System::DX1[fdir] < maxX1 + 1) && (x2 + D3Q27System::DX2[fdir] > 0) && (x2 + D3Q27System::DX2[fdir] < maxX2 + 1) && (x3 + D3Q27System::DX3[fdir] > 0) && (x3 + D3Q27System::DX3[fdir] < maxX3 + 1)) {
+ // // findNeighbors(phaseField, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // // curvBC = computeCurvature_phi();
+ // // findNeighbors(phaseFieldOld, x1, x2, x3);
+ // //}
+ // //else curvBC = curv;//reset to the above
+ // //real LaplacePressure = curv *(c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) + curvBC * (-c1o1 + c2o1 * (*phaseField)(x1, x2, x3)) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // ////16.04.23
+ // //real eqLL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ // ////fL = fL*0.99 +0.01*(eqLL - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorL - c1o1));
+ // //LaplacePressure *= sigma;
+ // //eqBCN = eqBC;
+ // //distribution->setDistributionForDirection(LaplacePressure * WEIGTH[fdir] +(fBC + fG - eqBC - eqG) / densityRatio + (eqBCN + eqGN) * (c1o1-c1o1 / densityRatio*0 ) - fL -0* (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1, x2, x3, fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ // distribution->setDistributionForDirection(laplacePressureBC* WEIGTH[fdir] + (fBC + fG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio ) - fL, x1, x2, x3, fdir);
//if (vxBC != 0) {
// int set = 0;
//}
@@ -648,10 +774,21 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real vxBC = ((*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real vyBC = ((*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real vzBC = ((*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
- real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ //real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ real fPEQNeighbor = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir],c0o1 , (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real fPEQHere = D3Q27System::getIncompFeqForDirection(fdir,c0o1 , vx,vy,vz);
+ real vBC = (fPEQHere - fPEQNeighbor) / WEIGTH[fdir] * c1o6;
real vDir = (D3Q27System::DX1[fdir] * vx + D3Q27System::DX2[fdir] * vy + D3Q27System::DX3[fdir] * vz);
- real dvDir = vBC - vDir;
- vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
+ //real dvDir = vBC - vDir;
+ //27.04.23
+ real vxI = ((*vxNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vyI = ((*vyNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vzI = ((*vzNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vIDir = (D3Q27System::DX1[fdir] * vxI + D3Q27System::DX2[fdir] * vyI + D3Q27System::DX3[fdir] * vzI);
+ // real dvDir = (vBC - vIDir)*c1o2;
+ real dvDir = (vBC - vDir) ;
+
+ //vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
//real fBC = fG - c6o1 * WEIGTH[fdir] * (vBC);
@@ -660,7 +797,20 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
//real fGInvEQ = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, vx, vy, vz);
real fGEQ = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
//real fBC = (-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
- real fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+ //real fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+ real fBC = (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+
+ //real qq = c1o1-((c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) /
+ // (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])));
+ //real vNG = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ //real fBC = fGEQ + (-WEIGTH[fdir] * dvDir * ((c1o1 + qq) / collFactorG - c2o1 * qq) - c6o1 * WEIGTH[fdir] * (vDir + qq * vNG))/(c1o1+qq);
+ //real fBC = fGEQ + (-WEIGTH[fdir] * dvDir * ((c1o1 + qq) / collFactorG - c2o1 * qq) - c6o1 * WEIGTH[fdir] * (vDir + qq *( vDir+qq*( vNG-vDir)))/(c1o1-vDir+vNG)) / (c1o1 + qq);
+ //real fBC = (c2o1 * (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1))) - c6o1 * WEIGTH[fdir] * (vBC)-fG;
+ //real fBC = (distribution->getDistributionInvForDirection(x1, x2, x3, D3Q27System::INVDIR[fdir]) - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) ;
+ //real fBC = (fGEQ - c6o1 * WEIGTH[fdir] * dvDir * ( collFactorG )/(c3o1-collFactorG)) - c6o1 * WEIGTH[fdir] * (vBC);
+ // 26.04.23 flux BC:
+ //real fBC = (c2o1 * (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1))) - c6o1 * WEIGTH[fdir] * (vBC)-fG;
+ //if (flowDirection > 0) fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
//if (fabsf(-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1) - fGEQ) > 1000*(fabsf(fG - fGEQ))) fBC = fG - c6o1 * WEIGTH[fdir] * (vBC);
//real feqOLD = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
//real feqNew = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
@@ -685,22 +835,49 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real eqGN = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real eqBC = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, vx, vy, vz);
real eqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
- //real flNew = (fBC + fG - eqBC - eqG) / densityRatio + eqBC + eqG - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC;
- real curvBC;
- if ((x1 + D3Q27System::DX1[fdir] > 0) && (x1 + D3Q27System::DX1[fdir] < maxX1 + 1) && (x2 + D3Q27System::DX2[fdir] > 0) && (x2 + D3Q27System::DX2[fdir] < maxX2 + 1) && (x3 + D3Q27System::DX3[fdir] > 0) && (x3 + D3Q27System::DX3[fdir] < maxX3 + 1)) {
- findNeighbors(phaseField, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
- curvBC = computeCurvature_phi();
- findNeighbors(phaseFieldOld, x1, x2, x3);
- }
- else curvBC = curv;//reset to the above
- //16.04.23
- real eqLL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
- fL = fL * 0.99 + 0.01 * (eqLL - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorL - c1o1));
- real LaplacePressure = curv *(c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) + curvBC * (-c1o1 + c2o1 * (*phaseField)(x1, x2, x3)) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
- LaplacePressure *= sigma;
+ ////real flNew = (fBC + fG - eqBC - eqG) / densityRatio + eqBC + eqG - fL - (feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC;
+ //real curvBC;
+ //if ((x1 + D3Q27System::DX1[fdir] > 0) && (x1 + D3Q27System::DX1[fdir] < maxX1 + 1) && (x2 + D3Q27System::DX2[fdir] > 0) && (x2 + D3Q27System::DX2[fdir] < maxX2 + 1) && (x3 + D3Q27System::DX3[fdir] > 0) && (x3 + D3Q27System::DX3[fdir] < maxX3 + 1)) {
+ // findNeighbors(phaseField, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // curvBC = computeCurvature_phi();
+ // findNeighbors(phaseFieldOld, x1, x2, x3);
+ //}
+ //else curvBC = curv;//reset to the above
+ ////16.04.23
+ //real eqLL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ ////fL = fL * 0.99 + 0.01 * (eqLL - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorL - c1o1));
+ //real LaplacePressure = curv *(c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) + curvBC * (-c1o1 + c2o1 * (*phaseField)(x1, x2, x3)) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ //LaplacePressure *= sigma;
+
+
+ real laplacePressureBC;
+ if ((x1 + D3Q27System::DX1[fdir] > 0) && (x1 + D3Q27System::DX1[fdir] < maxX1 + 1) && (x2 + D3Q27System::DX2[fdir] > 0) && (x2 + D3Q27System::DX2[fdir] < maxX2 + 1) && (x3 + D3Q27System::DX3[fdir] > 0) && (x3 + D3Q27System::DX3[fdir] < maxX3 + 1) ) {
+ findNeighbors(phaseField, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ laplacePressureBC = c6o1 * c2o1 * computeCurvature_phi() * sigma;
+ findNeighbors(phaseFieldOld, x1, x2, x3);
+ } else
+ laplacePressureBC = laplacePressure; // curv; // reset to the above
+
+ //if (UbMath::isNaN(laplacePressureBC) || UbMath::isInfinity(laplacePressureBC)) {
+ // laplacePressureBC = laplacePressure;
+ // }
+ if ((*phaseField)(x1, x2, x3) != (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]))
+ {
+
+ laplacePressureBC = laplacePressure * (c1o1 - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) /
+ (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) +
+ laplacePressureBC * (-c1o1 + c2o1 * (*phaseField)(x1, x2, x3)) / (c2o1 * (*phaseField)(x1, x2, x3) - c2o1 * (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ }
+ else laplacePressureBC = laplacePressure;
+
+ // real pp1 = (*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ //real pp2 = (*phaseField)(x1, x2, x3);
+
//eqBCN = eqBC;
- distribution->setDistributionForDirection(LaplacePressure* WEIGTH[fdir] + (fBC + fG - eqBC - eqG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio*0) - fL - 0*(feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1, x2, x3, fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
- distribution->setDistributionForDirection(LaplacePressure* WEIGTH[fdir] + (fBC + fG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio) - fL , x1, x2, x3, fdir);
+ //distribution->setDistributionForDirection(LaplacePressure* WEIGTH[fdir] + (fBC + fG - eqBC - eqG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio*0) - fL - 0*(feqG - feqL - 2 * fL + 2 * feqL) * (c1o1 / densityRatio - c1o1) * vBC, x1, x2, x3, fdir);// (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ fBC = (fG) / (densityRatio - c1o1) +
+ ((densityRatio) / (densityRatio - c1o1)) * ((eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio) - c2o1 * fL + (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) + laplacePressureBC * WEIGTH[fdir]);
+ distribution->setDistributionForDirection(laplacePressureBC* WEIGTH[fdir] + (fBC + fG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio) - fL , x1, x2, x3, fdir);
// real number = 666;
@@ -717,16 +894,16 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real sum2 = 1e-100;
real sumRho = 0;
- real sumVx = 0;
- real sumVy = 0;
- real sumVz = 0;
+ // real sumVx = 0;
+ // real sumVy = 0;
+ // real sumVz = 0;
for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
if ((phi[fdir] > c1o2)) {
sumRho += WEIGTH[fdir] * (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);// * tempRho;
- sumVx += WEIGTH[fdir] * (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
- sumVy += WEIGTH[fdir] * (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
- sumVz += WEIGTH[fdir] * (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // sumVx += WEIGTH[fdir] * (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // sumVy += WEIGTH[fdir] * (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // sumVz += WEIGTH[fdir] * (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
sum2 += WEIGTH[fdir];
}
}
@@ -748,21 +925,71 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real vxBC = ((*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real vyBC = ((*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
real vzBC = ((*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
- real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ //real vBC = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ real fPEQNeighbor = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir],c0o1 , (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real fPEQHere = D3Q27System::getIncompFeqForDirection(fdir,c0o1 , vx,vy,vz);
+ real vBC = (fPEQHere - fPEQNeighbor) / WEIGTH[fdir] * c1o6;
real vDir = (D3Q27System::DX1[fdir] * vx + D3Q27System::DX2[fdir] * vy + D3Q27System::DX3[fdir] * vz);
- real dvDir = vBC - vDir;
- vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
+ //real dvDir = vBC - vDir;
+ // 27.04.23
+ real vxI = ((*vxNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vyI = ((*vyNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vzI = ((*vzNode)(x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir]));
+ real vIDir = (D3Q27System::DX1[fdir] * vxI + D3Q27System::DX2[fdir] * vyI + D3Q27System::DX3[fdir] * vzI);
+ //real dvDir = (vBC - vIDir) * c1o2;
+ real dvDir = (vBC - vDir) ;
+
+
+ //vBC = (vBC + vDir) / (c2o1 + vBC - vDir);
//real feqOLD = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, vx, vy, vz);
- real feqNew = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoL, vx, vy, vz);
- ff[D3Q27System::INVDIR[fdir]]=(feqNew - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorL - c1o1));
+ //real feqNew = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoL, vx, vy, vz);
+ //ff[D3Q27System::INVDIR[fdir]]=(feqNew - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorL - c1o1));
+ //ff[D3Q27System::INVDIR[fdir]] = (feqNew - WEIGTH[fdir] * dvDir * (c1o1 / collFactorL - c1o1));
+ real fGEQ = D3Q27System::getIncompFeqForDirection(fdir, rhoL, vx, vy, vz);
+ //ff[D3Q27System::INVDIR[fdir]] = (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorL - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
+ //real vNG = (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX3[fdir] * vzBC);
+ //ff[D3Q27System::INVDIR[fdir]] = (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorL)) - c6o1 * WEIGTH[fdir] * (vDir) / (c1o1 - vDir + vNG);
+ real fG, fBCPseudo;
+ if (((*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) <= c1o2)
+ {
+
+ fG = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ fBCPseudo = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ } else {
+
+ fBCPseudo = -WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1) + D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ fG = -WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1) +
+ D3Q27System::getIncompFeqForDirection(fdir, (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ }
+
+ real eqBCN = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+ real eqGN = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]),
+ (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]));
+
+ ff[D3Q27System::INVDIR[fdir]] = (laplacePressure * WEIGTH[fdir] + (fBCPseudo + fG) / densityRatio + (eqBCN + eqGN) * (c1o1 - c1o1 / densityRatio))*c1o2 +(fG-fBCPseudo)*c1o2;
+
+ //15.5.23
+ //ff[D3Q27System::INVDIR[fdir]] = (fGEQ - WEIGTH[fdir] * dvDir * (c1o1 / collFactorL)) - c6o1 * WEIGTH[fdir] * (vDir);
+ //real fBC = (distribution->getDistributionInvForDirection(x1, x2, x3, D3Q27System::INVDIR[fdir]) - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorL - c1o1)) ;
+ //ff[D3Q27System::INVDIR[fdir]] = (feqNew - c6o1 * WEIGTH[fdir] * dvDir * (collFactorL)/(c3o1-collFactorL));
//ff[D3Q27System::INVDIR[fdir]] = (ff[D3Q27System::INVDIR[fdir]] - feqOLD) * (c1o1 / collFactorL - c1o1) / (c1o1 / collFactorG - c1o1) + feqNew;
distribution->setDistributionForDirection(ff[D3Q27System::INVDIR[fdir]], x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
}
}
+ real eqRest = D3Q27System::getIncompFeqForDirection(DIR_000, 0, (*vxNode)(x1, x2 , x3 ),
+ (*vyNode)(x1, x2 , x3 ), (*vzNode)(x1 , x2 , x3 ));
+ real fRest = distribution->getDistributionInvForDirection(x1 , x2 , x3 , DIR_000);
+ distribution->setDistributionForDirection((laplacePressure * WEIGTH[DIR_000] + c2o1*(fRest) / densityRatio + (eqRest) * (c1o1 - c1o1 / densityRatio)) , x1, x2, x3, DIR_000);
+
//03.04.2023 alternative initialization of liquid nodes based on FD
//for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
// //if (!((phi[fdir] > c1o2) && (((*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) > c1o2))) {
@@ -812,17 +1039,21 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
//ff[DIR_000] = rhoL - sumRho2;
//rhoL = 27.0 / 18.0 * sumRho2;
//std::cout << "rhoL=" << rhoL <<" sumRho="<< 27.0 / 18.0 * sumRho2 << " vx=" << vx << " vy=" << vy << "\n";
- D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
+ //D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
//std::cout << "RecalCrhoL=" << rhoL << " sumRho=" << 27.0 / 18.0 * sumRho2 << " vx=" << vx << " vy=" << vy << "ffRest="<<ff[DIR_000]<<"\n";
// distribution->setDistributionForDirection(ff[DIR_000], x1, x2, x3, DIR_000);
- {
- real fG = distribution->getDistributionInvForDirection(x1, x2, x3, DIR_000);
- real feqOLD = D3Q27System::getIncompFeqForDirection(DIR_000, (*rhoNode)(x1, x2, x3), vx, vy, vz);
- real feqNew = D3Q27System::getIncompFeqForDirection(DIR_000, rhoL, vx, vy, vz);
- distribution->setDistributionForDirection(fG - feqOLD + feqNew, x1, x2, x3, DIR_000);
- }
+ //{
+ // real fG = distribution->getDistributionInvForDirection(x1, x2, x3, DIR_000);
+ // real feqOLD = D3Q27System::getIncompFeqForDirection(DIR_000, (*rhoNode)(x1, x2, x3), vx, vy, vz);
+ // real feqNew = D3Q27System::getIncompFeqForDirection(DIR_000, rhoL, vx, vy, vz);
+ // distribution->setDistributionForDirection(fG - feqOLD + feqNew, x1, x2, x3, DIR_000);
+ //}
+ //ff[DIR_000] = vx * vx + vy * vy + vz * vz +
+ // (((ff[DIR_MM0] + ff[DIR_PP0]) + (ff[DIR_MP0] + ff[DIR_PM0])) + ((ff[DIR_0MM] + ff[DIR_0PP]) + (ff[DIR_0MP] + ff[DIR_0PM])) + ((ff[DIR_M0M] + ff[DIR_P0P]) + (ff[DIR_M0P] + ff[DIR_P0M])) +
+ // c2o1 * ((((ff[DIR_MMM] + ff[DIR_PPP]) + (ff[DIR_MMP] + ff[DIR_PPM]))) + (((ff[DIR_MPM] + ff[DIR_PMP]) + (ff[DIR_MPP] + ff[DIR_PMM])))));
+ //distribution->setDistributionForDirection(ff[DIR_000], x1, x2, x3, DIR_000);
-//for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ //for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
// ff[D3Q27System::INVDIR[fdir]]=distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
//}
//D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
@@ -1689,9 +1920,9 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
for (int x2 = minX2; x2 < maxX2; x2++) {
for (int x1 = minX1; x1 < maxX1; x1++) {
- //int x1p = x1 + 1;
- //int x2p = x2 + 1;
- //int x3p = x3 + 1;
+ int x1p = x1 + 1;
+ int x2p = x2 + 1;
+ int x3p = x3 + 1;
findNeighbors(phaseFieldOld, x1, x2, x3);
//if (((*phaseField)(x1, x2, x3) > c1o2) && (((*phaseFieldOld)(x1, x2, x3) <= c1o2)))
@@ -2997,7 +3228,7 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real rhoH = 1.0;
real rhoL = 1.0/ densityRatio;
- //real rhoToPhi = (rhoH - rhoL) / (phiH - phiL);
+ real rhoToPhi = (rhoH - rhoL) / (phiH - phiL);
real dX1_phi = gradX1_phi();
real dX2_phi = gradX2_phi();
@@ -3017,7 +3248,7 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
//collFactorM=(((*phaseField)(x1, x2, x3) > c1o2) && ((*phaseFieldOld)(x1, x2, x3) <= c1o2)) ? 1.8 : collFactorM;
real collFactorMInv = phi[DIR_000] > c1o2 ? collFactorG : collFactorL;
- //real mu = 2 * beta * phi[DIR_000] * (phi[DIR_000] - 1) * (2 * phi[DIR_000] - 1) - kappa * nabla2_phi();
+ real mu = 2 * beta * phi[DIR_000] * (phi[DIR_000] - 1) * (2 * phi[DIR_000] - 1) - kappa * nabla2_phi();
//----------- Calculating Macroscopic Values -------------
real rho = phi[DIR_000] > c1o2 ? rhoH : rhoL;//rhoH + rhoToPhi * (phi[DIR_000] - phiH); //Incompressible
@@ -3318,7 +3549,7 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
///Experimental interface sharpening force 20.06.2022
- //real scaleSharpener = 1.0;
+ real scaleSharpener = 1.0;
//forcingX1 += scaleSharpener * (FdX1_phi - dX1_phi) * fabsf(FdX1_phi - dX1_phi) / rho;
//forcingX2 += scaleSharpener * (FdX2_phi - dX2_phi) * fabsf(FdX2_phi - dX2_phi) / rho;
//forcingX3 += scaleSharpener * (FdX3_phi - dX3_phi) * fabsf(FdX3_phi - dX3_phi) / rho;
@@ -3328,9 +3559,9 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
//forcingX3 += mu * dX3_phi/rho;
//real forcingBIAS = 0.5;
- forcingX1 += muForcingX1.Eval() / rho;//*phi[DIR_000];
- forcingX2 += -5.0e-7 * phi[DIR_000];// muForcingX2.Eval() / rho - 5.0e-7 * phi[DIR_000] * 0;// * phi[DIR_000];
- forcingX3 += muForcingX3.Eval() / rho;// * phi[DIR_000];
+ // forcingX1 += muForcingX1.Eval() / rho;//*phi[DIR_000];
+ // forcingX2 += -5.0e-7;// *phi[DIR_000]; // muForcingX2.Eval() / rho - 5.0e-7 * phi[DIR_000] * 0;// * phi[DIR_000];
+ // forcingX3 += muForcingX3.Eval() / rho;// * phi[DIR_000];
// //19.08.2022
//vvx += vvxh / rho * c1o2;
@@ -3339,9 +3570,20 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
// //
- vvx += (forcingX1) * deltaT * c1o2;
- vvy += (forcingX2) * deltaT * c1o2;
- vvz += (forcingX3) * deltaT * c1o2;
+ // vvx += (forcingX1) * deltaT * c1o2;
+ // vvy += (forcingX2) * deltaT * c1o2;
+ // vvz += (forcingX3) * deltaT * c1o2;
+
+ if (withForcing) {
+
+ forcingX1 += muForcingX1.Eval();
+ forcingX2 += muForcingX2.Eval();
+ forcingX3 += muForcingX3.Eval();
+
+ vvx += (forcingX1)*deltaT * c1o2;
+ vvy += (forcingX2)*deltaT * c1o2;
+ vvz += (forcingX3)*deltaT * c1o2;
+ }
//vvx += (forcingX1 + muForcingX1.Eval() / rho) * deltaT * c1o2; // X
//vvy += (forcingX2 + muForcingX2.Eval() / rho) * deltaT * c1o2; // Y
@@ -3355,7 +3597,6 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
-
real vx2;
real vy2;
real vz2;
@@ -3398,7 +3639,9 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real wadjust;
//real qudricLimit = 0.01 / (c1o1 + 1.0e5 * phi[DIR_000] * (c1o1 - phi[DIR_000])); //real qudricLimit = 0.01;
//real qudricLimit = (((*phaseField)(x1, x2, x3) > c1o2) && (normX1 * vvx + normX2 * vvy + normX3 * vvz < 0)) ? 0.01 / (c1o1 + 1.0e5 * phi[DIR_000] * (c1o1 - phi[DIR_000])) : 0.01;
- real qudricLimit = (((*phaseField)(x1, x2, x3) > c1o2)&& (normX1*vvx+normX2*vvy+normX3*vvz<0) ) ? 0.01 / (c1o1 + 1.0e5 * phi[DIR_000] * (c1o1 - phi[DIR_000])) : 0.01 ;
+ //real qudricLimit = (((*phaseField)(x1, x2, x3) > c1o2)&& (normX1*vvx+normX2*vvy+normX3*vvz<0) ) ? 0.01 / (c1o1 + 1.0e5 * phi[DIR_000] * (c1o1 - phi[DIR_000])) : 0.01 ;
+ real qudricLimit = 0.0001;
+ /// (c1o1 + 1.0e3 * (dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi));
//real qudricLimit = 0.01 / (c1o1 + 1.0e5 * phi[DIR_000] * (c1o1 - phi[DIR_000])) ;
//real qudricLimit = (((*phaseField)(x1, x2, x3) > c1o2) ) ? 0.01 / (c1o1 + 1.0e5 * phi[DIR_000] * (c1o1 - phi[DIR_000])) : 0.01 ;
//qudricLimit = (((*phaseField)(x1, x2, x3)-c1o2 ) * (normX1 * vvx + normX2 * vvy + normX3 * vvz) < 0) ? 0.01 / (c1o1 + 1.0e8 * phi[DIR_000] * (c1o1 - phi[DIR_000])) : 0.01;
@@ -3559,12 +3802,12 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real mxxMzz = mfcaa - mfaac;
///
- real mmfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
- real mmfaca = c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz);
- real mmfaac = c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz);
- real mmfabb = mfabb;
- real mmfbab = mfbab;
- real mmfbba = mfbba;
+ // real mmfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
+ // real mmfaca = c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz);
+ // real mmfaac = c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz);
+ // real mmfabb = mfabb;
+ // real mmfbab = mfbab;
+ // real mmfbba = mfbba;
///
real dxux = -c1o2 * collFactorM * (mxxMyy + mxxMzz) + c1o2 * OxxPyyPzz * (/*mfaaa*/ -mxxPyyPzz);// *0;
@@ -3574,13 +3817,39 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real Dxy = -c3o1 * collFactorM * mfbba;
real Dxz = -c3o1 * collFactorM * mfbab;
real Dyz = -c3o1 * collFactorM * mfabb;
+ // if (phi[DIR_000] > c1o2)
+ if ((phi[DIR_000] > c1o2) && ((phi[DIR_P00] <= c1o2) || (phi[DIR_M00] <= c1o2) || (phi[DIR_00P] <= c1o2) || (phi[DIR_00M] <= c1o2) || (phi[DIR_0M0] <= c1o2) || (phi[DIR_0P0] <= c1o2) || (phi[DIR_PP0] <= c1o2) || (phi[DIR_PM0] <= c1o2) || (phi[DIR_P0P] <= c1o2) ||
+ (phi[DIR_P0M] <= c1o2) || (phi[DIR_MP0] <= c1o2) || (phi[DIR_MM0] <= c1o2) || (phi[DIR_M0P] <= c1o2) || (phi[DIR_M0M] <= c1o2) || (phi[DIR_0PM] <= c1o2) || (phi[DIR_0MM] <= c1o2) || (phi[DIR_0PP] <= c1o2) || (phi[DIR_0MP] <= c1o2) ||
+ (phi[DIR_PPP] <= c1o2) || (phi[DIR_PMP] <= c1o2) || (phi[DIR_MPP] <= c1o2) || (phi[DIR_MMP] <= c1o2) ||
+ (phi[DIR_PPM] <= c1o2) || (phi[DIR_PMM] <= c1o2) || (phi[DIR_MPM] <= c1o2) || (phi[DIR_MMM] <= c1o2))) {
+
+ // {
+ /// QR eddyviscosity:
+ real eddyR = -(Dxy * Dxy + Dxz * Dxz + c1o3 * dxux * dxux) * (dxux) - (Dxy * Dxy + Dyz * Dyz + c1o3 * dyuy * dyuy) * dyuy - (Dxz * Dxz + Dyz * Dyz + c1o3 * dzuz * dzuz) * dzuz - c2o1 * Dxy * Dxz * Dyz;
+ real eddyQ = Dxy * Dxz + Dxy * Dyz + Dxz * Dyz + c1o2 * (dxux * dxux + dyuy * dyuy + dzuz * dzuz);
+ //real nuEddy = 5.0e5 * (eddyR / (eddyQ + 1e-100)) * (dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi);
+ real nuEddy = 5.0e3 * (eddyR / (eddyQ + 1e-100));
+ nuEddy = (nuEddy < c1o1 / collFactorM) ? c1o1 / collFactorM : nuEddy;
+ collFactorM = c1o1 / nuEddy;
+ // collFactorM = c1o1 / (c1o1 / collFactorM +1.e2*nuEddy*(dX1_phi*dX1_phi+dX2_phi*dX2_phi+dX3_phi*dX3_phi));
+ collFactorM = (collFactorM < 1.8) ? 1.8 : collFactorM;
+ OxyyPxzz = 8.0 * (collFactorM - 2.0) * (OxxPyyPzz * (3.0 * collFactorM - 1.0) - 5.0 * collFactorM) / (8.0 * (5.0 - 2.0 * collFactorM) * collFactorM + OxxPyyPzz * (8.0 + collFactorM * (9.0 * collFactorM - 26.0)));
+ OxyyMxzz = 8.0 * (collFactorM - 2.0) * (collFactorM + OxxPyyPzz * (3.0 * collFactorM - 7.0)) / (OxxPyyPzz * (56.0 - 42.0 * collFactorM + 9.0 * collFactorM * collFactorM) - 8.0 * collFactorM);
+ Oxyz = 24.0 * (collFactorM - 2.0) * (4.0 * collFactorM * collFactorM + collFactorM * OxxPyyPzz * (18.0 - 13.0 * collFactorM) + OxxPyyPzz * OxxPyyPzz * (2.0 + collFactorM * (6.0 * collFactorM - 11.0))) / (16.0 * collFactorM * collFactorM * (collFactorM - 6.0) - 2.0 *
+ collFactorM * OxxPyyPzz * (216.0 + 5.0 * collFactorM * (9.0 * collFactorM - 46.0)) + OxxPyyPzz * OxxPyyPzz * (collFactorM * (3.0 * collFactorM - 10.0) * (15.0 * collFactorM - 28.0) - 48.0)); A = (4.0 * collFactorM * collFactorM + 2.0 * collFactorM * OxxPyyPzz * (collFactorM
+ - 6.0) + OxxPyyPzz * OxxPyyPzz * (collFactorM * (10.0 - 3.0 * collFactorM) - 4.0)) / ((collFactorM - OxxPyyPzz) * (OxxPyyPzz * (2.0 + 3.0 * collFactorM) - 8.0 * collFactorM)); BB = (4.0 * collFactorM * OxxPyyPzz * (9.0 * collFactorM - 16.0) - 4.0 * collFactorM * collFactorM
+ - 2.0 * OxxPyyPzz * OxxPyyPzz * (2.0 + 9.0 * collFactorM * (collFactorM - 2.0))) / (3.0 * (collFactorM - OxxPyyPzz) * (OxxPyyPzz * (2.0 + 3.0 * collFactorM) - 8.0 * collFactorM));
+ }
+
//if ((phi[DIR_000] > c1o2)&& (normX1 * vvx + normX2 * vvy + normX3 * vvz < 0)){//&& ((*phaseFieldOld)(x1, x2, x3) <= c1o2)) {
+ // if ((phi[DIR_000] > 0.01) && (phi[DIR_000]<0.99)){
// //std::cout << "new node\n";
// ///QR eddyviscosity:
// real eddyR = -(Dxy * Dxy + Dxz * Dxz + c1o3 * dxux * dxux) * (dxux)-(Dxy * Dxy + Dyz * Dyz + c1o3 * dyuy * dyuy) * dyuy - (Dxz * Dxz + Dyz * Dyz + c1o3 * dzuz * dzuz) * dzuz - c2o1 * Dxy * Dxz * Dyz;
// real eddyQ = Dxy * Dxz + Dxy * Dyz + Dxz * Dyz + c1o2 * (dxux * dxux + dyuy * dyuy + dzuz * dzuz);
- // real nuEddy = 10.0e1*(eddyR / (eddyQ + 1e-100)) * (dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi);
- // nuEddy=10.0e4*fabsf(dxux+dyuy+dzuz) * (dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi);
+ // real nuEddy = 10.0e4*(eddyR / (eddyQ + 1e-100)) * (dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi);
+ // nuEddy = 1000*(dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi);
+ // //nuEddy=10.0e4*fabsf(dxux+dyuy+dzuz) * (dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi);
// //if (nuEddy > c1o1 / collFactorM) std::cout << nuEddy <<" "<< fabsf(dxux + dyuy + dzuz)<< "\n";
// nuEddy = (nuEddy < c1o1 / collFactorM) ? c1o1 / collFactorM : nuEddy;
// collFactorM = c1o1 / nuEddy;
@@ -3670,12 +3939,12 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
real mxyyPxzz = mfbca + mfbac;
real mxyyMxzz = mfbca - mfbac;
- mmfcaa += c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz- mfaaa);
- mmfaca += c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz- mfaaa);
- mmfaac += c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz- mfaaa);
- mmfabb += mfabb;
- mmfbab += mfbab;
- mmfbba += mfbba;
+ // mmfcaa += c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz- mfaaa);
+ // mmfaca += c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz- mfaaa);
+ // mmfaac += c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz- mfaaa);
+ // mmfabb += mfabb;
+ // mmfbab += mfbab;
+ // mmfbba += mfbba;
//relax
wadjust = Oxyz + (1. - Oxyz) * fabs(mfbbb) / (fabs(mfbbb) + qudricLimit);
@@ -3751,12 +4020,12 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
////////save central moments for the phase field
- //real MMxx = mfcaa - c1o3 * mfaaa;
- //real MMyy = mfaca - c1o3 * mfaaa;
- //real MMzz = mfaac - c1o3 * mfaaa;
- //real MMxy = mfbba;
- //real MMxz = mfbab;
- //real MMyz = mfabb;
+ real MMxx = mfcaa - c1o3 * mfaaa;
+ real MMyy = mfaca - c1o3 * mfaaa;
+ real MMzz = mfaac - c1o3 * mfaaa;
+ real MMxy = mfbba;
+ real MMxz = mfbab;
+ real MMyz = mfabb;
////////////////////////////////////////////////////////////////////////////////////
@@ -4710,41 +4979,40 @@ real MultiphaseScaleDistributionLBMKernel::nabla2_phi()
real MultiphaseScaleDistributionLBMKernel::computeCurvature_phi()
{
- using namespace D3Q27System;
- //using namespace UbMath;
-
- real phiX = gradX1_phi();
- real phiY = gradX2_phi();
- real phiZ = gradX3_phi();
- real phiXX = c4o9*(phi[DIR_P00] - c2o1 * phi[DIR_000] + phi[DIR_M00])
- +(c1o9*(((phi[DIR_PP0] - c2o1 * phi[DIR_0P0] + phi[DIR_MP0])+ (phi[DIR_PM0] - c2o1 * phi[DIR_0M0] + phi[DIR_MM0]))+ ((phi[DIR_P0P] - c2o1 * phi[DIR_00P] + phi[DIR_M0P]) + (phi[DIR_P0M] - c2o1 * phi[DIR_00M] + phi[DIR_M0M])))
- +c1o36* (((phi[DIR_PPP] - c2o1 * phi[DIR_0PP] + phi[DIR_MPP]) + (phi[DIR_PMP] - c2o1 * phi[DIR_0MP] + phi[DIR_MMP])) + ((phi[DIR_PPM] - c2o1 * phi[DIR_0PM] + phi[DIR_MPM]) + (phi[DIR_PMM] - c2o1 * phi[DIR_0MM] + phi[DIR_MMM]))));
- real phiYY = c4o9*(phi[DIR_0P0] - c2o1 * phi[DIR_000] + phi[DIR_0M0])
- +(c1o9*(((phi[DIR_PP0] - c2o1 * phi[DIR_P00] + phi[DIR_PM0])+ (phi[DIR_MP0] - c2o1 * phi[DIR_M00] + phi[DIR_MM0]))+ ((phi[DIR_0PP] - c2o1 * phi[DIR_00P] + phi[DIR_0MP]) + (phi[DIR_0PM] - c2o1 * phi[DIR_00M] + phi[DIR_0MM])))
- +c1o36* (((phi[DIR_PPP] - c2o1 * phi[DIR_P0P] + phi[DIR_PMP]) + (phi[DIR_MPM] - c2o1 * phi[DIR_M0M] + phi[DIR_MMM])) + ((phi[DIR_MPP] - c2o1 * phi[DIR_M0P] + phi[DIR_MMP]) + (phi[DIR_PPM] - c2o1 * phi[DIR_P0M] + phi[DIR_PMM]))));
- real phiZZ = c4o9*(phi[DIR_00P] - c2o1 * phi[DIR_000] + phi[DIR_00M])
- +(c1o9*(((phi[DIR_M0P] - c2o1 * phi[DIR_M00] + phi[DIR_M0M])+ (phi[DIR_P0P] - c2o1 * phi[DIR_P00] + phi[DIR_P0M]))+ ((phi[DIR_0MP] - c2o1 * phi[DIR_0M0] + phi[DIR_0MM]) + (phi[DIR_0PP] - c2o1 * phi[DIR_0P0] + phi[DIR_0PM])))
- +c1o36* (((phi[DIR_MPP] - c2o1 * phi[DIR_MP0] + phi[DIR_MPM]) + (phi[DIR_PMP] - c2o1 * phi[DIR_PM0] + phi[DIR_PMM])) + ((phi[DIR_MMP] - c2o1 * phi[DIR_MM0] + phi[DIR_MMM]) + (phi[DIR_PPP] - c2o1 * phi[DIR_PP0] + phi[DIR_PPM]))));
- real phiXY = c1o4 *(c2o3* (phi[DIR_MM0] - phi[DIR_PM0] + phi[DIR_PP0] - phi[DIR_MP0])+c1o6*((phi[DIR_MMP] - phi[DIR_PMP] + phi[DIR_PPP] - phi[DIR_MPP])+ (phi[DIR_MMM] - phi[DIR_PMM] + phi[DIR_PPM] - phi[DIR_MPM])));
- real phiXZ = c1o4 *(c2o3* (phi[DIR_M0M] - phi[DIR_P0M] + phi[DIR_P0P] - phi[DIR_M0P])+c1o6*((phi[DIR_MPM] - phi[DIR_PPM] + phi[DIR_PPP] - phi[DIR_MPP])+ (phi[DIR_MMM] - phi[DIR_PMM] + phi[DIR_PMP] - phi[DIR_MMP])));
- real phiYZ = c1o4 *(c2o3* (phi[DIR_0MM] - phi[DIR_0MP] + phi[DIR_0PP] - phi[DIR_0PM])+c1o6*((phi[DIR_MMM] - phi[DIR_MMP] + phi[DIR_MPP] - phi[DIR_MPM])+ (phi[DIR_PMM] - phi[DIR_PMP] + phi[DIR_PPP] - phi[DIR_PPM])));
-
- //non isotropic FD (to be improved):
- //real phiX = (phi[DIR_P00] - phi[DIR_M00]) * c1o2; //gradX1_phi();
- //real phiY = (phi[DIR_0P0] - phi[DIR_0M0]) * c1o2; //gradX2_phi();
- //real phiZ = (phi[DIR_00P] - phi[DIR_00M]) * c1o2; //gradX3_phi();
-
- //real phiXX = phi[DIR_P00] - c2o1 * phi[DIR_000] + phi[DIR_M00];
- //real phiYY = phi[DIR_0P0] - c2o1 * phi[DIR_000] + phi[DIR_0M0];
- //real phiZZ =( phi[DIR_00P] - c2o1 * phi[DIR_000] + phi[DIR_00M]);
- //real phiXY = c1o4 * (phi[DIR_MM0] - phi[DIR_PM0] + phi[DIR_PP0] - phi[DIR_MP0]);
- //real phiXZ = c1o4 * (phi[DIR_M0M] - phi[DIR_P0M] + phi[DIR_P0P] - phi[DIR_M0P]);
- //real phiYZ = c1o4 * (phi[DIR_0MM] - phi[DIR_0MP] + phi[DIR_0PP] - phi[DIR_0PM]);
- //real back= (c2o1 * (phiX * phiY * phiXY + phiX * phiZ * phiXZ + phiY * phiZ * phiYZ) - phiXX * (phiY * phiY + phiZ * phiZ) - phiYY * (phiX * phiX + phiZ * phiZ) - phiZZ * (phiX * phiX + phiY * phiY)) / (c2o1 * pow(phiX * phiX + phiY * phiY + phiZ * phiZ, c3o2));
- return (c2o1 * (phiX * phiY * phiXY + phiX * phiZ * phiXZ + phiY * phiZ * phiYZ) - (phiXX * (phiY * phiY + phiZ * phiZ) + phiYY * (phiX * phiX + phiZ * phiZ) + phiZZ * (phiX * phiX + phiY * phiY))) / (c2o1*pow(phiX*phiX+phiY*phiY+phiZ*phiZ,c3o2));
- //return (phiX * phiX * phiXX + phiY * phiY * phiYY + phiZ * phiZ * phiZZ + c2o1 * (phiX * phiY * phiXY + phiX * phiZ * phiXZ + phiY * phiZ * phiYZ)) / ((phiX * phiX + phiY * phiY + phiZ * phiZ) * (phiX * phiX + phiY * phiY + phiZ * phiZ));
+ using namespace D3Q27System;
+ using namespace UbMath;
+
+ real phiX = gradX1_phi();
+ real phiY = gradX2_phi();
+ real phiZ = gradX3_phi();
+ real phiXX =
+ c4o9 * (phi[DIR_P00] - c2o1 * phi[DIR_000] + phi[DIR_M00]) + (c1o9 * (((phi[DIR_PP0] - c2o1 * phi[DIR_0P0] + phi[DIR_MP0]) + (phi[DIR_PM0] - c2o1 * phi[DIR_0M0] + phi[DIR_MM0])) + ((phi[DIR_P0P] - c2o1 * phi[DIR_00P] + phi[DIR_M0P]) + (phi[DIR_P0M] - c2o1 * phi[DIR_00M] + phi[DIR_M0M]))) +
+ c1o36 * (((phi[DIR_PPP] - c2o1 * phi[DIR_0PP] + phi[DIR_MPP]) + (phi[DIR_PMP] - c2o1 * phi[DIR_0MP] + phi[DIR_MMP])) + ((phi[DIR_PPM] - c2o1 * phi[DIR_0PM] + phi[DIR_MPM]) + (phi[DIR_PMM] - c2o1 * phi[DIR_0MM] + phi[DIR_MMM]))));
+ real phiYY =
+ c4o9 * (phi[DIR_0P0] - c2o1 * phi[DIR_000] + phi[DIR_0M0]) + (c1o9 * (((phi[DIR_PP0] - c2o1 * phi[DIR_P00] + phi[DIR_PM0]) + (phi[DIR_MP0] - c2o1 * phi[DIR_M00] + phi[DIR_MM0])) + ((phi[DIR_0PP] - c2o1 * phi[DIR_00P] + phi[DIR_0MP]) + (phi[DIR_0PM] - c2o1 * phi[DIR_00M] + phi[DIR_0MM]))) +
+ c1o36 * (((phi[DIR_PPP] - c2o1 * phi[DIR_P0P] + phi[DIR_PMP]) + (phi[DIR_MPM] - c2o1 * phi[DIR_M0M] + phi[DIR_MMM])) + ((phi[DIR_MPP] - c2o1 * phi[DIR_M0P] + phi[DIR_MMP]) + (phi[DIR_PPM] - c2o1 * phi[DIR_P0M] + phi[DIR_PMM]))));
+ real phiZZ =
+ c4o9 * (phi[DIR_00P] - c2o1 * phi[DIR_000] + phi[DIR_00M]) + (c1o9 * (((phi[DIR_M0P] - c2o1 * phi[DIR_M00] + phi[DIR_M0M]) + (phi[DIR_P0P] - c2o1 * phi[DIR_P00] + phi[DIR_P0M])) + ((phi[DIR_0MP] - c2o1 * phi[DIR_0M0] + phi[DIR_0MM]) + (phi[DIR_0PP] - c2o1 * phi[DIR_0P0] + phi[DIR_0PM]))) +
+ c1o36 * (((phi[DIR_MPP] - c2o1 * phi[DIR_MP0] + phi[DIR_MPM]) + (phi[DIR_PMP] - c2o1 * phi[DIR_PM0] + phi[DIR_PMM])) + ((phi[DIR_MMP] - c2o1 * phi[DIR_MM0] + phi[DIR_MMM]) + (phi[DIR_PPP] - c2o1 * phi[DIR_PP0] + phi[DIR_PPM]))));
+ real phiXY = c1o4 * (c2o3 * (phi[DIR_MM0] - phi[DIR_PM0] + phi[DIR_PP0] - phi[DIR_MP0]) + c1o6 * ((phi[DIR_MMP] - phi[DIR_PMP] + phi[DIR_PPP] - phi[DIR_MPP]) + (phi[DIR_MMM] - phi[DIR_PMM] + phi[DIR_PPM] - phi[DIR_MPM])));
+ real phiXZ = c1o4 * (c2o3 * (phi[DIR_M0M] - phi[DIR_P0M] + phi[DIR_P0P] - phi[DIR_M0P]) + c1o6 * ((phi[DIR_MPM] - phi[DIR_PPM] + phi[DIR_PPP] - phi[DIR_MPP]) + (phi[DIR_MMM] - phi[DIR_PMM] + phi[DIR_PMP] - phi[DIR_MMP])));
+ real phiYZ = c1o4 * (c2o3 * (phi[DIR_0MM] - phi[DIR_0MP] + phi[DIR_0PP] - phi[DIR_0PM]) + c1o6 * ((phi[DIR_MMM] - phi[DIR_MMP] + phi[DIR_MPP] - phi[DIR_MPM]) + (phi[DIR_PMM] - phi[DIR_PMP] + phi[DIR_PPP] - phi[DIR_PPM])));
+
+ // non isotropic FD (to be improved):
+ // real phiX = (phi[DIR_P00] - phi[DIR_M00]) * c1o2; //gradX1_phi();
+ // real phiY = (phi[DIR_0P0] - phi[DIR_0M0]) * c1o2; //gradX2_phi();
+ // real phiZ = (phi[DIR_00P] - phi[DIR_00M]) * c1o2; //gradX3_phi();
+
+ // real phiXX = phi[DIR_P00] - c2o1 * phi[DIR_000] + phi[DIR_M00];
+ // real phiYY = phi[DIR_0P0] - c2o1 * phi[DIR_000] + phi[DIR_0M0];
+ // real phiZZ =( phi[DIR_00P] - c2o1 * phi[DIR_000] + phi[DIR_00M]);
+ // real phiXY = c1o4 * (phi[DIR_MM0] - phi[DIR_PM0] + phi[DIR_PP0] - phi[DIR_MP0]);
+ // real phiXZ = c1o4 * (phi[DIR_M0M] - phi[DIR_P0M] + phi[DIR_P0P] - phi[DIR_M0P]);
+ // real phiYZ = c1o4 * (phi[DIR_0MM] - phi[DIR_0MP] + phi[DIR_0PP] - phi[DIR_0PM]);
+ // real back= (c2o1 * (phiX * phiY * phiXY + phiX * phiZ * phiXZ + phiY * phiZ * phiYZ) - phiXX * (phiY * phiY + phiZ * phiZ) - phiYY * (phiX * phiX + phiZ * phiZ) - phiZZ * (phiX * phiX + phiY * phiY)) / (c2o1 * pow(phiX * phiX + phiY * phiY + phiZ * phiZ, c3o2));
+
+ return (c2o1 * (phiX * phiY * phiXY + phiX * phiZ * phiXZ + phiY * phiZ * phiYZ) - phiXX * (phiY * phiY + phiZ * phiZ) - phiYY * (phiX * phiX + phiZ * phiZ) - phiZZ * (phiX * phiX + phiY * phiY)) / (c2o1 * pow(phiX * phiX + phiY * phiY + phiZ * phiZ, c3o2)+1e-200);
}
-
void MultiphaseScaleDistributionLBMKernel::computePhasefield()
{
using namespace D3Q27System;
@@ -4817,8 +5085,8 @@ void MultiphaseScaleDistributionLBMKernel::findNeighbors(CbArray3D<real, Indexer
if (!bcArray->isSolid(x1 + DX1[k], x2 + DX2[k], x3 + DX3[k])) {
phi[k] = (*ph)(x1 + DX1[k], x2 + DX2[k], x3 + DX3[k]);
} else {
- //phi[k] = (*ph)(x1 , x2, x3 );// neutral wetting
- phi[k] = 0.0;//unwetting
+ phi[k] = (*ph)(x1 , x2, x3 );// neutral wetting
+ //phi[k] = 0.0;//unwetting
}
}
}
diff --git a/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp
index af5ba7d63edbf3a8a1866a70d6edc30920664cb1..1d0e30aee4eb9d9fb7f692b855eb36449e08a500 100644
--- a/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp
@@ -549,16 +549,16 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
real sum2 = 1e-100;
real sumRho = 0;
- real sumVx = 0;
- real sumVy = 0;
- real sumVz = 0;
+ // real sumVx = 0;
+ // real sumVy = 0;
+ // real sumVz = 0;
for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
if ((phi[fdir] > c1o2)) {
sumRho += WEIGTH[fdir] * (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);// * tempRho;
- sumVx += WEIGTH[fdir] * (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
- sumVy += WEIGTH[fdir] * (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
- sumVz += WEIGTH[fdir] * (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // sumVx += WEIGTH[fdir] * (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // sumVy += WEIGTH[fdir] * (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // sumVz += WEIGTH[fdir] * (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
sum2 += WEIGTH[fdir];
}
}
@@ -902,12 +902,12 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
real mxxMzz = mfcaa - mfaac;
///
- real mmfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
- real mmfaca = c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz);
- real mmfaac = c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz);
- real mmfabb = mfabb;
- real mmfbab = mfbab;
- real mmfbba = mfbba;
+ // real mmfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
+ // real mmfaca = c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz);
+ // real mmfaac = c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz);
+ // real mmfabb = mfabb;
+ // real mmfbab = mfbab;
+ // real mmfbba = mfbba;
///
real dxux = -c1o2 * collFactorM * (mxxMyy + mxxMzz) + c1o2 * OxxPyyPzz * (/*mfaaa*/ -mxxPyyPzz)*0;
@@ -982,12 +982,12 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
real mxyyPxzz = mfbca + mfbac;
real mxyyMxzz = mfbca - mfbac;
- mmfcaa += c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz- mfaaa);
- mmfaca += c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz- mfaaa);
- mmfaac += c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz- mfaaa);
- mmfabb += mfabb;
- mmfbab += mfbab;
- mmfbba += mfbba;
+ // mmfcaa += c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz- mfaaa);
+ // mmfaca += c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz- mfaaa);
+ // mmfaac += c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz- mfaaa);
+ // mmfabb += mfabb;
+ // mmfbab += mfbab;
+ // mmfbba += mfbba;
//relax
wadjust = Oxyz + (1. - Oxyz) * fabs(mfbbb) / (fabs(mfbbb) + qudricLimit);
diff --git a/src/cpu/MultiphaseFlow/MultiphaseFlow.h b/src/cpu/MultiphaseFlow/MultiphaseFlow.h
index 469a819060f7a06ce6e914ace68cb44f6b83dca1..79c2ce8066414bc3a96457e143c9552d6907b663 100644
--- a/src/cpu/MultiphaseFlow/MultiphaseFlow.h
+++ b/src/cpu/MultiphaseFlow/MultiphaseFlow.h
@@ -1,4 +1,38 @@
-#pragma once
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file MultiphaseFlow.h
+//! \ingroup MultiphaseFlow
+//! \author Konstantin Kutscher
+//=======================================================================================
+
+#ifndef MultiphaseFlow_h
+#define MultiphaseFlow_h
#include "MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.h"
#include "MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.h"
@@ -26,3 +60,4 @@
#include "MultiphaseFlow/Visitors/MultiphaseInitDistributionsBlockVisitor.h"
#include "MultiphaseFlow/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.h"
+#endif
\ No newline at end of file
diff --git a/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.cpp b/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolator.cpp
similarity index 94%
rename from src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.cpp
rename to src/cpu/NonNewtonianFluids/LBM/RheologyInterpolator.cpp
index 0a9c380dece3ba90f7d2d3d5d2a84ceadfcf4850..8da8886a42b0a9f9c784eca708618217f06c883a 100644
--- a/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.cpp
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolator.cpp
@@ -26,51 +26,46 @@
// You should have received a copy of the GNU General Public License along
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
-//! \file RheologyInterpolationProcessor.cpp
+//! \file RheologyInterpolator.cpp
//! \ingroup LBM
//! \author Konstantin Kutscher
//=======================================================================================
-#include "RheologyInterpolationProcessor.h"
+#include "RheologyInterpolator.h"
#include "D3Q27System.h"
#include "Rheology.h"
-RheologyInterpolationProcessor::RheologyInterpolationProcessor()
+RheologyInterpolator::RheologyInterpolator()
: omegaC(0.0), omegaF(0.0), omegaMin(0.0)
{
}
//////////////////////////////////////////////////////////////////////////
-RheologyInterpolationProcessor::RheologyInterpolationProcessor(real omegaC, real omegaF, real omegaMin)
+RheologyInterpolator::RheologyInterpolator(real omegaC, real omegaF, real omegaMin)
: omegaC(omegaC), omegaF(omegaF), omegaMin(omegaMin)
{
}
//////////////////////////////////////////////////////////////////////////
-RheologyInterpolationProcessor::~RheologyInterpolationProcessor()
+InterpolationProcessorPtr RheologyInterpolator::clone()
{
-
-}
-//////////////////////////////////////////////////////////////////////////
-InterpolationProcessorPtr RheologyInterpolationProcessor::clone()
-{
- InterpolationProcessorPtr iproc = InterpolationProcessorPtr (new RheologyInterpolationProcessor(this->omegaC, this->omegaF, this->omegaMin));
+ InterpolationProcessorPtr iproc = std::make_shared<RheologyInterpolator>(this->omegaC, this->omegaF, this->omegaMin);
return iproc;
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::setOmegas( real omegaC, real omegaF )
+void RheologyInterpolator::setOmegas( real omegaC, real omegaF )
{
this->omegaC = omegaC;
this->omegaF = omegaF;
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::setOmegaMin( real omegaMin )
+void RheologyInterpolator::setOmegaMin( real omegaMin )
{
this->omegaMin = omegaMin;
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::setOffsets(real xoff, real yoff, real zoff)
+void RheologyInterpolator::setOffsets(real xoff, real yoff, real zoff)
{
this->xoff = xoff;
this->yoff = yoff;
@@ -80,7 +75,7 @@ void RheologyInterpolationProcessor::setOffsets(real xoff, real yoff, real zoff)
this->zoff_sq = zoff * zoff;
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
+void RheologyInterpolator::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
calcInterpolatedCoefficiets_intern(icellC, omegaC, 0.5, 0.25, -0.25, -0.25, -1, -1, -1);
@@ -101,14 +96,14 @@ void RheologyInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC,
calcInterpolatedNode(icellF.TNE, /*omegaF,*/ 0.25, 0.25, 0.25, calcPressTNE(), 1, 1, 1);
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
+void RheologyInterpolator::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
calcInterpolatedCoefficiets_intern(icellF, omegaF, 2.0, 0, 0, 0, 0, 0, 0);
calcInterpolatedNodeFC(icellC, omegaC);
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::calcMoments(const real* const f, real omegaInf, real& press, real& vx1, real& vx2, real& vx3, real& kxy, real& kyz, real& kxz, real& kxxMyy, real& kxxMzz)
+void RheologyInterpolator::calcMoments(const real* const f, real omegaInf, real& press, real& vx1, real& vx2, real& vx3, real& kxy, real& kyz, real& kxz, real& kxxMyy, real& kxxMzz)
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
@@ -129,7 +124,7 @@ void RheologyInterpolationProcessor::calcMoments(const real* const f, real omega
kxxMzz = -3./2.*omega*((((f[DIR_MP0]+f[DIR_PM0])-(f[DIR_0MM]+f[DIR_0PP]))+((f[DIR_MM0]+f[DIR_PP0])-(f[DIR_0MP]+f[DIR_0PM])))+((f[DIR_M00]+f[DIR_P00])-(f[DIR_00M]+f[DIR_00P]))-(vx1*vx1-vx3*vx3));
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::calcInterpolatedCoefficiets_intern(const D3Q27ICell& icell,
+void RheologyInterpolator::calcInterpolatedCoefficiets_intern(const D3Q27ICell& icell,
real omega,
real eps_new,
real x,
@@ -432,7 +427,7 @@ void RheologyInterpolationProcessor::calcInterpolatedCoefficiets_intern(const D3
yz_TNW = 0.0625*eps_new *(( bxyz + cxyz)/(72.*o));
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::calcInterpolatedNode(real* f, /*real omega,*/ real x, real y, real z, real press, real xs, real ys, real zs)
+void RheologyInterpolator::calcInterpolatedNode(real* f, /*real omega,*/ real x, real y, real z, real press, real xs, real ys, real zs)
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
@@ -475,7 +470,7 @@ void RheologyInterpolationProcessor::calcInterpolatedNode(real* f, /*real omega,
}
//////////////////////////////////////////////////////////////////////////
//Position SWB -0.25, -0.25, -0.25
-real RheologyInterpolationProcessor::calcPressBSW()
+real RheologyInterpolator::calcPressBSW()
{
return press_SWT * (0.140625 + 0.1875 * xoff + 0.1875 * yoff - 0.5625 * zoff) +
press_NWT * (0.046875 + 0.0625 * xoff - 0.1875 * yoff - 0.1875 * zoff) +
@@ -488,7 +483,7 @@ real RheologyInterpolationProcessor::calcPressBSW()
}
//////////////////////////////////////////////////////////////////////////
//Position SWT -0.25, -0.25, 0.25
-real RheologyInterpolationProcessor::calcPressTSW()
+real RheologyInterpolator::calcPressTSW()
{
return press_SWT * (0.421875 + 0.5625 * xoff + 0.5625 * yoff - 0.5625 * zoff) +
press_NWT * (0.140625 + 0.1875 * xoff - 0.5625 * yoff - 0.1875 * zoff) +
@@ -501,7 +496,7 @@ real RheologyInterpolationProcessor::calcPressTSW()
}
//////////////////////////////////////////////////////////////////////////
//Position SET 0.25, -0.25, 0.25
-real RheologyInterpolationProcessor::calcPressTSE()
+real RheologyInterpolator::calcPressTSE()
{
return press_SET * (0.421875 - 0.5625 * xoff + 0.5625 * yoff - 0.5625 * zoff) +
press_NET * (0.140625 - 0.1875 * xoff - 0.5625 * yoff - 0.1875 * zoff) +
@@ -514,7 +509,7 @@ real RheologyInterpolationProcessor::calcPressTSE()
}
//////////////////////////////////////////////////////////////////////////
//Position SEB 0.25, -0.25, -0.25
-real RheologyInterpolationProcessor::calcPressBSE()
+real RheologyInterpolator::calcPressBSE()
{
return press_SET * (0.140625 - 0.1875 * xoff + 0.1875 * yoff - 0.5625 * zoff) +
press_NET * (0.046875 - 0.0625 * xoff - 0.1875 * yoff - 0.1875 * zoff) +
@@ -527,7 +522,7 @@ real RheologyInterpolationProcessor::calcPressBSE()
}
//////////////////////////////////////////////////////////////////////////
//Position NWB -0.25, 0.25, -0.25
-real RheologyInterpolationProcessor::calcPressBNW()
+real RheologyInterpolator::calcPressBNW()
{
return press_NWT * (0.140625 + 0.1875 * xoff - 0.1875 * yoff - 0.5625 * zoff) +
press_NET * (0.046875 - 0.1875 * xoff - 0.0625 * yoff - 0.1875 * zoff) +
@@ -540,7 +535,7 @@ real RheologyInterpolationProcessor::calcPressBNW()
}
//////////////////////////////////////////////////////////////////////////
//Position NWT -0.25, 0.25, 0.25
-real RheologyInterpolationProcessor::calcPressTNW()
+real RheologyInterpolator::calcPressTNW()
{
return press_NWT * (0.421875 + 0.5625 * xoff - 0.5625 * yoff - 0.5625 * zoff) +
press_NET * (0.140625 - 0.5625 * xoff - 0.1875 * yoff - 0.1875 * zoff) +
@@ -553,7 +548,7 @@ real RheologyInterpolationProcessor::calcPressTNW()
}
//////////////////////////////////////////////////////////////////////////
//Position NET 0.25, 0.25, 0.25
-real RheologyInterpolationProcessor::calcPressTNE()
+real RheologyInterpolator::calcPressTNE()
{
return press_NET * (0.421875 - 0.5625 * xoff - 0.5625 * yoff - 0.5625 * zoff) +
press_NWT * (0.140625 + 0.5625 * xoff - 0.1875 * yoff - 0.1875 * zoff) +
@@ -566,7 +561,7 @@ real RheologyInterpolationProcessor::calcPressTNE()
}
//////////////////////////////////////////////////////////////////////////
//Position NEB 0.25, 0.25, -0.25
-real RheologyInterpolationProcessor::calcPressBNE()
+real RheologyInterpolator::calcPressBNE()
{
return press_NET * (0.140625 - 0.1875 * xoff - 0.1875 * yoff - 0.5625 * zoff) +
press_NWT * (0.046875 + 0.1875 * xoff - 0.0625 * yoff - 0.1875 * zoff) +
@@ -579,7 +574,7 @@ real RheologyInterpolationProcessor::calcPressBNE()
}
//////////////////////////////////////////////////////////////////////////
//Position C 0.0, 0.0, 0.0
-void RheologyInterpolationProcessor::calcInterpolatedNodeFC(real* f, real omega)
+void RheologyInterpolator::calcInterpolatedNodeFC(real* f, real omega)
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
@@ -664,14 +659,14 @@ void RheologyInterpolationProcessor::calcInterpolatedNodeFC(real* f, real omega)
f[DIR_000] = f_ZERO + feq[DIR_000];
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::calcInterpolatedVelocity(real x, real y, real z, real& vx1, real& vx2, real& vx3)
+void RheologyInterpolator::calcInterpolatedVelocity(real x, real y, real z, real& vx1, real& vx2, real& vx3)
{
vx1 = a0 + ax*x + ay*y + az*z + axx*x*x + ayy*y*y + azz*z*z + axy*x*y + axz*x*z + ayz*y*z+axyz*x*y*z;
vx2 = b0 + bx*x + by*y + bz*z + bxx*x*x + byy*y*y + bzz*z*z + bxy*x*y + bxz*x*z + byz*y*z+bxyz*x*y*z;
vx3 = c0 + cx*x + cy*y + cz*z + cxx*x*x + cyy*y*y + czz*z*z + cxy*x*y + cxz*x*z + cyz*y*z+cxyz*x*y*z;
}
//////////////////////////////////////////////////////////////////////////
-void RheologyInterpolationProcessor::calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz)
+void RheologyInterpolator::calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz)
{
tauxx=ax+2*axx*x+axy*y+axz*z+axyz*y*z;
tauyy=by+2*byy*y+bxy*x+byz*z+bxyz*x*z;
diff --git a/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.h b/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolator.h
similarity index 89%
rename from src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.h
rename to src/cpu/NonNewtonianFluids/LBM/RheologyInterpolator.h
index 178932204307606b9fc48d2745ebf1353547e3e8..4b9391df278dc3e69a08df8a1400e3871ca7f067 100644
--- a/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.h
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolator.h
@@ -26,24 +26,23 @@
// You should have received a copy of the GNU General Public License along
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
-//! \file RheologyInterpolationProcessor.h
+//! \file RheologyInterpolator.h
//! \ingroup LBM
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef RheologyInterpolationProcessor_H_
-#define RheologyInterpolationProcessor_H_
+#ifndef RheologyInterpolator_H_
+#define RheologyInterpolator_H_
-#include "InterpolationProcessor.h"
+#include "Interpolation/Interpolator.h"
#include "D3Q27System.h"
//! \brief A class implements an interpolation function of grid refinement for thixotropic fluid.
-class RheologyInterpolationProcessor : public InterpolationProcessor
+class RheologyInterpolator : public Interpolator
{
public:
- RheologyInterpolationProcessor();
- RheologyInterpolationProcessor(real omegaC, real omegaF, real omegaMin);
- virtual ~RheologyInterpolationProcessor();
+ RheologyInterpolator();
+ RheologyInterpolator(real omegaC, real omegaF, real omegaMin);
InterpolationProcessorPtr clone();
void setOmegas(real omegaC, real omegaF);
void setOmegaMin(real omegaMin);
@@ -94,12 +93,12 @@ private:
};
//////////////////////////////////////////////////////////////////////////
-inline void RheologyInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF)
+inline void RheologyInterpolator::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF)
{
this->interpolateCoarseToFine(icellC, icellF, 0.0, 0.0, 0.0);
}
//////////////////////////////////////////////////////////////////////////
-inline void RheologyInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC)
+inline void RheologyInterpolator::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC)
{
this->interpolateFineToCoarse(icellF, icellC, 0.0, 0.0, 0.0);
}
diff --git a/src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.cpp b/src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.cpp
index a9c7a05da6eefb4f44834d1c91f5e5b43d4f5eb4..2981156c4a5f6acc0df336d9d66cc9a9e97d8c1a 100644
--- a/src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.cpp
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.cpp
@@ -33,7 +33,7 @@
#include "RheologyK17LBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include <math.h>
#include "DataSet3D.h"
diff --git a/src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.cpp b/src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.cpp
index cbfa924405109fa03dfef6532c538fb2917d2d43..a55ee9a28740843a4bf3c8587b3afb5f348c2759 100644
--- a/src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.cpp
+++ b/src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.cpp
@@ -1,6 +1,6 @@
#include "ThixotropyExpLBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include <math.h>
#include "DataSet3D.h"
diff --git a/src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.cpp b/src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.cpp
index 368436088dc72bb10677f046aa9e954f9120be42..f764af6f5cd75b67ce51f8644d9f1839894fcdc3 100644
--- a/src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.cpp
+++ b/src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.cpp
@@ -1,6 +1,6 @@
#include "ThixotropyLBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include <math.h>
#include "DataSet3D.h"
diff --git a/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h b/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h
index 169082259b203b195b7fc636d84cdd4029ce6ccf..705a07af12b8ad8d32632d28dde5f4cd4b127173 100644
--- a/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h
+++ b/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h
@@ -1,4 +1,37 @@
-#pragma once
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file NonNewtonianFluids.h
+//! \ingroup NonNewtonianFluids
+//! \author Konstantin Kutscher
+//=======================================================================================
+#ifndef NonNewtonianFluids_h
+#define NonNewtonianFluids_h
#include "NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.h"
#include "NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.h"
@@ -18,7 +51,9 @@
#include "NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.h"
#include "NonNewtonianFluids/LBM/RheologyBinghamModelLBMKernel.h"
#include "NonNewtonianFluids/LBM/RheologyHerschelBulkleyModelLBMKernel.h"
-#include "NonNewtonianFluids/LBM/RheologyInterpolationProcessor.h"
+#include "NonNewtonianFluids/LBM/RheologyInterpolator.h"
#include "NonNewtonianFluids/LBM/Rheology.h"
#include "NonNewtonianFluids/LBM/RheologyK17LBMKernel.h"
#include "NonNewtonianFluids/LBM/RheologyPowellEyringModelLBMKernel.h"
+
+#endif
\ No newline at end of file
diff --git a/src/cpu/VirtualFluids.h b/src/cpu/VirtualFluids.h
index 6fa9b30bfc0e650f289d00a2970bdff545c71359..aead82d5dfc4c8565ef4abe03351b085722db2ad 100644
--- a/src/cpu/VirtualFluids.h
+++ b/src/cpu/VirtualFluids.h
@@ -208,14 +208,11 @@
#include <TimeDependentBCSimulationObserver.h>
#include <IntegrateValuesHelper.h>
-//#include <LBM/D3Q27CompactInterpolationProcessor.h>
-#include <LBM/CompressibleOffsetInterpolationProcessor.h>
-#include <LBM/CompressibleOffsetMomentsInterpolationProcessor.h>
-#include <LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h>
-#include <LBM/IncompressibleOffsetInterpolationProcessor.h>
-#include <LBM/InterpolationHelper.h>
-#include <LBM/InterpolationProcessor.h>
-//#include <LBM/D3Q27OffsetInterpolationProcessor.h>
+#include <LBM/Interpolation/CompressibleOffsetInterpolator.h>
+#include <LBM/Interpolation/CompressibleOffsetMomentsInterpolator.h>
+#include <LBM/Interpolation/CompressibleOffsetSquarePressureInterpolator.h>
+#include <LBM/Interpolation/IncompressibleOffsetInterpolator.h>
+#include <LBM/Interpolation/Interpolator.h>
#include <IncompressibleCumulantWithSpongeLayerLBMKernel.h>
#include <LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h>
#include <LBM/CompressibleCumulantLBMKernel.h>
@@ -223,7 +220,6 @@
#include <LBM/ICell.h>
#include <LBM/IncompressibleCumulantLBMKernel.h>
#include <LBM/InitDensityLBMKernel.h>
-#include <LBM/InterpolationProcessor.h>
#include <LBM/LBMKernel.h>
#include <LBM/LBMKernelETD3Q27BGK.h>
#include <LBM/LBMSystem.h>
@@ -232,11 +228,6 @@
#include <LBM/CumulantLBMKernel.h>
#include <LBM/CumulantK17LBMKernel.h>
-//#include <LBM/RheologyModelLBMKernel.h>
-//#include <LBM/RheologyModelLBMKernel2.h>
-
-
-
#include <geometry3d/CoordinateTransformation3D.h>
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.cpp
index cabd41b30dd31ac8751c60f00f46c899cbfa2334..bb98e499421328abc36f8911a14bcb8c90ebabd1 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.cpp
@@ -54,23 +54,22 @@ void NoSlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
//////////////////////////////////////////////////////////////////////////
void NoSlipBCStrategy::applyBC()
{
- real f[D3Q27System::ENDF + 1];
- real feq[D3Q27System::ENDF + 1];
+ using namespace vf::basics::constant;
+ using namespace D3Q27System;
+ real f[ENDF + 1];
+ real feq[ENDF + 1];
distributions->getDistributionInv(f, x1, x2, x3);
real rho, vx1, vx2, vx3;
calcMacrosFct(f, rho, vx1, vx2, vx3);
calcFeqFct(feq, rho, vx1, vx2, vx3);
- for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ for (int fdir = FSTARTDIR; fdir <= FENDDIR; fdir++) {
if (bcPtr->hasNoSlipBoundaryFlag(fdir)) {
// quadratic bounce back
- const int invDir = D3Q27System::INVDIR[fdir];
- real q = bcPtr->getQ(invDir);
- real fReturn = ((vf::basics::constant::c1o1 - q) / (vf::basics::constant::c1o1 + q)) * ((f[invDir] - feq[invDir]) / (vf::basics::constant::c1o1 - collFactor) + feq[invDir]) +
- ((q / (vf::basics::constant::c1o1 + q)) * (f[invDir] + f[fdir]));
- distributions->setDistributionForDirection(fReturn, x1 + D3Q27System::DX1[invDir],
- x2 + D3Q27System::DX2[invDir], x3 + D3Q27System::DX3[invDir],
- fdir);
+ const int invDir = INVDIR[fdir];
+ real q = bcPtr->getQ(invDir);
+ real fReturn = ((c1o1 - q) / (c1o1 + q)) * ((f[invDir] - feq[invDir]) / (c1o1 - collFactor) + feq[invDir]) + ((q / (c1o1 + q)) * (f[invDir] + f[fdir]));
+ distributions->setDistributionForDirection(fReturn, x1 + DX1[invDir], x2 + DX2[invDir], x3 + DX3[invDir], fdir);
}
}
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
index 008adefd8196c6d6689316d29bbc2f3fe50b9f9e..eb254160395ce1ba12e22bc6ff6d6e063ce8f316 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
@@ -28,7 +28,7 @@
//
//! \file SlipBC.cpp
//! \ingroup BoundarConditions
-//! \author Sören Freudiger
+//! \author Soeren Freudiger
//=======================================================================================
#include "SlipBC.h"
#include "D3Q27Interactor.h"
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.h
index 98205ba32b2d3ccec85346bd89a199e8e9a9049c..8e8788db8ded7a2f9eb0e47135f9babbc69e37da 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.h
@@ -28,7 +28,7 @@
//
//! \file SlipBC.h
//! \ingroup BoundarConditions
-//! \author Sören Freudiger
+//! \author Soeren Freudiger
//=======================================================================================
#ifndef SlipBC_H
#define SlipBC_H
diff --git a/src/cpu/VirtualFluidsCore/CMakeLists.txt b/src/cpu/VirtualFluidsCore/CMakeLists.txt
index 9f3cd96e889097a32ce737e56e3f1fa31dddaee0..aae663e80011c117a83d5a52d0ac0cbe0c59a5a8 100644
--- a/src/cpu/VirtualFluidsCore/CMakeLists.txt
+++ b/src/cpu/VirtualFluidsCore/CMakeLists.txt
@@ -31,6 +31,7 @@ target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Co
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Data)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Interactors)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/LBM)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/LBM/Interpolation)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Parallel)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Simulation)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Visitors)
diff --git a/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineVectorConnector.h
index 6dce407d05aa983767cfd9697d395533d90177a2..ad40378f54e85cff41457fdb21a391f6ab8674b5 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineVectorConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineVectorConnector.h
@@ -40,7 +40,7 @@
#include "Block3DConnector.h"
#include "D3Q27System.h"
#include "Grid3D.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "LBMKernel.h"
#include "MathUtil.hpp"
#include "basics/container/CbVector.h"
diff --git a/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseVectorConnector.h
index 7a18e86791fed253c9a52a26709b6a1a9861ac3b..94222fee2940dc13411b4c7520ac64a5ab942478 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseVectorConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseVectorConnector.h
@@ -40,7 +40,7 @@
#include "Block3DConnector.h"
#include "D3Q27System.h"
#include "Grid3D.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "LBMKernel.h"
#include "MathUtil.hpp"
#include "basics/transmitter/TbTransmitter.h"
diff --git a/src/cpu/VirtualFluidsCore/Connectors/ThreeDistributionsDoubleGhostLayerFullVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/ThreeDistributionsDoubleGhostLayerFullVectorConnector.h
index e124251d8f8be21aa33ccb8dc91f7e9b40356827..c91103481e71979d93830573fe3a27a80c77a337 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/ThreeDistributionsDoubleGhostLayerFullVectorConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/ThreeDistributionsDoubleGhostLayerFullVectorConnector.h
@@ -198,7 +198,8 @@ inline void ThreeDistributionsDoubleGhostLayerFullVectorConnector::fillData(vect
sdata[index++] = (*this->zeroH2distributions)(x1, x2, x3);
- sdata[index++] = (*this->pressure)(x1, x2, x3);
+ if (this->pressure)
+ sdata[index++] = (*this->pressure)(x1, x2, x3);
}
//////////////////////////////////////////////////////////////////////////
inline void ThreeDistributionsDoubleGhostLayerFullVectorConnector::distributeData(vector_type& rdata, int& index, int x1, int x2, int x3)
@@ -294,7 +295,8 @@ inline void ThreeDistributionsDoubleGhostLayerFullVectorConnector::distributeDat
(*this->zeroH2distributions)(x1, x2, x3) = rdata[index++];
- (*this->pressure)(x1, x2, x3) = rdata[index++];
+ if (this->pressure)
+ (*this->pressure)(x1, x2, x3) = rdata[index++];
}
diff --git a/src/cpu/VirtualFluidsCore/Connectors/TwoDistributionsDoubleGhostLayerFullVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/TwoDistributionsDoubleGhostLayerFullVectorConnector.h
index d5769c726eda127ca603d6984744274abaf2edae..67f896af34c8b7e7d7fa9c918236b5a435156c62 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/TwoDistributionsDoubleGhostLayerFullVectorConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/TwoDistributionsDoubleGhostLayerFullVectorConnector.h
@@ -158,7 +158,8 @@ inline void TwoDistributionsDoubleGhostLayerFullVectorConnector::fillData(vector
sdata[index++] = (*this->zeroHdistributions)(x1, x2, x3);
- sdata[index++] = (*this->pressure)(x1, x2, x3);
+ if (this->pressure)
+ sdata[index++] = (*this->pressure)(x1, x2, x3);
}
//////////////////////////////////////////////////////////////////////////
inline void TwoDistributionsDoubleGhostLayerFullVectorConnector::distributeData(vector_type& rdata, int& index, int x1, int x2, int x3)
@@ -224,7 +225,8 @@ inline void TwoDistributionsDoubleGhostLayerFullVectorConnector::distributeData(
(*this->zeroHdistributions)(x1, x2, x3) = rdata[index++];
- (*this->pressure)(x1, x2, x3) = rdata[index++];
+ if (this->pressure)
+ (*this->pressure)(x1, x2, x3) = rdata[index++];
}
diff --git a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
index 4660e7b8397482683d67e6ba74b466b1857df10c..11119ecbd59f1a4d145fb130b3d0fe2b2a671fac 100644
--- a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
+++ b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
@@ -259,7 +259,7 @@ void D3Q27EsoTwist3DSplittedVector::setDistributionForDirection(real f, size_t x
int direction)
{
using namespace vf::lbm::dir;
-
+
switch (direction) {
case DIR_P00:
(*this->nonLocalDistributions)(D3Q27System::ET_W, x1 + 1, x2, x3) = f;
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
index 237097ed5fd48f29b0b2e236cc497bd42110e681..c30a4cc8ceab72accc75238ea1535e923b3a3bee 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
@@ -186,11 +186,11 @@ void D3Q27TriFaceMeshInteractor::setQs(const real &timeStep)
assert(UbMath::equal(cblockDeltaX1 / (double)blocknx1, cblockDeltaX3 / (double)blocknx3));
for (int level = coarsestInitLevel; level <= finestInitLevel; level++) {
- double nodeDeltaX1 = cblockDeltaX1 / (double)(blocknx1 * (1 << (level - coarsestInitLevel)));
- double nodeDeltaX2 = cblockDeltaX2 / (double)(blocknx2 * (1 << (level - coarsestInitLevel)));
- double nodeDeltaX3 = cblockDeltaX3 / (double)(blocknx3 * (1 << (level - coarsestInitLevel)));
+ real nodeDeltaX1 = cblockDeltaX1 / (double)(blocknx1 * (1 << (level - coarsestInitLevel)));
+ real nodeDeltaX2 = cblockDeltaX2 / (double)(blocknx2 * (1 << (level - coarsestInitLevel)));
+ real nodeDeltaX3 = cblockDeltaX3 / (double)(blocknx3 * (1 << (level - coarsestInitLevel)));
- std::vector<double> distNeigh(D3Q27System::FENDDIR + 1, 0.0);
+ std::vector<real> distNeigh(D3Q27System::FENDDIR + 1, 0.0);
D3Q27System::calcDistanceToNeighbors(distNeigh, nodeDeltaX1, nodeDeltaX2, nodeDeltaX3);
// D3Q27System::calcDistanceToNeighbors(distNeigh, nodeDeltaX1);
@@ -233,7 +233,6 @@ void D3Q27TriFaceMeshInteractor::setQs(const real &timeStep)
// notwendige variablen initialisieren (u.a. blockDeltas des groben levels)
float triPoints[3][3];
float vx1 = 0.0, vx2 = 0.0, vx3 = 0.0;
- unsigned counterTriBoxOverlap = 0, counterAABBTriFace = 0, counterHalfspace = 0, counterBilligOBB = 0;
std::vector<GbTriFaceMesh3D::TriFace> &triangles = *mesh->getTriangles();
std::vector<GbTriFaceMesh3D::Vertex> &nodes = *mesh->getNodes();
std::map<SPtr<Block3D>, std::set<UbTupleInt3>> tmpSolidNodesFromOtherInteractors;
@@ -341,7 +340,6 @@ void D3Q27TriFaceMeshInteractor::setQs(const real &timeStep)
// wenn dreieck "vergroesserten cube" nicht schneidet/beruehrt -> keine BC moeglich -> continue
if (!GbMeshTools3D::triBoxOverlap(boxCenter, halfBoxSize, triPoints)) {
- counterTriBoxOverlap++;
continue;
}
@@ -396,7 +394,6 @@ void D3Q27TriFaceMeshInteractor::setQs(const real &timeStep)
bool pointIsOnBoundary = true;
if (!boundingCubeTriangle.isPointInGbObject3D(internX1, internX2, internX3,
pointIsOnBoundary)) {
- counterAABBTriFace++;
continue;
}
// std::cout<<"internX3 "<<internX3<<" internX2"<<internX2<<" internX1 "<<internX1<<"\n";
@@ -408,13 +405,11 @@ void D3Q27TriFaceMeshInteractor::setQs(const real &timeStep)
if (useHalfSpace &&
UbMath::less(distance, 0.0)) //== !halfSpace.ptInside(internX1,internX2,internX3) )
{
- counterHalfspace++;
continue;
}
// BilligOBB-Test: wenn distance > qEinflussDelta -> kein q
if (UbMath::greater(fabs(distance), qEinflussDelta)) {
- counterBilligOBB++;
continue;
}
@@ -666,9 +661,9 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const real &timeStep)
assert(UbMath::equal(cblockDeltaX1 / (double)blocknx1, cblockDeltaX3 / (double)blocknx3));
for (int level = coarsestInitLevel; level <= finestInitLevel; level++) {
- double nodeDelta = cblockDeltaX1 / (double)(blocknx1 * (1 << (level - coarsestInitLevel)));
+ real nodeDelta = cblockDeltaX1 / (double)(blocknx1 * (1 << (level - coarsestInitLevel)));
- std::vector<double> distNeigh(D3Q27System::FENDDIR + 1, 0.0);
+ std::vector<real> distNeigh(D3Q27System::FENDDIR + 1, 0.0);
D3Q27System::calcDistanceToNeighbors(distNeigh, nodeDelta);
nodeDeltaToNeigh[level].resize(D3Q27System::ENDDIR + 1, 0.0);
@@ -1050,7 +1045,6 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const real &timeStep)
// SG 26.08.2010 if(!bc && !bcMatrix->isSolid())
if (!bc) {
bc = SPtr<BoundaryConditions>(new BoundaryConditions);
- ;
bcMatrix->setBC(ix1, ix2, ix3, bc);
} else if (UbMath::less(bc->getQ(fdir), q)) // schon ein kuerzeres q voehanden?
{
@@ -1120,7 +1114,7 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const real &timeStep)
UBLOG(logDEBUG1, " * rejected nodes with halfspace test : " << counterHalfspace);
UBLOG(logDEBUG1, " * rejected nodes with OBB test : " << counterBilligOBB);
- typedef std::map<SPtr<Block3D>, SolidCheckMethod>::iterator BlockSolidCheckMethodIterator;
+ using BlockSolidCheckMethodIterator = std::map<SPtr<Block3D>, SolidCheckMethod>::iterator;
//////////////////////////////////////////////////////////////////////////
// SOLID checks
@@ -1313,7 +1307,7 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const real &timeStep)
//}
}
//////////////////////////////////////////////////////////////////////////
-void D3Q27TriFaceMeshInteractor::refineBlockGridToLevel(int level, double startDistance, double stopDistance)
+void D3Q27TriFaceMeshInteractor::refineBlockGridToLevel(int level, real startDistance, real stopDistance)
{
UBLOG(logDEBUG1, "D3Q27TriFaceMeshInteractor::refineBlockGridToLevel - start");
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
index 421f81a1ac3301d982178a06b4b8c6378f626e57..c6349de8f1d281d31d0be4e684c54da457d3029f 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
@@ -1,6 +1,6 @@
#include "CompressibleCumulant4thOrderViscosityLBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include <cmath>
#include "DataSet3D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
index 3c0795c21ed41c1f22dc06268e5fc1fa7922c845..ded8dff43910db33bd591cd4546f1dc73cc1110b 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
@@ -1,6 +1,6 @@
#include "CompressibleCumulantLBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include "DataSet3D.h"
#include "Block3D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
deleted file mode 100644
index 74527c0c39d5255a4ca3e647a288fffa027373ac..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
+++ /dev/null
@@ -1,1292 +0,0 @@
-#include "CompressibleOffsetMomentsInterpolationProcessor.h"
-#include "D3Q27System.h"
-
-//using namespace UbMath;
-using namespace vf::basics::constant;
-
-CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterpolationProcessor()
-
-{
- this->bulkViscosity = c0o1;
- this->shearViscosity = c0o1;
- this->OxxPyyPzzC = c1o1;
- this->OxxPyyPzzF = c1o1;
-}
-//////////////////////////////////////////////////////////////////////////
-CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterpolationProcessor(real omegaC, real omegaF)
- : omegaC(omegaC), omegaF(omegaF)
-{
- this->bulkViscosity = c0o1;
- this->shearViscosity = c0o1;
- this->OxxPyyPzzC = c1o1;
- this->OxxPyyPzzF = c1o1;
-}
-//////////////////////////////////////////////////////////////////////////
-CompressibleOffsetMomentsInterpolationProcessor::~CompressibleOffsetMomentsInterpolationProcessor()
-= default;
-//////////////////////////////////////////////////////////////////////////
-InterpolationProcessorPtr CompressibleOffsetMomentsInterpolationProcessor::clone()
-{
- InterpolationProcessorPtr iproc = InterpolationProcessorPtr (new CompressibleOffsetMomentsInterpolationProcessor(this->omegaC, this->omegaF));
-
- dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iproc)->OxxPyyPzzC = this->OxxPyyPzzC;
- dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iproc)->OxxPyyPzzF = this->OxxPyyPzzF;
-
- return iproc;
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::setOmegas( real omegaC, real omegaF )
-{
- this->omegaC = omegaC;
- this->omegaF = omegaF;
-
- real dtC = (c3o1 *shearViscosity)/((c1o1/omegaC)-c1o2);
- real dtF = (c3o1 *shearViscosity)/((c1o1/omegaF)-c1o2);
-
- if (bulkViscosity != 0)
- {
- this->OxxPyyPzzC = LBMSystem::calcOmega2(bulkViscosity, dtC);
- this->OxxPyyPzzF = LBMSystem::calcOmega2(bulkViscosity, dtF);
- }
- else
- {
- this->OxxPyyPzzC = c1o1;
- this->OxxPyyPzzF = c1o1;
- }
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::setOffsets(real xoff, real yoff, real zoff)
-{
- this->xoff = xoff;
- this->yoff = yoff;
- this->zoff = zoff;
- this->xoff_sq = xoff * xoff;
- this->yoff_sq = yoff * yoff;
- this->zoff_sq = zoff * zoff;
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
-{
- setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellC, omegaC, c1o2);
- calcInterpolatedNodeCF(icellF.BSW, omegaF, -c1o4, -c1o4, -c1o4, calcPressBSW(), -c1o1, -c1o1, -c1o1);
- calcInterpolatedNodeCF(icellF.BNE, omegaF, c1o4, c1o4, -c1o4, calcPressBNE(), c1o1, c1o1, -c1o1);
- calcInterpolatedNodeCF(icellF.TNW, omegaF, -c1o4, c1o4, c1o4, calcPressTNW(), -c1o1, c1o1, c1o1);
- calcInterpolatedNodeCF(icellF.TSE, omegaF, c1o4, -c1o4, c1o4, calcPressTSE(), c1o1, -c1o1, c1o1);
- calcInterpolatedNodeCF(icellF.BNW, omegaF, -c1o4, c1o4, -c1o4, calcPressBNW(), -c1o1, c1o1, -c1o1);
- calcInterpolatedNodeCF(icellF.BSE, omegaF, c1o4, -c1o4, -c1o4, calcPressBSE(), c1o1, -c1o1, -c1o1);
- calcInterpolatedNodeCF(icellF.TSW, omegaF, -c1o4, -c1o4, c1o4, calcPressTSW(), -c1o1, -c1o1, c1o1);
- calcInterpolatedNodeCF(icellF.TNE, omegaF, c1o4, c1o4, c1o4, calcPressTNE(), c1o1, c1o1, c1o1);
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
-{
- setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellF, omegaF, c2o1);
- calcInterpolatedNodeFC(icellC, omegaC);
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::calcMoments(const real* const f, real omega, real& press, real& vx1, real& vx2, real& vx3,
- real& kxy, real& kyz, real& kxz, real& kxxMyy, real& kxxMzz)
-{
- using namespace D3Q27System;
- using namespace vf::lbm::dir;
-
- real drho = c0o1;
- D3Q27System::calcCompMacroscopicValues(f,drho,vx1,vx2,vx3);
-
- press = drho; //interpolate rho!
-
- kxy = -c3o1*omega*((((f[DIR_MMP]+f[DIR_PPM])-(f[DIR_MPP]+f[DIR_PMM]))+((f[DIR_MMM]+f[DIR_PPP])-(f[DIR_MPM]+f[DIR_PMP])))+((f[DIR_MM0]+f[DIR_PP0])-(f[DIR_MP0]+f[DIR_PM0]))/(c1o1 + drho)-(vx1*vx2));// might not be optimal MG 25.2.13
- kyz = -c3o1*omega*((((f[DIR_MMM]+f[DIR_PPP])-(f[DIR_PMP]+f[DIR_MPM]))+((f[DIR_PMM]+f[DIR_MPP])-(f[DIR_MMP]+f[DIR_PPM])))+((f[DIR_0MM]+f[DIR_0PP])-(f[DIR_0MP]+f[DIR_0PM]))/(c1o1 + drho)-(vx2*vx3));
- kxz = -c3o1*omega*((((f[DIR_MPM]+f[DIR_PMP])-(f[DIR_MMP]+f[DIR_PPM]))+((f[DIR_MMM]+f[DIR_PPP])-(f[DIR_PMM]+f[DIR_MPP])))+((f[DIR_M0M]+f[DIR_P0P])-(f[DIR_M0P]+f[DIR_P0M]))/(c1o1 + drho)-(vx1*vx3));
- kxxMyy = -c3o1/c2o1*omega*((((f[DIR_M0M]+f[DIR_P0P])-(f[DIR_0MM]+f[DIR_0PP]))+((f[DIR_M0P]+f[DIR_P0M])-(f[DIR_0MP]+f[DIR_0PM])))+((f[DIR_M00]+f[DIR_P00])-(f[DIR_0M0]+f[DIR_0P0]))/(c1o1 + drho)-(vx1*vx1-vx2*vx2));
- kxxMzz = -c3o1/c2o1*omega*((((f[DIR_MP0]+f[DIR_PM0])-(f[DIR_0MM]+f[DIR_0PP]))+((f[DIR_MM0]+f[DIR_PP0])-(f[DIR_0MP]+f[DIR_0PM])))+((f[DIR_M00]+f[DIR_P00])-(f[DIR_00M]+f[DIR_00P]))/(c1o1 + drho)-(vx1*vx1-vx3*vx3));
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
-{
- real vx1_SWT,vx2_SWT,vx3_SWT;
- real vx1_NWT,vx2_NWT,vx3_NWT;
- real vx1_NET,vx2_NET,vx3_NET;
- real vx1_SET,vx2_SET,vx3_SET;
- real vx1_SWB,vx2_SWB,vx3_SWB;
- real vx1_NWB,vx2_NWB,vx3_NWB;
- real vx1_NEB,vx2_NEB,vx3_NEB;
- real vx1_SEB,vx2_SEB,vx3_SEB;
-
- real kxyFromfcNEQ_SWT, kyzFromfcNEQ_SWT, kxzFromfcNEQ_SWT, kxxMyyFromfcNEQ_SWT, kxxMzzFromfcNEQ_SWT;
- real kxyFromfcNEQ_NWT, kyzFromfcNEQ_NWT, kxzFromfcNEQ_NWT, kxxMyyFromfcNEQ_NWT, kxxMzzFromfcNEQ_NWT;
- real kxyFromfcNEQ_NET, kyzFromfcNEQ_NET, kxzFromfcNEQ_NET, kxxMyyFromfcNEQ_NET, kxxMzzFromfcNEQ_NET;
- real kxyFromfcNEQ_SET, kyzFromfcNEQ_SET, kxzFromfcNEQ_SET, kxxMyyFromfcNEQ_SET, kxxMzzFromfcNEQ_SET;
- real kxyFromfcNEQ_SWB, kyzFromfcNEQ_SWB, kxzFromfcNEQ_SWB, kxxMyyFromfcNEQ_SWB, kxxMzzFromfcNEQ_SWB;
- real kxyFromfcNEQ_NWB, kyzFromfcNEQ_NWB, kxzFromfcNEQ_NWB, kxxMyyFromfcNEQ_NWB, kxxMzzFromfcNEQ_NWB;
- real kxyFromfcNEQ_NEB, kyzFromfcNEQ_NEB, kxzFromfcNEQ_NEB, kxxMyyFromfcNEQ_NEB, kxxMzzFromfcNEQ_NEB;
- real kxyFromfcNEQ_SEB, kyzFromfcNEQ_SEB, kxzFromfcNEQ_SEB, kxxMyyFromfcNEQ_SEB, kxxMzzFromfcNEQ_SEB;
-
- calcMoments(icell.TSW,omega,press_SWT,vx1_SWT,vx2_SWT,vx3_SWT, kxyFromfcNEQ_SWT, kyzFromfcNEQ_SWT, kxzFromfcNEQ_SWT, kxxMyyFromfcNEQ_SWT, kxxMzzFromfcNEQ_SWT);
- calcMoments(icell.TNW,omega,press_NWT,vx1_NWT,vx2_NWT,vx3_NWT, kxyFromfcNEQ_NWT, kyzFromfcNEQ_NWT, kxzFromfcNEQ_NWT, kxxMyyFromfcNEQ_NWT, kxxMzzFromfcNEQ_NWT);
- calcMoments(icell.TNE,omega,press_NET,vx1_NET,vx2_NET,vx3_NET, kxyFromfcNEQ_NET, kyzFromfcNEQ_NET, kxzFromfcNEQ_NET, kxxMyyFromfcNEQ_NET, kxxMzzFromfcNEQ_NET);
- calcMoments(icell.TSE,omega,press_SET,vx1_SET,vx2_SET,vx3_SET, kxyFromfcNEQ_SET, kyzFromfcNEQ_SET, kxzFromfcNEQ_SET, kxxMyyFromfcNEQ_SET, kxxMzzFromfcNEQ_SET);
- calcMoments(icell.BSW,omega,press_SWB,vx1_SWB,vx2_SWB,vx3_SWB, kxyFromfcNEQ_SWB, kyzFromfcNEQ_SWB, kxzFromfcNEQ_SWB, kxxMyyFromfcNEQ_SWB, kxxMzzFromfcNEQ_SWB);
- calcMoments(icell.BNW,omega,press_NWB,vx1_NWB,vx2_NWB,vx3_NWB, kxyFromfcNEQ_NWB, kyzFromfcNEQ_NWB, kxzFromfcNEQ_NWB, kxxMyyFromfcNEQ_NWB, kxxMzzFromfcNEQ_NWB);
- calcMoments(icell.BNE,omega,press_NEB,vx1_NEB,vx2_NEB,vx3_NEB, kxyFromfcNEQ_NEB, kyzFromfcNEQ_NEB, kxzFromfcNEQ_NEB, kxxMyyFromfcNEQ_NEB, kxxMzzFromfcNEQ_NEB);
- calcMoments(icell.BSE,omega,press_SEB,vx1_SEB,vx2_SEB,vx3_SEB, kxyFromfcNEQ_SEB, kyzFromfcNEQ_SEB, kxzFromfcNEQ_SEB, kxxMyyFromfcNEQ_SEB, kxxMzzFromfcNEQ_SEB);
-
- //LBMReal dxRho=c1o4*((press_NET-press_SWB)+(press_SET-press_NWB)+(press_NEB-press_SWT)+(press_SEB-press_NWT));
- //LBMReal dyRho=c1o4*((press_NET-press_SWB)-(press_SET-press_NWB)+(press_NEB-press_SWT)-(press_SEB-press_NWT));
- //LBMReal dzRho=c1o4*((press_NET-press_SWB)+(press_SET-press_NWB)-(press_NEB-press_SWT)-(press_SEB-press_NWT));
-
- // kxyFromfcNEQ_SWT+=vx1_SWT*dyRho+vx2_SWT*dxRho;
- // kxyFromfcNEQ_NWT+=vx1_NWT*dyRho+vx2_NWT*dxRho;
- // kxyFromfcNEQ_NET+=vx1_NET*dyRho+vx2_NET*dxRho;
- // kxyFromfcNEQ_SET+=vx1_SET*dyRho+vx2_SET*dxRho;
- // kxyFromfcNEQ_SWB+=vx1_SWB*dyRho+vx2_SWB*dxRho;
- // kxyFromfcNEQ_NWB+=vx1_NWB*dyRho+vx2_NWB*dxRho;
- // kxyFromfcNEQ_NEB+=vx1_NEB*dyRho+vx2_NEB*dxRho;
- // kxyFromfcNEQ_SEB+=vx1_SEB*dyRho+vx2_SEB*dxRho;
-
- // kyzFromfcNEQ_SWT+=vx3_SWT*dyRho+vx2_SWT*dzRho;
- // kyzFromfcNEQ_NWT+=vx3_NWT*dyRho+vx2_NWT*dzRho;
- // kyzFromfcNEQ_NET+=vx3_NET*dyRho+vx2_NET*dzRho;
- // kyzFromfcNEQ_SET+=vx3_SET*dyRho+vx2_SET*dzRho;
- // kyzFromfcNEQ_SWB+=vx3_SWB*dyRho+vx2_SWB*dzRho;
- // kyzFromfcNEQ_NWB+=vx3_NWB*dyRho+vx2_NWB*dzRho;
- // kyzFromfcNEQ_NEB+=vx3_NEB*dyRho+vx2_NEB*dzRho;
- // kyzFromfcNEQ_SEB+=vx3_SEB*dyRho+vx2_SEB*dzRho;
-
- // kxzFromfcNEQ_SWT+=vx1_SWT*dzRho+vx3_SWT*dxRho;
- // kxzFromfcNEQ_NWT+=vx1_NWT*dzRho+vx3_NWT*dxRho;
- // kxzFromfcNEQ_NET+=vx1_NET*dzRho+vx3_NET*dxRho;
- // kxzFromfcNEQ_SET+=vx1_SET*dzRho+vx3_SET*dxRho;
- // kxzFromfcNEQ_SWB+=vx1_SWB*dzRho+vx3_SWB*dxRho;
- // kxzFromfcNEQ_NWB+=vx1_NWB*dzRho+vx3_NWB*dxRho;
- // kxzFromfcNEQ_NEB+=vx1_NEB*dzRho+vx3_NEB*dxRho;
- // kxzFromfcNEQ_SEB+=vx1_SEB*dzRho+vx3_SEB*dxRho;
-
- // kxxMyyFromfcNEQ_SWT+=vx1_SWT*dxRho-vx2_SWT*dyRho;
- // kxxMyyFromfcNEQ_NWT+=vx1_NWT*dxRho-vx2_NWT*dyRho;
- // kxxMyyFromfcNEQ_NET+=vx1_NET*dxRho-vx2_NET*dyRho;
- // kxxMyyFromfcNEQ_SET+=vx1_SET*dxRho-vx2_SET*dyRho;
- // kxxMyyFromfcNEQ_SWB+=vx1_SWB*dxRho-vx2_SWB*dyRho;
- // kxxMyyFromfcNEQ_NWB+=vx1_NWB*dxRho-vx2_NWB*dyRho;
- // kxxMyyFromfcNEQ_NEB+=vx1_NEB*dxRho-vx2_NEB*dyRho;
- // kxxMyyFromfcNEQ_SEB+=vx1_SEB*dxRho-vx2_SEB*dyRho;
-
- // kxxMzzFromfcNEQ_SWT+=vx1_SWT*dxRho-vx3_SWT*dzRho;
- // kxxMzzFromfcNEQ_NWT+=vx1_NWT*dxRho-vx3_NWT*dzRho;
- // kxxMzzFromfcNEQ_NET+=vx1_NET*dxRho-vx3_NET*dzRho;
- // kxxMzzFromfcNEQ_SET+=vx1_SET*dxRho-vx3_SET*dzRho;
- // kxxMzzFromfcNEQ_SWB+=vx1_SWB*dxRho-vx3_SWB*dzRho;
- // kxxMzzFromfcNEQ_NWB+=vx1_NWB*dxRho-vx3_NWB*dzRho;
- // kxxMzzFromfcNEQ_NEB+=vx1_NEB*dxRho-vx3_NEB*dzRho;
- // kxxMzzFromfcNEQ_SEB+=vx1_SEB*dxRho-vx3_SEB*dzRho;
-
-
- //kxxMzzFromfcNEQ_SWT=0.0;
- //kxxMzzFromfcNEQ_NWT=0.0;
- //kxxMzzFromfcNEQ_NET=0.0;
- //kxxMzzFromfcNEQ_SET=0.0;
- //kxxMzzFromfcNEQ_SWB=0.0;
- //kxxMzzFromfcNEQ_NWB=0.0;
- //kxxMzzFromfcNEQ_NEB=0.0;
- //kxxMzzFromfcNEQ_SEB=0.0;
-
-
-
-
-
- a0 = (-kxxMyyFromfcNEQ_NEB - kxxMyyFromfcNEQ_NET + kxxMyyFromfcNEQ_NWB + kxxMyyFromfcNEQ_NWT -
- kxxMyyFromfcNEQ_SEB - kxxMyyFromfcNEQ_SET + kxxMyyFromfcNEQ_SWB + kxxMyyFromfcNEQ_SWT -
- kxxMzzFromfcNEQ_NEB - kxxMzzFromfcNEQ_NET + kxxMzzFromfcNEQ_NWB + kxxMzzFromfcNEQ_NWT -
- kxxMzzFromfcNEQ_SEB - kxxMzzFromfcNEQ_SET + kxxMzzFromfcNEQ_SWB + kxxMzzFromfcNEQ_SWT -
- c2o1*kxyFromfcNEQ_NEB - c2o1*kxyFromfcNEQ_NET - c2o1*kxyFromfcNEQ_NWB - c2o1*kxyFromfcNEQ_NWT +
- c2o1*kxyFromfcNEQ_SEB + c2o1*kxyFromfcNEQ_SET + c2o1*kxyFromfcNEQ_SWB + c2o1*kxyFromfcNEQ_SWT +
- c2o1*kxzFromfcNEQ_NEB - c2o1*kxzFromfcNEQ_NET + c2o1*kxzFromfcNEQ_NWB - c2o1*kxzFromfcNEQ_NWT +
- c2o1*kxzFromfcNEQ_SEB - c2o1*kxzFromfcNEQ_SET + c2o1*kxzFromfcNEQ_SWB - c2o1*kxzFromfcNEQ_SWT +
- c8o1*vx1_NEB + c8o1*vx1_NET + c8o1*vx1_NWB + c8o1*vx1_NWT + c8o1*vx1_SEB +
- c8o1*vx1_SET + c8o1*vx1_SWB + c8o1*vx1_SWT + c2o1*vx2_NEB + c2o1*vx2_NET -
- c2o1*vx2_NWB - c2o1*vx2_NWT - c2o1*vx2_SEB - c2o1*vx2_SET + c2o1*vx2_SWB +
- c2o1*vx2_SWT - c2o1*vx3_NEB + c2o1*vx3_NET + c2o1*vx3_NWB - c2o1*vx3_NWT -
- c2o1*vx3_SEB + c2o1*vx3_SET + c2o1*vx3_SWB - c2o1*vx3_SWT)/c64o1;
- b0 = (c2o1*kxxMyyFromfcNEQ_NEB + c2o1*kxxMyyFromfcNEQ_NET + c2o1*kxxMyyFromfcNEQ_NWB + c2o1*kxxMyyFromfcNEQ_NWT -
- c2o1*kxxMyyFromfcNEQ_SEB - c2o1*kxxMyyFromfcNEQ_SET - c2o1*kxxMyyFromfcNEQ_SWB - c2o1*kxxMyyFromfcNEQ_SWT -
- kxxMzzFromfcNEQ_NEB - kxxMzzFromfcNEQ_NET - kxxMzzFromfcNEQ_NWB - kxxMzzFromfcNEQ_NWT +
- kxxMzzFromfcNEQ_SEB + kxxMzzFromfcNEQ_SET + kxxMzzFromfcNEQ_SWB + kxxMzzFromfcNEQ_SWT -
- c2o1*kxyFromfcNEQ_NEB - c2o1*kxyFromfcNEQ_NET + c2o1*kxyFromfcNEQ_NWB + c2o1*kxyFromfcNEQ_NWT -
- c2o1*kxyFromfcNEQ_SEB - c2o1*kxyFromfcNEQ_SET + c2o1*kxyFromfcNEQ_SWB + c2o1*kxyFromfcNEQ_SWT +
- c2o1*kyzFromfcNEQ_NEB - c2o1*kyzFromfcNEQ_NET + c2o1*kyzFromfcNEQ_NWB - c2o1*kyzFromfcNEQ_NWT +
- c2o1*kyzFromfcNEQ_SEB - c2o1*kyzFromfcNEQ_SET + c2o1*kyzFromfcNEQ_SWB - c2o1*kyzFromfcNEQ_SWT +
- c2o1*vx1_NEB + c2o1*vx1_NET - c2o1*vx1_NWB - c2o1*vx1_NWT -
- c2o1*vx1_SEB - c2o1*vx1_SET + c2o1*vx1_SWB + c2o1*vx1_SWT +
- c8o1*vx2_NEB + c8o1*vx2_NET + c8o1*vx2_NWB + c8o1*vx2_NWT +
- c8o1*vx2_SEB + c8o1*vx2_SET + c8o1*vx2_SWB + c8o1*vx2_SWT -
- c2o1*vx3_NEB + c2o1*vx3_NET - c2o1*vx3_NWB + c2o1*vx3_NWT +
- c2o1*vx3_SEB - c2o1*vx3_SET + c2o1*vx3_SWB - c2o1*vx3_SWT)/c64o1;
- c0 = (kxxMyyFromfcNEQ_NEB - kxxMyyFromfcNEQ_NET + kxxMyyFromfcNEQ_NWB - kxxMyyFromfcNEQ_NWT +
- kxxMyyFromfcNEQ_SEB - kxxMyyFromfcNEQ_SET + kxxMyyFromfcNEQ_SWB - kxxMyyFromfcNEQ_SWT -
- c2o1*kxxMzzFromfcNEQ_NEB + c2o1*kxxMzzFromfcNEQ_NET - c2o1*kxxMzzFromfcNEQ_NWB + c2o1*kxxMzzFromfcNEQ_NWT -
- c2o1*kxxMzzFromfcNEQ_SEB + c2o1*kxxMzzFromfcNEQ_SET - c2o1*kxxMzzFromfcNEQ_SWB + c2o1*kxxMzzFromfcNEQ_SWT -
- c2o1*kxzFromfcNEQ_NEB - c2o1*kxzFromfcNEQ_NET + c2o1*kxzFromfcNEQ_NWB + c2o1*kxzFromfcNEQ_NWT -
- c2o1*kxzFromfcNEQ_SEB - c2o1*kxzFromfcNEQ_SET + c2o1*kxzFromfcNEQ_SWB + c2o1*kxzFromfcNEQ_SWT -
- c2o1*kyzFromfcNEQ_NEB - c2o1*kyzFromfcNEQ_NET - c2o1*kyzFromfcNEQ_NWB - c2o1*kyzFromfcNEQ_NWT +
- c2o1*kyzFromfcNEQ_SEB + c2o1*kyzFromfcNEQ_SET + c2o1*kyzFromfcNEQ_SWB + c2o1*kyzFromfcNEQ_SWT -
- c2o1*vx1_NEB + c2o1*vx1_NET + c2o1*vx1_NWB - c2o1*vx1_NWT -
- c2o1*vx1_SEB + c2o1*vx1_SET + c2o1*vx1_SWB - c2o1*vx1_SWT -
- c2o1*vx2_NEB + c2o1*vx2_NET - c2o1*vx2_NWB + c2o1*vx2_NWT +
- c2o1*vx2_SEB - c2o1*vx2_SET + c2o1*vx2_SWB - c2o1*vx2_SWT +
- c8o1*vx3_NEB + c8o1*vx3_NET + c8o1*vx3_NWB + c8o1*vx3_NWT +
- c8o1*vx3_SEB + c8o1*vx3_SET + c8o1*vx3_SWB + c8o1*vx3_SWT)/c64o1;
- ax = (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT + vx1_SEB + vx1_SET - vx1_SWB - vx1_SWT)/c4o1;
- bx = (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT + vx2_SEB + vx2_SET - vx2_SWB - vx2_SWT)/c4o1;
- cx = (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT + vx3_SEB + vx3_SET - vx3_SWB - vx3_SWT)/c4o1;
- axx= (kxxMyyFromfcNEQ_NEB + kxxMyyFromfcNEQ_NET - kxxMyyFromfcNEQ_NWB - kxxMyyFromfcNEQ_NWT +
- kxxMyyFromfcNEQ_SEB + kxxMyyFromfcNEQ_SET - kxxMyyFromfcNEQ_SWB - kxxMyyFromfcNEQ_SWT +
- kxxMzzFromfcNEQ_NEB + kxxMzzFromfcNEQ_NET - kxxMzzFromfcNEQ_NWB - kxxMzzFromfcNEQ_NWT +
- kxxMzzFromfcNEQ_SEB + kxxMzzFromfcNEQ_SET - kxxMzzFromfcNEQ_SWB - kxxMzzFromfcNEQ_SWT +
- c2o1*vx2_NEB + c2o1*vx2_NET - c2o1*vx2_NWB - c2o1*vx2_NWT -
- c2o1*vx2_SEB - c2o1*vx2_SET + c2o1*vx2_SWB + c2o1*vx2_SWT -
- c2o1*vx3_NEB + c2o1*vx3_NET + c2o1*vx3_NWB - c2o1*vx3_NWT -
- c2o1*vx3_SEB + c2o1*vx3_SET + c2o1*vx3_SWB - c2o1*vx3_SWT)/c16o1;
- bxx= (kxyFromfcNEQ_NEB + kxyFromfcNEQ_NET - kxyFromfcNEQ_NWB - kxyFromfcNEQ_NWT +
- kxyFromfcNEQ_SEB + kxyFromfcNEQ_SET - kxyFromfcNEQ_SWB - kxyFromfcNEQ_SWT -
- c2o1*vx1_NEB - c2o1*vx1_NET + c2o1*vx1_NWB + c2o1*vx1_NWT +
- c2o1*vx1_SEB + c2o1*vx1_SET - c2o1*vx1_SWB - c2o1*vx1_SWT)/c8o1;
- cxx= (kxzFromfcNEQ_NEB + kxzFromfcNEQ_NET - kxzFromfcNEQ_NWB - kxzFromfcNEQ_NWT +
- kxzFromfcNEQ_SEB + kxzFromfcNEQ_SET - kxzFromfcNEQ_SWB - kxzFromfcNEQ_SWT +
- c2o1*vx1_NEB - c2o1*vx1_NET - c2o1*vx1_NWB + c2o1*vx1_NWT +
- c2o1*vx1_SEB - c2o1*vx1_SET - c2o1*vx1_SWB + c2o1*vx1_SWT)/c8o1;
- ay = (vx1_NEB + vx1_NET + vx1_NWB + vx1_NWT - vx1_SEB - vx1_SET - vx1_SWB - vx1_SWT)/c4o1;
- by = (vx2_NEB + vx2_NET + vx2_NWB + vx2_NWT - vx2_SEB - vx2_SET - vx2_SWB - vx2_SWT)/c4o1;
- cy = (vx3_NEB + vx3_NET + vx3_NWB + vx3_NWT - vx3_SEB - vx3_SET - vx3_SWB - vx3_SWT)/c4o1;
- ayy= (kxyFromfcNEQ_NEB + kxyFromfcNEQ_NET + kxyFromfcNEQ_NWB + kxyFromfcNEQ_NWT -
- kxyFromfcNEQ_SEB - kxyFromfcNEQ_SET - kxyFromfcNEQ_SWB - kxyFromfcNEQ_SWT -
- c2o1*vx2_NEB - c2o1*vx2_NET + c2o1*vx2_NWB + c2o1*vx2_NWT +
- c2o1*vx2_SEB + c2o1*vx2_SET - c2o1*vx2_SWB - c2o1*vx2_SWT)/c8o1;
- byy= (-c2o1*kxxMyyFromfcNEQ_NEB - c2o1*kxxMyyFromfcNEQ_NET - c2o1*kxxMyyFromfcNEQ_NWB - c2o1*kxxMyyFromfcNEQ_NWT +
- c2o1*kxxMyyFromfcNEQ_SEB + c2o1*kxxMyyFromfcNEQ_SET + c2o1*kxxMyyFromfcNEQ_SWB + c2o1*kxxMyyFromfcNEQ_SWT +
- kxxMzzFromfcNEQ_NEB + kxxMzzFromfcNEQ_NET + kxxMzzFromfcNEQ_NWB + kxxMzzFromfcNEQ_NWT -
- kxxMzzFromfcNEQ_SEB - kxxMzzFromfcNEQ_SET - kxxMzzFromfcNEQ_SWB - kxxMzzFromfcNEQ_SWT +
- c2o1*vx1_NEB + c2o1*vx1_NET - c2o1*vx1_NWB - c2o1*vx1_NWT -
- c2o1*vx1_SEB - c2o1*vx1_SET + c2o1*vx1_SWB + c2o1*vx1_SWT -
- c2o1*vx3_NEB + c2o1*vx3_NET - c2o1*vx3_NWB + c2o1*vx3_NWT +
- c2o1*vx3_SEB - c2o1*vx3_SET + c2o1*vx3_SWB - c2o1*vx3_SWT)/c16o1;
- cyy= (kyzFromfcNEQ_NEB + kyzFromfcNEQ_NET + kyzFromfcNEQ_NWB + kyzFromfcNEQ_NWT -
- kyzFromfcNEQ_SEB - kyzFromfcNEQ_SET - kyzFromfcNEQ_SWB - kyzFromfcNEQ_SWT +
- c2o1*vx2_NEB - c2o1*vx2_NET + c2o1*vx2_NWB - c2o1*vx2_NWT -
- c2o1*vx2_SEB + c2o1*vx2_SET - c2o1*vx2_SWB + c2o1*vx2_SWT)/c8o1;
- az = (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT - vx1_SEB + vx1_SET - vx1_SWB + vx1_SWT)/c4o1;
- bz = (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT - vx2_SEB + vx2_SET - vx2_SWB + vx2_SWT)/c4o1;
- cz = (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT - vx3_SEB + vx3_SET - vx3_SWB + vx3_SWT)/c4o1;
- azz= (-kxzFromfcNEQ_NEB + kxzFromfcNEQ_NET - kxzFromfcNEQ_NWB + kxzFromfcNEQ_NWT -
- kxzFromfcNEQ_SEB + kxzFromfcNEQ_SET - kxzFromfcNEQ_SWB + kxzFromfcNEQ_SWT +
- c2o1*vx3_NEB - c2o1*vx3_NET - c2o1*vx3_NWB + c2o1*vx3_NWT +
- c2o1*vx3_SEB - c2o1*vx3_SET - c2o1*vx3_SWB + c2o1*vx3_SWT)/c8o1;
- bzz= (-kyzFromfcNEQ_NEB + kyzFromfcNEQ_NET - kyzFromfcNEQ_NWB + kyzFromfcNEQ_NWT -
- kyzFromfcNEQ_SEB + kyzFromfcNEQ_SET - kyzFromfcNEQ_SWB + kyzFromfcNEQ_SWT +
- c2o1*vx3_NEB - c2o1*vx3_NET + c2o1*vx3_NWB - c2o1*vx3_NWT -
- c2o1*vx3_SEB + c2o1*vx3_SET - c2o1*vx3_SWB + c2o1*vx3_SWT)/c8o1;
- czz= (-kxxMyyFromfcNEQ_NEB + kxxMyyFromfcNEQ_NET - kxxMyyFromfcNEQ_NWB + kxxMyyFromfcNEQ_NWT -
- kxxMyyFromfcNEQ_SEB + kxxMyyFromfcNEQ_SET - kxxMyyFromfcNEQ_SWB + kxxMyyFromfcNEQ_SWT +
- c2o1*kxxMzzFromfcNEQ_NEB - c2o1*kxxMzzFromfcNEQ_NET + c2o1*kxxMzzFromfcNEQ_NWB - c2o1*kxxMzzFromfcNEQ_NWT +
- c2o1*kxxMzzFromfcNEQ_SEB - c2o1*kxxMzzFromfcNEQ_SET + c2o1*kxxMzzFromfcNEQ_SWB - c2o1*kxxMzzFromfcNEQ_SWT -
- c2o1*vx1_NEB + c2o1*vx1_NET + c2o1*vx1_NWB - c2o1*vx1_NWT -
- c2o1*vx1_SEB + c2o1*vx1_SET + c2o1*vx1_SWB - c2o1*vx1_SWT -
- c2o1*vx2_NEB + c2o1*vx2_NET - c2o1*vx2_NWB + c2o1*vx2_NWT +
- c2o1*vx2_SEB - c2o1*vx2_SET + c2o1*vx2_SWB - c2o1*vx2_SWT)/c16o1;
- axy= (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT - vx1_SEB - vx1_SET + vx1_SWB + vx1_SWT)/c2o1;
- bxy= (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT - vx2_SEB - vx2_SET + vx2_SWB + vx2_SWT)/c2o1;
- cxy= (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT - vx3_SEB - vx3_SET + vx3_SWB + vx3_SWT)/c2o1;
- axz= (-vx1_NEB + vx1_NET + vx1_NWB - vx1_NWT - vx1_SEB + vx1_SET + vx1_SWB - vx1_SWT)/c2o1;
- bxz= (-vx2_NEB + vx2_NET + vx2_NWB - vx2_NWT - vx2_SEB + vx2_SET + vx2_SWB - vx2_SWT)/c2o1;
- cxz= (-vx3_NEB + vx3_NET + vx3_NWB - vx3_NWT - vx3_SEB + vx3_SET + vx3_SWB - vx3_SWT)/c2o1;
- ayz= (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT + vx1_SEB - vx1_SET + vx1_SWB - vx1_SWT)/c2o1;
- byz= (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT + vx2_SEB - vx2_SET + vx2_SWB - vx2_SWT)/c2o1;
- cyz= (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT + vx3_SEB - vx3_SET + vx3_SWB - vx3_SWT)/c2o1;
- axyz=-vx1_NEB + vx1_NET + vx1_NWB - vx1_NWT + vx1_SEB - vx1_SET - vx1_SWB + vx1_SWT;
- bxyz=-vx2_NEB + vx2_NET + vx2_NWB - vx2_NWT + vx2_SEB - vx2_SET - vx2_SWB + vx2_SWT;
- cxyz=-vx3_NEB + vx3_NET + vx3_NWB - vx3_NWT + vx3_SEB - vx3_SET - vx3_SWB + vx3_SWT;
-
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- kxyAverage = c0o1;//(kxyFromfcNEQ_SWB+
- //kxyFromfcNEQ_SWT+
- //kxyFromfcNEQ_SET+
- //kxyFromfcNEQ_SEB+
- //kxyFromfcNEQ_NWB+
- //kxyFromfcNEQ_NWT+
- //kxyFromfcNEQ_NET+
- //kxyFromfcNEQ_NEB)*c1o8-(ay+bx);
- kyzAverage = c0o1;//(kyzFromfcNEQ_SWB+
- //kyzFromfcNEQ_SWT+
- //kyzFromfcNEQ_SET+
- //kyzFromfcNEQ_SEB+
- //kyzFromfcNEQ_NWB+
- //kyzFromfcNEQ_NWT+
- //kyzFromfcNEQ_NET+
- //kyzFromfcNEQ_NEB)*c1o8-(bz+cy);
- kxzAverage = c0o1;//(kxzFromfcNEQ_SWB+
- //kxzFromfcNEQ_SWT+
- //kxzFromfcNEQ_SET+
- //kxzFromfcNEQ_SEB+
- //kxzFromfcNEQ_NWB+
- //kxzFromfcNEQ_NWT+
- //kxzFromfcNEQ_NET+
- //kxzFromfcNEQ_NEB)*c1o8-(az+cx);
- kxxMyyAverage = c0o1;//(kxxMyyFromfcNEQ_SWB+
- //kxxMyyFromfcNEQ_SWT+
- //kxxMyyFromfcNEQ_SET+
- //kxxMyyFromfcNEQ_SEB+
- //kxxMyyFromfcNEQ_NWB+
- //kxxMyyFromfcNEQ_NWT+
- //kxxMyyFromfcNEQ_NET+
- //kxxMyyFromfcNEQ_NEB)*c1o8-(ax-by);
- kxxMzzAverage = c0o1;//(kxxMzzFromfcNEQ_SWB+
- //kxxMzzFromfcNEQ_SWT+
- //kxxMzzFromfcNEQ_SET+
- //kxxMzzFromfcNEQ_SEB+
- //kxxMzzFromfcNEQ_NWB+
- //kxxMzzFromfcNEQ_NWT+
- //kxxMzzFromfcNEQ_NET+
- //kxxMzzFromfcNEQ_NEB)*c1o8-(ax-cz);
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- //
- // Bernd das Brot
- //
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- a0 = a0 + xoff * ax + yoff * ay + zoff * az + xoff_sq * axx + yoff_sq * ayy + zoff_sq * azz + xoff*yoff*axy + xoff*zoff*axz + yoff*zoff*ayz + xoff*yoff*zoff*axyz ;
- ax = ax + c2o1 * xoff * axx + yoff * axy + zoff * axz + yoff*zoff*axyz;
- ay = ay + c2o1 * yoff * ayy + xoff * axy + zoff * ayz + xoff*zoff*axyz;
- az = az + c2o1 * zoff * azz + xoff * axz + yoff * ayz + xoff*yoff*axyz;
- b0 = b0 + xoff * bx + yoff * by + zoff * bz + xoff_sq * bxx + yoff_sq * byy + zoff_sq * bzz + xoff*yoff*bxy + xoff*zoff*bxz + yoff*zoff*byz + xoff*yoff*zoff*bxyz;
- bx = bx + c2o1 * xoff * bxx + yoff * bxy + zoff * bxz + yoff*zoff*bxyz;
- by = by + c2o1 * yoff * byy + xoff * bxy + zoff * byz + xoff*zoff*bxyz;
- bz = bz + c2o1 * zoff * bzz + xoff * bxz + yoff * byz + xoff*yoff*bxyz;
- c0 = c0 + xoff * cx + yoff * cy + zoff * cz + xoff_sq * cxx + yoff_sq * cyy + zoff_sq * czz + xoff*yoff*cxy + xoff*zoff*cxz + yoff*zoff*cyz + xoff*yoff*zoff*cxyz;
- cx = cx + c2o1 * xoff * cxx + yoff * cxy + zoff * cxz + yoff*zoff*cxyz;
- cy = cy + c2o1 * yoff * cyy + xoff * cxy + zoff * cyz + xoff*zoff*cxyz;
- cz = cz + c2o1 * zoff * czz + xoff * cxz + yoff * cyz + xoff*yoff*cxyz;
- axy= axy + zoff*axyz;
- axz= axz + yoff*axyz;
- ayz= ayz + xoff*axyz;
- bxy= bxy + zoff*bxyz;
- bxz= bxz + yoff*bxyz;
- byz= byz + xoff*bxyz;
- cxy= cxy + zoff*cxyz;
- cxz= cxz + yoff*cxyz;
- cyz= cyz + xoff*cxyz;
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- const real o = omega;
-
- f_E = eps_new*((c2o1*(-c2o1*ax + by + cz-kxxMzzAverage-kxxMyyAverage))/(c27o1*o));
- f_N = eps_new*((c2o1*(ax - c2o1*by + cz+c2o1*kxxMyyAverage-kxxMzzAverage))/(c27o1*o));
- f_T = eps_new*((c2o1*(ax + by - c2o1*cz-kxxMyyAverage+c2o1*kxxMzzAverage))/(c27o1*o));
- f_NE = eps_new*(-(ax + c3o1*ay + c3o1*bx + by - c2o1*cz+c2o1*kxxMyyAverage-kxxMyyAverage+c3o1*kxyAverage)/(c54o1*o));
- f_SE = eps_new*(-(ax - c3o1*ay - c3o1*bx + by - c2o1*cz+c2o1*kxxMyyAverage-kxxMyyAverage-c3o1*kxyAverage)/(c54o1*o));
- f_TE = eps_new*(-(ax + c3o1*az - c2o1*by + c3o1*cx + cz+c2o1*kxxMyyAverage-kxxMzzAverage+c3o1*kxzAverage)/(c54o1*o));
- f_BE = eps_new*(-(ax - c3o1*az - c2o1*by - c3o1*cx + cz+c2o1*kxxMyyAverage-kxxMzzAverage-c3o1*kxzAverage)/(c54o1*o));
- f_TN = eps_new*(-(-c2o1*ax + by + c3o1*bz + c3o1*cy + cz-kxxMyyAverage-kxxMzzAverage+c3o1*kyzAverage)/(c54o1*o));
- f_BN = eps_new*(-(-c2o1*ax + by - c3o1*bz - c3o1*cy + cz-kxxMyyAverage-kxxMzzAverage-c3o1*kyzAverage)/(c54o1*o));
- f_ZERO = 0.;
- f_TNE = eps_new*(-(ay + az + bx + bz + cx + cy+kxyAverage+kxzAverage+kyzAverage)/(c72o1*o));
- f_TSW = eps_new*((-ay + az - bx + bz + cx + cy-kxyAverage+kxzAverage+kyzAverage)/(c72o1*o));
- f_TSE = eps_new*((ay - az + bx + bz - cx + cy+kxyAverage-kxzAverage+kyzAverage)/(c72o1*o));
- f_TNW = eps_new*((ay + az + bx - bz + cx - cy+kxyAverage+kxzAverage-kyzAverage)/(c72o1*o));
-
- x_E = c1o4*eps_new*((c2o1*(-c4o1*axx + bxy + cxz))/(c27o1*o));
- x_N = c1o4*eps_new*((c2o1*(c2o1*axx - c2o1*bxy + cxz))/(c27o1*o));
- x_T = c1o4*eps_new*((c2o1*(c2o1*axx + bxy - c2o1*cxz))/(c27o1*o));
- x_NE = c1o4*eps_new*(-((c2o1*axx + c3o1*axy + c6o1*bxx + bxy - c2o1*cxz))/(c54o1*o));
- x_SE = c1o4*eps_new*(-((c2o1*axx - c3o1*axy - c6o1*bxx + bxy - c2o1*cxz))/(c54o1*o));
- x_TE = c1o4*eps_new*(-((c2o1*axx + c3o1*axz - c2o1*bxy + c6o1*cxx + cxz))/(c54o1*o));
- x_BE = c1o4*eps_new*(-((c2o1*axx - c3o1*axz - c2o1*bxy - c6o1*cxx + cxz))/(c54o1*o));
- x_TN = c1o4*eps_new*(-((-c4o1*axx + bxy + c3o1*bxz + c3o1*cxy + cxz))/(c54o1*o));
- x_BN = c1o4*eps_new*(-((-c4o1*axx + bxy - c3o1*bxz - c3o1*cxy + cxz))/(c54o1*o));
- x_ZERO = c0o1;
- x_TNE = c1o4*eps_new*(-((axy + axz + c2o1*bxx + bxz + c2o1*cxx + cxy))/(c72o1*o));
- x_TSW = c1o4*eps_new*(((-axy + axz - c2o1*bxx + bxz + c2o1*cxx + cxy))/(c72o1*o));
- x_TSE = c1o4*eps_new*(((axy - axz + c2o1*bxx + bxz - c2o1*cxx + cxy))/(c72o1*o));
- x_TNW = c1o4*eps_new*(((axy + axz + c2o1*bxx - bxz + c2o1*cxx - cxy))/(c72o1*o));
-
- y_E = c1o4*eps_new*(c2o1*(-c2o1*axy + c2o1*byy + cyz))/(c27o1*o);
- y_N = c1o4*eps_new*(c2o1*(axy - c4o1*byy + cyz))/(c27o1*o);
- y_T = c1o4*eps_new*(c2o1*(axy + c2o1*byy - c2o1*cyz))/(c27o1*o);
- y_NE = c1o4*eps_new*(-((axy + c6o1*ayy + c3o1*bxy + c2o1*byy - c2o1*cyz))/(c54o1*o));
- y_SE = c1o4*eps_new*(-((axy - c6o1*ayy - c3o1*bxy + c2o1*byy - c2o1*cyz))/(c54o1*o));
- y_TE = c1o4*eps_new*(-((axy + c3o1*ayz - c4o1*byy + c3o1*cxy + cyz))/(c54o1*o));
- y_BE = c1o4*eps_new*(-((axy - c3o1*ayz - c4o1*byy - c3o1*cxy + cyz))/(c54o1*o));
- y_TN = c1o4*eps_new*(-((-c2o1*axy + c2o1*byy + c3o1*byz + c6o1*cyy + cyz))/(c54o1*o));
- y_BN = c1o4*eps_new*(-((-c2o1*axy + c2o1*byy - c3o1*byz - c6o1*cyy + cyz))/(c54o1*o));
- y_ZERO = c0o1;
- y_TNE = c1o4*eps_new*(-((c2o1*ayy + ayz + bxy + byz + cxy + c2o1*cyy))/(c72o1*o));
- y_TSW = c1o4*eps_new*(((-c2o1*ayy + ayz - bxy + byz + cxy + c2o1*cyy))/(c72o1*o));
- y_TSE = c1o4*eps_new*(((c2o1*ayy - ayz + bxy + byz - cxy + c2o1*cyy))/(c72o1*o));
- y_TNW = c1o4*eps_new*(((c2o1*ayy + ayz + bxy - byz + cxy - c2o1*cyy))/(c72o1*o));
-
- z_E = c1o4*eps_new*((c2o1*(-c2o1*axz + byz + c2o1*czz))/(c27o1*o));
- z_N = c1o4*eps_new*((c2o1*(axz - c2o1*byz + c2o1*czz))/(c27o1*o));
- z_T = c1o4*eps_new*((c2o1*(axz + byz - c4o1*czz))/(c27o1*o));
- z_NE = c1o4*eps_new*(-((axz + c3o1*ayz + c3o1*bxz + byz - c4o1*czz))/(c54o1*o));
- z_SE = c1o4*eps_new*(-((axz - c3o1*ayz - c3o1*bxz + byz - c4o1*czz))/(c54o1*o));
- z_TE = c1o4*eps_new*(-((axz + c6o1*azz - c2o1*byz + c3o1*cxz + c2o1*czz))/(c54o1*o));
- z_BE = c1o4*eps_new*(-((axz - c6o1*azz - c2o1*byz - c3o1*cxz + c2o1*czz))/(c54o1*o));
- z_TN = c1o4*eps_new*(-((-c2o1*axz + byz + c6o1*bzz + c3o1*cyz + c2o1*czz))/(c54o1*o));
- z_BN = c1o4*eps_new*(-((-c2o1*axz + byz - c6o1*bzz - c3o1*cyz + c2o1*czz))/(c54o1*o));
- z_ZERO = c0o1;
- z_TNE = c1o4*eps_new*(-((ayz + c2o1*azz + bxz + c2o1*bzz + cxz + cyz))/(c72o1*o));
- z_TSW = c1o4*eps_new*(((-ayz + c2o1*azz - bxz + c2o1*bzz + cxz + cyz))/(c72o1*o));
- z_TSE = c1o4*eps_new*(((ayz - c2o1*azz + bxz + c2o1*bzz - cxz + cyz))/(c72o1*o));
- z_TNW = c1o4*eps_new*(((ayz + c2o1*azz + bxz - c2o1*bzz + cxz - cyz))/(c72o1*o));
-
- xy_E = c1o16*eps_new *(( c2o1*cxyz)/(c27o1*o));
- xy_N = c1o16*eps_new *(( c2o1*cxyz)/(c27o1*o));
- xy_T = -(c1o16*eps_new *(( c4o1*cxyz)/(c27o1*o)));
- xy_NE = c1o16*eps_new *( cxyz /(c27o1*o));
- xy_SE = c1o16*eps_new *( cxyz /(c27o1*o));
- xy_TE = -(c1o16*eps_new *(( c3o1*axyz + cxyz)/(c54o1*o)));
- xy_BE = -(c1o16*eps_new *((-c3o1*axyz + cxyz)/(c54o1*o)));
- xy_TN = -(c1o16*eps_new *(( c3o1*bxyz + cxyz)/(c54o1*o)));
- xy_BN = -(c1o16*eps_new *(( - c3o1*bxyz + cxyz)/(c54o1*o)));
- //xy_ZERO= c1o16*eps_new;
- xy_TNE = -(c1o16*eps_new *(( axyz + bxyz )/(c72o1*o)));
- xy_TSW = c1o16*eps_new *(( axyz + bxyz )/(c72o1*o));
- xy_TSE = c1o16*eps_new *((- axyz + bxyz )/(c72o1*o));
- xy_TNW = c1o16*eps_new *(( axyz - bxyz )/(c72o1*o));
-
- xz_E = c1o16*eps_new *(( c2o1*bxyz )/(c27o1*o));
- xz_N = -(c1o16*eps_new *(( c4o1*bxyz )/(c27o1*o)));
- xz_T = c1o16*eps_new *(( c2o1*bxyz )/(c27o1*o));
- xz_NE = -(c1o16*eps_new *(( c3o1*axyz + bxyz )/(c54o1*o)));
- xz_SE = -(c1o16*eps_new *((-c3o1*axyz + bxyz )/(c54o1*o)));
- xz_TE = c1o16*eps_new *(( bxyz )/(c27o1*o));
- xz_BE = c1o16*eps_new *(( bxyz )/(c27o1*o));
- xz_TN = -(c1o16*eps_new *(( bxyz + c3o1*cxyz)/(c54o1*o)));
- xz_BN = -(c1o16*eps_new *(( bxyz - c3o1*cxyz)/(c54o1*o)));
- //xz_ZERO= c1o16*eps_new;
- xz_TNE = -(c1o16*eps_new *(( axyz + cxyz)/(c72o1*o)));
- xz_TSW = c1o16*eps_new *((- axyz + cxyz)/(c72o1*o));
- xz_TSE = c1o16*eps_new *(( axyz + cxyz)/(c72o1*o));
- xz_TNW = c1o16*eps_new *(( axyz - cxyz)/(c72o1*o));
-
- yz_E = -(c1o16*eps_new *(( c4o1*axyz )/(c27o1*o)));
- yz_N = c1o16*eps_new *(( c2o1*axyz )/(c27o1*o));
- yz_T = c1o16*eps_new *(( c2o1*axyz )/(c27o1*o));
- yz_NE = -(c1o16*eps_new *(( axyz + c3o1*bxyz )/(c54o1*o)));
- yz_SE = -(c1o16*eps_new *(( axyz - c3o1*bxyz )/(c54o1*o)));
- yz_TE = -(c1o16*eps_new *(( axyz + c3o1*cxyz)/(c54o1*o)));
- yz_BE = -(c1o16*eps_new *(( axyz - c3o1*cxyz)/(c54o1*o)));
- yz_TN = c1o16*eps_new *(( axyz )/(c27o1*o));
- yz_BN = c1o16*eps_new *(( axyz )/(c27o1*o));
- //yz_ZERO= c1o16*eps_new;
- yz_TNE = -(c1o16*eps_new *(( bxyz + cxyz)/(c72o1*o)));
- yz_TSW = c1o16*eps_new *(( - bxyz + cxyz)/(c72o1*o));
- yz_TSE = c1o16*eps_new *(( bxyz - cxyz)/(c72o1*o));
- yz_TNW = c1o16*eps_new *(( bxyz + cxyz)/(c72o1*o));
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedNodeCF(real* f, real omega, real x, real y, real z, real press, real xs, real ys, real zs)
-{
- using namespace D3Q27System;
- using namespace vf::lbm::dir;
- using namespace vf::basics::constant;
-
- real eps_new = c1o2;
- real o = omega;
- //bulk viscosity
- real oP = OxxPyyPzzF;
-
-// LBMReal rho = press ;//+ (c2o1*axx*x+axy*y+axz*z+axyz*y*z+ax + c2o1*byy*y+bxy*x+byz*z+bxyz*x*z+by + c2o1*czz*z+cxz*x+cyz*y+cxyz*x*y+cz)/c3o1;
- real vx1 = a0 + c1o4*( xs*ax + ys*ay + zs*az) + c1o16*(axx + xs*ys*axy + xs*zs*axz + ayy + ys*zs*ayz + azz) + c1o64*(xs*ys*zs*axyz);
- real vx2 = b0 + c1o4*( xs*bx + ys*by + zs*bz) + c1o16*(bxx + xs*ys*bxy + xs*zs*bxz + byy + ys*zs*byz + bzz) + c1o64*(xs*ys*zs*bxyz);
- real vx3 = c0 + c1o4*( xs*cx + ys*cy + zs*cz) + c1o16*(cxx + xs*ys*cxy + xs*zs*cxz + cyy + ys*zs*cyz + czz) + c1o64*(xs*ys*zs*cxyz);
-
- real mfcbb = c0o1;
- real mfabb = c0o1;
- real mfbcb = c0o1;
- real mfbab = c0o1;
- real mfbbc = c0o1;
- real mfbba = c0o1;
- real mfccb = c0o1;
- real mfaab = c0o1;
- real mfcab = c0o1;
- real mfacb = c0o1;
- real mfcbc = c0o1;
- real mfaba = c0o1;
- real mfcba = c0o1;
- real mfabc = c0o1;
- real mfbcc = c0o1;
- real mfbaa = c0o1;
- real mfbca = c0o1;
- real mfbac = c0o1;
- real mfbbb = c0o1;
- real mfccc = c0o1;
- real mfaac = c0o1;
- real mfcac = c0o1;
- real mfacc = c0o1;
- real mfcca = c0o1;
- real mfaaa = c0o1;
- real mfcaa = c0o1;
- real mfaca = c0o1;
-
- mfaaa = press; // if drho is interpolated directly
-
- real vx1Sq = vx1*vx1;
- real vx2Sq = vx2*vx2;
- real vx3Sq = vx3*vx3;
- real oMdrho = c1o1;
-
- //c2o1f
-
- // linear combinations
- real mxxPyyPzz = mfaaa - c2o3*(ax + by + c2o1 *axx*x + bxy*x + axy*y + c2o1 *byy*y + axz*z + byz*z + bxyz*x*z + axyz*y*z + cz - cxz*x + cyz*y + cxyz*x*y + c2o1 *czz*z)*eps_new / oP* (c1o1 + press);
- real mxxMyy = -c2o3*(ax - by + kxxMyyAverage + c2o1 *axx*x - bxy*x + axy*y - c2o1 *byy*y + axz*z - byz*z - bxyz*x*z + axyz*y*z)*eps_new/o * (c1o1 + press);
- real mxxMzz = -c2o3*(ax - cz + kxxMzzAverage + c2o1 *axx*x - cxz*x + axy*y - cyz*y - cxyz*x*y + axz*z - c2o1 *czz*z + axyz*y*z)*eps_new/o * (c1o1 + press);
-
- mfabb = -c1o3 * (bz + cy + kyzAverage + bxz*x + cxy*x + byz*y + c2o1 *cyy*y + bxyz*x*y + c2o1 *bzz*z + cyz*z + cxyz*x*z)*eps_new/o * (c1o1 + press);
- mfbab = -c1o3 * (az + cx + kxzAverage + axz*x + c2o1 *cxx*x + ayz*y + cxy*y + axyz*x*y + c2o1 *azz*z + cxz*z + cxyz*y*z)*eps_new/o * (c1o1 + press);
- mfbba = -c1o3 * (ay + bx + kxyAverage + axy*x + c2o1 *bxx*x + c2o1 *ayy*y + bxy*y + ayz*z + bxz*z + axyz*x*z + bxyz*y*z)*eps_new/o * (c1o1 + press);
-
- // linear combinations back
- mfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz) ;
- mfaca = c1o3 * (-c2o1 * mxxMyy + mxxMzz + mxxPyyPzz) ;
- mfaac = c1o3 * (mxxMyy - c2o1 * mxxMzz + mxxPyyPzz) ;
-
- //three
- mfbbb = c0o1;
- real mxxyPyzz = c0o1;
- real mxxyMyzz = c0o1;
- real mxxzPyyz = c0o1;
- real mxxzMyyz = c0o1;
- real mxyyPxzz = c0o1;
- real mxyyMxzz = c0o1;
-
- // linear combinations back
- mfcba = (mxxyMyzz + mxxyPyzz) * c1o2;
- mfabc = (-mxxyMyzz + mxxyPyzz) * c1o2;
- mfcab = (mxxzMyyz + mxxzPyyz) * c1o2;
- mfacb = (-mxxzMyyz + mxxzPyyz) * c1o2;
- mfbca = (mxyyMxzz + mxyyPxzz) * c1o2;
- mfbac = (-mxyyMxzz + mxyyPxzz) * c1o2;
-
- //4.f
- mfacc = mfaaa*c1o9;
- mfcac = mfacc;
- mfcca = mfacc;
-
- //5.
-
- //6.
-
- mfccc = mfaaa*c1o27;
- ////////////////////////////////////////////////////////////////////////////////////
- //back
- ////////////////////////////////////////////////////////////////////////////////////
- //mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
- ////////////////////////////////////////////////////////////////////////////////////
- // Z - Dir
- real m0 = mfaac * c1o2 + mfaab * (vx3 - c1o2) + (mfaaa + c1o1 * oMdrho) * (vx3Sq - vx3) * c1o2;
- real m1 = -mfaac - c2o1 * mfaab * vx3 + mfaaa * (c1o1 - vx3Sq) - c1o1 * oMdrho * vx3Sq;
- real m2 = mfaac * c1o2 + mfaab * (vx3 + c1o2) + (mfaaa + c1o1 * oMdrho) * (vx3Sq + vx3) * c1o2;
- mfaaa = m0;
- mfaab = m1;
- mfaac = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfabc * c1o2 + mfabb * (vx3 - c1o2) + mfaba * (vx3Sq - vx3) * c1o2;
- m1 = -mfabc - c2o1 * mfabb * vx3 + mfaba * (c1o1 - vx3Sq);
- m2 = mfabc * c1o2 + mfabb * (vx3 + c1o2) + mfaba * (vx3Sq + vx3) * c1o2;
- mfaba = m0;
- mfabb = m1;
- mfabc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfacc * c1o2 + mfacb * (vx3 - c1o2) + (mfaca + c1o3 * oMdrho) * (vx3Sq - vx3) * c1o2;
- m1 = -mfacc - c2o1 * mfacb * vx3 + mfaca * (c1o1 - vx3Sq) - c1o3 * oMdrho * vx3Sq;
- m2 = mfacc * c1o2 + mfacb * (vx3 + c1o2) + (mfaca + c1o3 * oMdrho) * (vx3Sq + vx3) * c1o2;
- mfaca = m0;
- mfacb = m1;
- mfacc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfbac * c1o2 + mfbab * (vx3 - c1o2) + mfbaa * (vx3Sq - vx3) * c1o2;
- m1 = -mfbac - c2o1 * mfbab * vx3 + mfbaa * (c1o1 - vx3Sq);
- m2 = mfbac * c1o2 + mfbab * (vx3 + c1o2) + mfbaa * (vx3Sq + vx3) * c1o2;
- mfbaa = m0;
- mfbab = m1;
- mfbac = m2;
- /////////b//////////////////////////////////////////////////////////////////////////
- m0 = mfbbc * c1o2 + mfbbb * (vx3 - c1o2) + mfbba * (vx3Sq - vx3) * c1o2;
- m1 = -mfbbc - c2o1 * mfbbb * vx3 + mfbba * (c1o1 - vx3Sq);
- m2 = mfbbc * c1o2 + mfbbb * (vx3 + c1o2) + mfbba * (vx3Sq + vx3) * c1o2;
- mfbba = m0;
- mfbbb = m1;
- mfbbc = m2;
- /////////b//////////////////////////////////////////////////////////////////////////
- m0 = mfbcc * c1o2 + mfbcb * (vx3 - c1o2) + mfbca * (vx3Sq - vx3) * c1o2;
- m1 = -mfbcc - c2o1 * mfbcb * vx3 + mfbca * (c1o1 - vx3Sq);
- m2 = mfbcc * c1o2 + mfbcb * (vx3 + c1o2) + mfbca * (vx3Sq + vx3) * c1o2;
- mfbca = m0;
- mfbcb = m1;
- mfbcc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcac * c1o2 + mfcab * (vx3 - c1o2) + (mfcaa + c1o3 * oMdrho) * (vx3Sq - vx3) * c1o2;
- m1 = -mfcac - c2o1 * mfcab * vx3 + mfcaa * (c1o1 - vx3Sq) - c1o3 * oMdrho * vx3Sq;
- m2 = mfcac * c1o2 + mfcab * (vx3 + c1o2) + (mfcaa + c1o3 * oMdrho) * (vx3Sq + vx3) * c1o2;
- mfcaa = m0;
- mfcab = m1;
- mfcac = m2;
- /////////c//////////////////////////////////////////////////////////////////////////
- m0 = mfcbc * c1o2 + mfcbb * (vx3 - c1o2) + mfcba * (vx3Sq - vx3) * c1o2;
- m1 = -mfcbc - c2o1 * mfcbb * vx3 + mfcba * (c1o1 - vx3Sq);
- m2 = mfcbc * c1o2 + mfcbb * (vx3 + c1o2) + mfcba * (vx3Sq + vx3) * c1o2;
- mfcba = m0;
- mfcbb = m1;
- mfcbc = m2;
- /////////c//////////////////////////////////////////////////////////////////////////
- m0 = mfccc * c1o2 + mfccb * (vx3 - c1o2) + (mfcca + c1o9 * oMdrho) * (vx3Sq - vx3) * c1o2;
- m1 = -mfccc - c2o1 * mfccb * vx3 + mfcca * (c1o1 - vx3Sq) - c1o9 * oMdrho * vx3Sq;
- m2 = mfccc * c1o2 + mfccb * (vx3 + c1o2) + (mfcca + c1o9 * oMdrho) * (vx3Sq + vx3) * c1o2;
- mfcca = m0;
- mfccb = m1;
- mfccc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- //mit 1/6, 2/3, 1/6, 0, 0, 0, 1/18, 2/9, 1/18 Konditionieren
- ////////////////////////////////////////////////////////////////////////////////////
- // Y - Dir
- m0 = mfaca * c1o2 + mfaba * (vx2 - c1o2) + (mfaaa + c1o6 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfaca - c2o1 * mfaba * vx2 + mfaaa * (c1o1 - vx2Sq) - c1o6 * oMdrho * vx2Sq;
- m2 = mfaca * c1o2 + mfaba * (vx2 + c1o2) + (mfaaa + c1o6 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfaaa = m0;
- mfaba = m1;
- mfaca = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfacb * c1o2 + mfabb * (vx2 - c1o2) + (mfaab + c2o3 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfacb - c2o1 * mfabb * vx2 + mfaab * (c1o1 - vx2Sq) - c2o3 * oMdrho * vx2Sq;
- m2 = mfacb * c1o2 + mfabb * (vx2 + c1o2) + (mfaab + c2o3 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfaab = m0;
- mfabb = m1;
- mfacb = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfacc * c1o2 + mfabc * (vx2 - c1o2) + (mfaac + c1o6 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfacc - c2o1 * mfabc * vx2 + mfaac * (c1o1 - vx2Sq) - c1o6 * oMdrho * vx2Sq;
- m2 = mfacc * c1o2 + mfabc * (vx2 + c1o2) + (mfaac + c1o6 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfaac = m0;
- mfabc = m1;
- mfacc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfbca * c1o2 + mfbba * (vx2 - c1o2) + mfbaa * (vx2Sq - vx2) * c1o2;
- m1 = -mfbca - c2o1 * mfbba * vx2 + mfbaa * (c1o1 - vx2Sq);
- m2 = mfbca * c1o2 + mfbba * (vx2 + c1o2) + mfbaa * (vx2Sq + vx2) * c1o2;
- mfbaa = m0;
- mfbba = m1;
- mfbca = m2;
- /////////b//////////////////////////////////////////////////////////////////////////
- m0 = mfbcb * c1o2 + mfbbb * (vx2 - c1o2) + mfbab * (vx2Sq - vx2) * c1o2;
- m1 = -mfbcb - c2o1 * mfbbb * vx2 + mfbab * (c1o1 - vx2Sq);
- m2 = mfbcb * c1o2 + mfbbb * (vx2 + c1o2) + mfbab * (vx2Sq + vx2) * c1o2;
- mfbab = m0;
- mfbbb = m1;
- mfbcb = m2;
- /////////b//////////////////////////////////////////////////////////////////////////
- m0 = mfbcc * c1o2 + mfbbc * (vx2 - c1o2) + mfbac * (vx2Sq - vx2) * c1o2;
- m1 = -mfbcc - c2o1 * mfbbc * vx2 + mfbac * (c1o1 - vx2Sq);
- m2 = mfbcc * c1o2 + mfbbc * (vx2 + c1o2) + mfbac * (vx2Sq + vx2) * c1o2;
- mfbac = m0;
- mfbbc = m1;
- mfbcc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcca * c1o2 + mfcba * (vx2 - c1o2) + (mfcaa + c1o18 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfcca - c2o1 * mfcba * vx2 + mfcaa * (c1o1 - vx2Sq) - c1o18 * oMdrho * vx2Sq;
- m2 = mfcca * c1o2 + mfcba * (vx2 + c1o2) + (mfcaa + c1o18 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfcaa = m0;
- mfcba = m1;
- mfcca = m2;
- /////////c//////////////////////////////////////////////////////////////////////////
- m0 = mfccb * c1o2 + mfcbb * (vx2 - c1o2) + (mfcab + c2o9 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfccb - c2o1 * mfcbb * vx2 + mfcab * (c1o1 - vx2Sq) - c2o9 * oMdrho * vx2Sq;
- m2 = mfccb * c1o2 + mfcbb * (vx2 + c1o2) + (mfcab + c2o9 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfcab = m0;
- mfcbb = m1;
- mfccb = m2;
- /////////c//////////////////////////////////////////////////////////////////////////
- m0 = mfccc * c1o2 + mfcbc * (vx2 - c1o2) + (mfcac + c1o18 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfccc - c2o1 * mfcbc * vx2 + mfcac * (c1o1 - vx2Sq) - c1o18 * oMdrho * vx2Sq;
- m2 = mfccc * c1o2 + mfcbc * (vx2 + c1o2) + (mfcac + c1o18 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfcac = m0;
- mfcbc = m1;
- mfccc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- //mit 1/36, 1/9, 1/36, 1/9, 4/9, 1/9, 1/36, 1/9, 1/36 Konditionieren
- ////////////////////////////////////////////////////////////////////////////////////
- // X - Dir
- m0 = mfcaa * c1o2 + mfbaa * (vx1 - c1o2) + (mfaaa + c1o36 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcaa - c2o1 * mfbaa * vx1 + mfaaa * (c1o1 - vx1Sq) - c1o36 * oMdrho * vx1Sq;
- m2 = mfcaa * c1o2 + mfbaa * (vx1 + c1o2) + (mfaaa + c1o36 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaaa = m0;
- mfbaa = m1;
- mfcaa = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcba * c1o2 + mfbba * (vx1 - c1o2) + (mfaba + c1o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcba - c2o1 * mfbba * vx1 + mfaba * (c1o1 - vx1Sq) - c1o9 * oMdrho * vx1Sq;
- m2 = mfcba * c1o2 + mfbba * (vx1 + c1o2) + (mfaba + c1o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaba = m0;
- mfbba = m1;
- mfcba = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcca * c1o2 + mfbca * (vx1 - c1o2) + (mfaca + c1o36 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcca - c2o1 * mfbca * vx1 + mfaca * (c1o1 - vx1Sq) - c1o36 * oMdrho * vx1Sq;
- m2 = mfcca * c1o2 + mfbca * (vx1 + c1o2) + (mfaca + c1o36 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaca = m0;
- mfbca = m1;
- mfcca = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcab * c1o2 + mfbab * (vx1 - c1o2) + (mfaab + c1o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcab - c2o1 * mfbab * vx1 + mfaab * (c1o1 - vx1Sq) - c1o9 * oMdrho * vx1Sq;
- m2 = mfcab * c1o2 + mfbab * (vx1 + c1o2) + (mfaab + c1o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaab = m0;
- mfbab = m1;
- mfcab = m2;
- ///////////b////////////////////////////////////////////////////////////////////////
- m0 = mfcbb * c1o2 + mfbbb * (vx1 - c1o2) + (mfabb + c4o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcbb - c2o1 * mfbbb * vx1 + mfabb * (c1o1 - vx1Sq) - c4o9 * oMdrho * vx1Sq;
- m2 = mfcbb * c1o2 + mfbbb * (vx1 + c1o2) + (mfabb + c4o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfabb = m0;
- mfbbb = m1;
- mfcbb = m2;
- ///////////b////////////////////////////////////////////////////////////////////////
- m0 = mfccb * c1o2 + mfbcb * (vx1 - c1o2) + (mfacb + c1o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfccb - c2o1 * mfbcb * vx1 + mfacb * (c1o1 - vx1Sq) - c1o9 * oMdrho * vx1Sq;
- m2 = mfccb * c1o2 + mfbcb * (vx1 + c1o2) + (mfacb + c1o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfacb = m0;
- mfbcb = m1;
- mfccb = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcac * c1o2 + mfbac * (vx1 - c1o2) + (mfaac + c1o36 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcac - c2o1 * mfbac * vx1 + mfaac * (c1o1 - vx1Sq) - c1o36 * oMdrho * vx1Sq;
- m2 = mfcac * c1o2 + mfbac * (vx1 + c1o2) + (mfaac + c1o36 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaac = m0;
- mfbac = m1;
- mfcac = m2;
- ///////////c////////////////////////////////////////////////////////////////////////
- m0 = mfcbc * c1o2 + mfbbc * (vx1 - c1o2) + (mfabc + c1o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcbc - c2o1 * mfbbc * vx1 + mfabc * (c1o1 - vx1Sq) - c1o9 * oMdrho * vx1Sq;
- m2 = mfcbc * c1o2 + mfbbc * (vx1 + c1o2) + (mfabc + c1o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfabc = m0;
- mfbbc = m1;
- mfcbc = m2;
- ///////////c////////////////////////////////////////////////////////////////////////
- m0 = mfccc * c1o2 + mfbcc * (vx1 - c1o2) + (mfacc + c1o36 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfccc - c2o1 * mfbcc * vx1 + mfacc * (c1o1 - vx1Sq) - c1o36 * oMdrho * vx1Sq;
- m2 = mfccc * c1o2 + mfbcc * (vx1 + c1o2) + (mfacc + c1o36 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfacc = m0;
- mfbcc = m1;
- mfccc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
-
- f[DIR_P00] = mfcbb;
- f[DIR_M00] = mfabb;
- f[DIR_0P0] = mfbcb;
- f[DIR_0M0] = mfbab;
- f[DIR_00P] = mfbbc;
- f[DIR_00M] = mfbba;
- f[DIR_PP0] = mfccb;
- f[DIR_MM0] = mfaab;
- f[DIR_PM0] = mfcab;
- f[DIR_MP0] = mfacb;
- f[DIR_P0P] = mfcbc;
- f[DIR_M0M] = mfaba;
- f[DIR_P0M] = mfcba;
- f[DIR_M0P] = mfabc;
- f[DIR_0PP] = mfbcc;
- f[DIR_0MM] = mfbaa;
- f[DIR_0PM] = mfbca;
- f[DIR_0MP] = mfbac;
- f[DIR_000] = mfbbb;
- f[DIR_PPP] = mfccc;
- f[DIR_PMP] = mfcac;
- f[DIR_PPM] = mfcca;
- f[DIR_PMM] = mfcaa;
- f[DIR_MPP] = mfacc;
- f[DIR_MMP] = mfaac;
- f[DIR_MPM] = mfaca;
- f[DIR_MMM] = mfaaa;
-}
-//////////////////////////////////////////////////////////////////////////
-//Position SWB -0.25, -0.25, -0.25
-real CompressibleOffsetMomentsInterpolationProcessor::calcPressBSW()
-{
- return press_SWT * (c9o64 + c3o16 * xoff + c3o16 * yoff - c9o16 * zoff) +
- press_NWT * (c3o64 + c1o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
- press_SET * (c3o64 - c3o16 * xoff + c1o16 * yoff - c3o16 * zoff) +
- press_NET * (c1o64 - c1o16 * xoff - c1o16 * yoff - c1o16 * zoff) +
- press_NEB * (c3o64 - c3o16 * xoff - c3o16 * yoff + c1o16 * zoff) +
- press_NWB * (c9o64 + c3o16 * xoff - c9o16 * yoff + c3o16 * zoff) +
- press_SEB * (c9o64 - c9o16 * xoff + c3o16 * yoff + c3o16 * zoff) +
- press_SWB * (c27o64 + c9o16 * xoff + c9o16 * yoff + c9o16 * zoff);
-}
-//////////////////////////////////////////////////////////////////////////
-//Position SWT -0.25, -0.25, 0.25
-real CompressibleOffsetMomentsInterpolationProcessor::calcPressTSW()
-{
- return press_SWT * (c27o64 + c9o16 * xoff + c9o16 * yoff - c9o16 * zoff) +
- press_NWT * (c9o64 + c3o16 * xoff - c9o16 * yoff - c3o16 * zoff) +
- press_SET * (c9o64 - c9o16 * xoff + c3o16 * yoff - c3o16 * zoff) +
- press_NET * (c3o64 - c3o16 * xoff - c3o16 * yoff - c1o16 * zoff) +
- press_NEB * (c1o64 - c1o16 * xoff - c1o16 * yoff + c1o16 * zoff) +
- press_NWB * (c3o64 + c1o16 * xoff - c3o16 * yoff + c3o16 * zoff) +
- press_SEB * (c3o64 - c3o16 * xoff + c1o16 * yoff + c3o16 * zoff) +
- press_SWB * (c9o64 + c3o16 * xoff + c3o16 * yoff + c9o16 * zoff);
-}
-//////////////////////////////////////////////////////////////////////////
-//Position SET 0.25, -0.25, 0.25
-real CompressibleOffsetMomentsInterpolationProcessor::calcPressTSE()
-{
- return press_SET * (c27o64 - c9o16 * xoff + c9o16 * yoff - c9o16 * zoff) +
- press_NET * (c9o64 - c3o16 * xoff - c9o16 * yoff - c3o16 * zoff) +
- press_SWT * (c9o64 + c9o16 * xoff + c3o16 * yoff - c3o16 * zoff) +
- press_NWT * (c3o64 + c3o16 * xoff - c3o16 * yoff - c1o16 * zoff) +
- press_NWB * (c1o64 + c1o16 * xoff - c1o16 * yoff + c1o16 * zoff) +
- press_NEB * (c3o64 - c1o16 * xoff - c3o16 * yoff + c3o16 * zoff) +
- press_SWB * (c3o64 + c3o16 * xoff + c1o16 * yoff + c3o16 * zoff) +
- press_SEB * (c9o64 - c3o16 * xoff + c3o16 * yoff + c9o16 * zoff);
-}
-//////////////////////////////////////////////////////////////////////////
-//Position SEB 0.25, -0.25, -0.25
-real CompressibleOffsetMomentsInterpolationProcessor::calcPressBSE()
-{
- return press_SET * (c9o64 - c3o16 * xoff + c3o16 * yoff - c9o16 * zoff) +
- press_NET * (c3o64 - c1o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
- press_SWT * (c3o64 + c3o16 * xoff + c1o16 * yoff - c3o16 * zoff) +
- press_NWT * (c1o64 + c1o16 * xoff - c1o16 * yoff - c1o16 * zoff) +
- press_NWB * (c3o64 + c3o16 * xoff - c3o16 * yoff + c1o16 * zoff) +
- press_NEB * (c9o64 - c3o16 * xoff - c9o16 * yoff + c3o16 * zoff) +
- press_SWB * (c9o64 + c9o16 * xoff + c3o16 * yoff + c3o16 * zoff) +
- press_SEB * (c27o64 - c9o16 * xoff + c9o16 * yoff + c9o16 * zoff);
-}
-//////////////////////////////////////////////////////////////////////////
-//Position NWB -0.25, 0.25, -0.25
-real CompressibleOffsetMomentsInterpolationProcessor::calcPressBNW()
-{
- return press_NWT * (c9o64 + c3o16 * xoff - c3o16 * yoff - c9o16 * zoff) +
- press_NET * (c3o64 - c3o16 * xoff - c1o16 * yoff - c3o16 * zoff) +
- press_SWT * (c3o64 + c1o16 * xoff + c3o16 * yoff - c3o16 * zoff) +
- press_SET * (c1o64 - c1o16 * xoff + c1o16 * yoff - c1o16 * zoff) +
- press_SEB * (c3o64 - c3o16 * xoff + c3o16 * yoff + c1o16 * zoff) +
- press_NEB * (c9o64 - c9o16 * xoff - c3o16 * yoff + c3o16 * zoff) +
- press_SWB * (c9o64 + c3o16 * xoff + c9o16 * yoff + c3o16 * zoff) +
- press_NWB * (c27o64 + c9o16 * xoff - c9o16 * yoff + c9o16 * zoff);
-}
-//////////////////////////////////////////////////////////////////////////
-//Position NWT -0.25, 0.25, 0.25
-real CompressibleOffsetMomentsInterpolationProcessor::calcPressTNW()
-{
- return press_NWT * (c27o64 + c9o16 * xoff - c9o16 * yoff - c9o16 * zoff) +
- press_NET * (c9o64 - c9o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
- press_SWT * (c9o64 + c3o16 * xoff + c9o16 * yoff - c3o16 * zoff) +
- press_SET * (c3o64 - c3o16 * xoff + c3o16 * yoff - c1o16 * zoff) +
- press_SEB * (c1o64 - c1o16 * xoff + c1o16 * yoff + c1o16 * zoff) +
- press_NEB * (c3o64 - c3o16 * xoff - c1o16 * yoff + c3o16 * zoff) +
- press_SWB * (c3o64 + c1o16 * xoff + c3o16 * yoff + c3o16 * zoff) +
- press_NWB * (c9o64 + c3o16 * xoff - c3o16 * yoff + c9o16 * zoff);
-}
-//////////////////////////////////////////////////////////////////////////
-//Position NET 0.25, 0.25, 0.25
-real CompressibleOffsetMomentsInterpolationProcessor::calcPressTNE()
-{
- return press_NET * (c27o64 - c9o16 * xoff - c9o16 * yoff - c9o16 * zoff) +
- press_NWT * (c9o64 + c9o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
- press_SET * (c9o64 - c3o16 * xoff + c9o16 * yoff - c3o16 * zoff) +
- press_SWT * (c3o64 + c3o16 * xoff + c3o16 * yoff - c1o16 * zoff) +
- press_SWB * (c1o64 + c1o16 * xoff + c1o16 * yoff + c1o16 * zoff) +
- press_NWB * (c3o64 + c3o16 * xoff - c1o16 * yoff + c3o16 * zoff) +
- press_SEB * (c3o64 - c1o16 * xoff + c3o16 * yoff + c3o16 * zoff) +
- press_NEB * (c9o64 - c3o16 * xoff - c3o16 * yoff + c9o16 * zoff);
-}
-//////////////////////////////////////////////////////////////////////////
-//Position NEB 0.25, 0.25, -0.25
-real CompressibleOffsetMomentsInterpolationProcessor::calcPressBNE()
-{
- return press_NET * (c9o64 - c3o16 * xoff - c3o16 * yoff - c9o16 * zoff) +
- press_NWT * (c3o64 + c3o16 * xoff - c1o16 * yoff - c3o16 * zoff) +
- press_SET * (c3o64 - c1o16 * xoff + c3o16 * yoff - c3o16 * zoff) +
- press_SWT * (c1o64 + c1o16 * xoff + c1o16 * yoff - c1o16 * zoff) +
- press_SWB * (c3o64 + c3o16 * xoff + c3o16 * yoff + c1o16 * zoff) +
- press_NWB * (c9o64 + c9o16 * xoff - c3o16 * yoff + c3o16 * zoff) +
- press_SEB * (c9o64 - c3o16 * xoff + c9o16 * yoff + c3o16 * zoff) +
- press_NEB * (c27o64 - c9o16 * xoff - c9o16 * yoff + c9o16 * zoff);
-}
-//////////////////////////////////////////////////////////////////////////
-//Position C 0.0, 0.0, 0.0
-void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedNodeFC(real* f, real omega)
-{
- using namespace D3Q27System;
- using namespace vf::lbm::dir;
-
- real press = press_NET * (c4o32 - c1o4 * xoff - c1o4 * yoff - c1o4 * zoff) +
- press_NWT * (c4o32 + c1o4 * xoff - c1o4 * yoff - c1o4 * zoff) +
- press_SET * (c4o32 - c1o4 * xoff + c1o4 * yoff - c1o4 * zoff) +
- press_SWT * (c4o32 + c1o4 * xoff + c1o4 * yoff - c1o4 * zoff) +
- press_NEB * (c4o32 - c1o4 * xoff - c1o4 * yoff + c1o4 * zoff) +
- press_NWB * (c4o32 + c1o4 * xoff - c1o4 * yoff + c1o4 * zoff) +
- press_SEB * (c4o32 - c1o4 * xoff + c1o4 * yoff + c1o4 * zoff) +
- press_SWB * (c4o32 + c1o4 * xoff + c1o4 * yoff + c1o4 * zoff);
- real vx1 = a0;
- real vx2 = b0;
- real vx3 = c0;
-
-// LBMReal rho = press ;//+ (ax+by+cz)/c3o1;
-
- real eps_new = c2o1;
- real o = omega;
- //bulk viscosity
- real oP = OxxPyyPzzC;
-
- real mfcbb = c0o1;
- real mfabb = c0o1;
- real mfbcb = c0o1;
- real mfbab = c0o1;
- real mfbbc = c0o1;
- real mfbba = c0o1;
- real mfccb = c0o1;
- real mfaab = c0o1;
- real mfcab = c0o1;
- real mfacb = c0o1;
- real mfcbc = c0o1;
- real mfaba = c0o1;
- real mfcba = c0o1;
- real mfabc = c0o1;
- real mfbcc = c0o1;
- real mfbaa = c0o1;
- real mfbca = c0o1;
- real mfbac = c0o1;
- real mfbbb = c0o1;
- real mfccc = c0o1;
- real mfaac = c0o1;
- real mfcac = c0o1;
- real mfacc = c0o1;
- real mfcca = c0o1;
- real mfaaa = c0o1;
- real mfcaa = c0o1;
- real mfaca = c0o1;
-
- mfaaa = press; // if drho is interpolated directly
-
- real vx1Sq = vx1*vx1;
- real vx2Sq = vx2*vx2;
- real vx3Sq = vx3*vx3;
- real oMdrho = c1o1;
- //oMdrho = one - mfaaa;
-
- //2.f
- // linear combinations
-
-/////////////////////////
- real mxxPyyPzz = mfaaa -c2o3*(ax+by+cz)*eps_new/oP*(c1o1 +press);
-
- real mxxMyy = -c2o3*((ax - by)+kxxMyyAverage)*eps_new/o * (c1o1 + press);
- real mxxMzz = -c2o3*((ax - cz)+kxxMzzAverage)*eps_new/o * (c1o1 + press);
-
- mfabb = -c1o3 * ((bz + cy)+kyzAverage)*eps_new/o * (c1o1 + press);
- mfbab = -c1o3 * ((az + cx)+kxzAverage)*eps_new/o * (c1o1 + press);
- mfbba = -c1o3 * ((ay + bx)+kxyAverage)*eps_new/o * (c1o1 + press);
-
- ////////////////////////
- // linear combinations back
- mfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
- mfaca = c1o3 * (-c2o1 * mxxMyy + mxxMzz + mxxPyyPzz);
- mfaac = c1o3 * (mxxMyy - c2o1 * mxxMzz + mxxPyyPzz);
-
- //three
- mfbbb = c0o1;
-
- real mxxyPyzz = c0o1;
- real mxxyMyzz = c0o1;
- real mxxzPyyz = c0o1;
- real mxxzMyyz = c0o1;
- real mxyyPxzz = c0o1;
- real mxyyMxzz = c0o1;
-
- // linear combinations back
- mfcba = (mxxyMyzz + mxxyPyzz) * c1o2;
- mfabc = (-mxxyMyzz + mxxyPyzz) * c1o2;
- mfcab = (mxxzMyyz + mxxzPyyz) * c1o2;
- mfacb = (-mxxzMyyz + mxxzPyyz) * c1o2;
- mfbca = (mxyyMxzz + mxyyPxzz) * c1o2;
- mfbac = (-mxyyMxzz + mxyyPxzz) * c1o2;
-
- //4.f
- mfacc = mfaaa*c1o9;
- mfcac = mfacc;
- mfcca = mfacc;
- //5.
-
- //6.
- mfccc = mfaaa*c1o27;
- ////////////////////////////////////////////////////////////////////////////////////
- //back
- ////////////////////////////////////////////////////////////////////////////////////
- //mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
- ////////////////////////////////////////////////////////////////////////////////////
- // Z - Dir
- real m0 = mfaac * c1o2 + mfaab * (vx3 - c1o2) + (mfaaa + c1o1 * oMdrho) * (vx3Sq - vx3) * c1o2;
- real m1 = -mfaac - c2o1 * mfaab * vx3 + mfaaa * (c1o1 - vx3Sq) - c1o1 * oMdrho * vx3Sq;
- real m2 = mfaac * c1o2 + mfaab * (vx3 + c1o2) + (mfaaa + c1o1 * oMdrho) * (vx3Sq + vx3) * c1o2;
- mfaaa = m0;
- mfaab = m1;
- mfaac = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfabc * c1o2 + mfabb * (vx3 - c1o2) + mfaba * (vx3Sq - vx3) * c1o2;
- m1 = -mfabc - c2o1 * mfabb * vx3 + mfaba * (c1o1 - vx3Sq);
- m2 = mfabc * c1o2 + mfabb * (vx3 + c1o2) + mfaba * (vx3Sq + vx3) * c1o2;
- mfaba = m0;
- mfabb = m1;
- mfabc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfacc * c1o2 + mfacb * (vx3 - c1o2) + (mfaca + c1o3 * oMdrho) * (vx3Sq - vx3) * c1o2;
- m1 = -mfacc - c2o1 * mfacb * vx3 + mfaca * (c1o1 - vx3Sq) - c1o3 * oMdrho * vx3Sq;
- m2 = mfacc * c1o2 + mfacb * (vx3 + c1o2) + (mfaca + c1o3 * oMdrho) * (vx3Sq + vx3) * c1o2;
- mfaca = m0;
- mfacb = m1;
- mfacc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfbac * c1o2 + mfbab * (vx3 - c1o2) + mfbaa * (vx3Sq - vx3) * c1o2;
- m1 = -mfbac - c2o1 * mfbab * vx3 + mfbaa * (c1o1 - vx3Sq);
- m2 = mfbac * c1o2 + mfbab * (vx3 + c1o2) + mfbaa * (vx3Sq + vx3) * c1o2;
- mfbaa = m0;
- mfbab = m1;
- mfbac = m2;
- /////////b//////////////////////////////////////////////////////////////////////////
- m0 = mfbbc * c1o2 + mfbbb * (vx3 - c1o2) + mfbba * (vx3Sq - vx3) * c1o2;
- m1 = -mfbbc - c2o1 * mfbbb * vx3 + mfbba * (c1o1 - vx3Sq);
- m2 = mfbbc * c1o2 + mfbbb * (vx3 + c1o2) + mfbba * (vx3Sq + vx3) * c1o2;
- mfbba = m0;
- mfbbb = m1;
- mfbbc = m2;
- /////////b//////////////////////////////////////////////////////////////////////////
- m0 = mfbcc * c1o2 + mfbcb * (vx3 - c1o2) + mfbca * (vx3Sq - vx3) * c1o2;
- m1 = -mfbcc - c2o1 * mfbcb * vx3 + mfbca * (c1o1 - vx3Sq);
- m2 = mfbcc * c1o2 + mfbcb * (vx3 + c1o2) + mfbca * (vx3Sq + vx3) * c1o2;
- mfbca = m0;
- mfbcb = m1;
- mfbcc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcac * c1o2 + mfcab * (vx3 - c1o2) + (mfcaa + c1o3 * oMdrho) * (vx3Sq - vx3) * c1o2;
- m1 = -mfcac - c2o1 * mfcab * vx3 + mfcaa * (c1o1 - vx3Sq) - c1o3 * oMdrho * vx3Sq;
- m2 = mfcac * c1o2 + mfcab * (vx3 + c1o2) + (mfcaa + c1o3 * oMdrho) * (vx3Sq + vx3) * c1o2;
- mfcaa = m0;
- mfcab = m1;
- mfcac = m2;
- /////////c//////////////////////////////////////////////////////////////////////////
- m0 = mfcbc * c1o2 + mfcbb * (vx3 - c1o2) + mfcba * (vx3Sq - vx3) * c1o2;
- m1 = -mfcbc - c2o1 * mfcbb * vx3 + mfcba * (c1o1 - vx3Sq);
- m2 = mfcbc * c1o2 + mfcbb * (vx3 + c1o2) + mfcba * (vx3Sq + vx3) * c1o2;
- mfcba = m0;
- mfcbb = m1;
- mfcbc = m2;
- /////////c//////////////////////////////////////////////////////////////////////////
- m0 = mfccc * c1o2 + mfccb * (vx3 - c1o2) + (mfcca + c1o9 * oMdrho) * (vx3Sq - vx3) * c1o2;
- m1 = -mfccc - c2o1 * mfccb * vx3 + mfcca * (c1o1 - vx3Sq) - c1o9 * oMdrho * vx3Sq;
- m2 = mfccc * c1o2 + mfccb * (vx3 + c1o2) + (mfcca + c1o9 * oMdrho) * (vx3Sq + vx3) * c1o2;
- mfcca = m0;
- mfccb = m1;
- mfccc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- //mit 1/6, 2/3, 1/6, 0, 0, 0, 1/18, 2/9, 1/18 Konditionieren
- ////////////////////////////////////////////////////////////////////////////////////
- // Y - Dir
- m0 = mfaca * c1o2 + mfaba * (vx2 - c1o2) + (mfaaa + c1o6 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfaca - c2o1 * mfaba * vx2 + mfaaa * (c1o1 - vx2Sq) - c1o6 * oMdrho * vx2Sq;
- m2 = mfaca * c1o2 + mfaba * (vx2 + c1o2) + (mfaaa + c1o6 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfaaa = m0;
- mfaba = m1;
- mfaca = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfacb * c1o2 + mfabb * (vx2 - c1o2) + (mfaab + c2o3 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfacb - c2o1 * mfabb * vx2 + mfaab * (c1o1 - vx2Sq) - c2o3 * oMdrho * vx2Sq;
- m2 = mfacb * c1o2 + mfabb * (vx2 + c1o2) + (mfaab + c2o3 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfaab = m0;
- mfabb = m1;
- mfacb = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfacc * c1o2 + mfabc * (vx2 - c1o2) + (mfaac + c1o6 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfacc - c2o1 * mfabc * vx2 + mfaac * (c1o1 - vx2Sq) - c1o6 * oMdrho * vx2Sq;
- m2 = mfacc * c1o2 + mfabc * (vx2 + c1o2) + (mfaac + c1o6 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfaac = m0;
- mfabc = m1;
- mfacc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfbca * c1o2 + mfbba * (vx2 - c1o2) + mfbaa * (vx2Sq - vx2) * c1o2;
- m1 = -mfbca - c2o1 * mfbba * vx2 + mfbaa * (c1o1 - vx2Sq);
- m2 = mfbca * c1o2 + mfbba * (vx2 + c1o2) + mfbaa * (vx2Sq + vx2) * c1o2;
- mfbaa = m0;
- mfbba = m1;
- mfbca = m2;
- /////////b//////////////////////////////////////////////////////////////////////////
- m0 = mfbcb * c1o2 + mfbbb * (vx2 - c1o2) + mfbab * (vx2Sq - vx2) * c1o2;
- m1 = -mfbcb - c2o1 * mfbbb * vx2 + mfbab * (c1o1 - vx2Sq);
- m2 = mfbcb * c1o2 + mfbbb * (vx2 + c1o2) + mfbab * (vx2Sq + vx2) * c1o2;
- mfbab = m0;
- mfbbb = m1;
- mfbcb = m2;
- /////////b//////////////////////////////////////////////////////////////////////////
- m0 = mfbcc * c1o2 + mfbbc * (vx2 - c1o2) + mfbac * (vx2Sq - vx2) * c1o2;
- m1 = -mfbcc - c2o1 * mfbbc * vx2 + mfbac * (c1o1 - vx2Sq);
- m2 = mfbcc * c1o2 + mfbbc * (vx2 + c1o2) + mfbac * (vx2Sq + vx2) * c1o2;
- mfbac = m0;
- mfbbc = m1;
- mfbcc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcca * c1o2 + mfcba * (vx2 - c1o2) + (mfcaa + c1o18 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfcca - c2o1 * mfcba * vx2 + mfcaa * (c1o1 - vx2Sq) - c1o18 * oMdrho * vx2Sq;
- m2 = mfcca * c1o2 + mfcba * (vx2 + c1o2) + (mfcaa + c1o18 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfcaa = m0;
- mfcba = m1;
- mfcca = m2;
- /////////c//////////////////////////////////////////////////////////////////////////
- m0 = mfccb * c1o2 + mfcbb * (vx2 - c1o2) + (mfcab + c2o9 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfccb - c2o1 * mfcbb * vx2 + mfcab * (c1o1 - vx2Sq) - c2o9 * oMdrho * vx2Sq;
- m2 = mfccb * c1o2 + mfcbb * (vx2 + c1o2) + (mfcab + c2o9 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfcab = m0;
- mfcbb = m1;
- mfccb = m2;
- /////////c//////////////////////////////////////////////////////////////////////////
- m0 = mfccc * c1o2 + mfcbc * (vx2 - c1o2) + (mfcac + c1o18 * oMdrho) * (vx2Sq - vx2) * c1o2;
- m1 = -mfccc - c2o1 * mfcbc * vx2 + mfcac * (c1o1 - vx2Sq) - c1o18 * oMdrho * vx2Sq;
- m2 = mfccc * c1o2 + mfcbc * (vx2 + c1o2) + (mfcac + c1o18 * oMdrho) * (vx2Sq + vx2) * c1o2;
- mfcac = m0;
- mfcbc = m1;
- mfccc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- //mit 1/36, 1/9, 1/36, 1/9, 4/9, 1/9, 1/36, 1/9, 1/36 Konditionieren
- ////////////////////////////////////////////////////////////////////////////////////
- // X - Dir
- m0 = mfcaa * c1o2 + mfbaa * (vx1 - c1o2) + (mfaaa + c1o36 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcaa - c2o1 * mfbaa * vx1 + mfaaa * (c1o1 - vx1Sq) - c1o36 * oMdrho * vx1Sq;
- m2 = mfcaa * c1o2 + mfbaa * (vx1 + c1o2) + (mfaaa + c1o36 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaaa = m0;
- mfbaa = m1;
- mfcaa = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcba * c1o2 + mfbba * (vx1 - c1o2) + (mfaba + c1o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcba - c2o1 * mfbba * vx1 + mfaba * (c1o1 - vx1Sq) - c1o9 * oMdrho * vx1Sq;
- m2 = mfcba * c1o2 + mfbba * (vx1 + c1o2) + (mfaba + c1o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaba = m0;
- mfbba = m1;
- mfcba = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcca * c1o2 + mfbca * (vx1 - c1o2) + (mfaca + c1o36 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcca - c2o1 * mfbca * vx1 + mfaca * (c1o1 - vx1Sq) - c1o36 * oMdrho * vx1Sq;
- m2 = mfcca * c1o2 + mfbca * (vx1 + c1o2) + (mfaca + c1o36 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaca = m0;
- mfbca = m1;
- mfcca = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcab * c1o2 + mfbab * (vx1 - c1o2) + (mfaab + c1o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcab - c2o1 * mfbab * vx1 + mfaab * (c1o1 - vx1Sq) - c1o9 * oMdrho * vx1Sq;
- m2 = mfcab * c1o2 + mfbab * (vx1 + c1o2) + (mfaab + c1o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaab = m0;
- mfbab = m1;
- mfcab = m2;
- ///////////b////////////////////////////////////////////////////////////////////////
- m0 = mfcbb * c1o2 + mfbbb * (vx1 - c1o2) + (mfabb + c4o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcbb - c2o1 * mfbbb * vx1 + mfabb * (c1o1 - vx1Sq) - c4o9 * oMdrho * vx1Sq;
- m2 = mfcbb * c1o2 + mfbbb * (vx1 + c1o2) + (mfabb + c4o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfabb = m0;
- mfbbb = m1;
- mfcbb = m2;
- ///////////b////////////////////////////////////////////////////////////////////////
- m0 = mfccb * c1o2 + mfbcb * (vx1 - c1o2) + (mfacb + c1o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfccb - c2o1 * mfbcb * vx1 + mfacb * (c1o1 - vx1Sq) - c1o9 * oMdrho * vx1Sq;
- m2 = mfccb * c1o2 + mfbcb * (vx1 + c1o2) + (mfacb + c1o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfacb = m0;
- mfbcb = m1;
- mfccb = m2;
- ////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////////
- m0 = mfcac * c1o2 + mfbac * (vx1 - c1o2) + (mfaac + c1o36 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcac - c2o1 * mfbac * vx1 + mfaac * (c1o1 - vx1Sq) - c1o36 * oMdrho * vx1Sq;
- m2 = mfcac * c1o2 + mfbac * (vx1 + c1o2) + (mfaac + c1o36 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfaac = m0;
- mfbac = m1;
- mfcac = m2;
- ///////////c////////////////////////////////////////////////////////////////////////
- m0 = mfcbc * c1o2 + mfbbc * (vx1 - c1o2) + (mfabc + c1o9 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfcbc - c2o1 * mfbbc * vx1 + mfabc * (c1o1 - vx1Sq) - c1o9 * oMdrho * vx1Sq;
- m2 = mfcbc * c1o2 + mfbbc * (vx1 + c1o2) + (mfabc + c1o9 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfabc = m0;
- mfbbc = m1;
- mfcbc = m2;
- ///////////c////////////////////////////////////////////////////////////////////////
- m0 = mfccc * c1o2 + mfbcc * (vx1 - c1o2) + (mfacc + c1o36 * oMdrho) * (vx1Sq - vx1) * c1o2;
- m1 = -mfccc - c2o1 * mfbcc * vx1 + mfacc * (c1o1 - vx1Sq) - c1o36 * oMdrho * vx1Sq;
- m2 = mfccc * c1o2 + mfbcc * (vx1 + c1o2) + (mfacc + c1o36 * oMdrho) * (vx1Sq + vx1) * c1o2;
- mfacc = m0;
- mfbcc = m1;
- mfccc = m2;
- ////////////////////////////////////////////////////////////////////////////////////
-
- f[DIR_P00] = mfcbb;
- f[DIR_M00] = mfabb;
- f[DIR_0P0] = mfbcb;
- f[DIR_0M0] = mfbab;
- f[DIR_00P] = mfbbc;
- f[DIR_00M] = mfbba;
- f[DIR_PP0] = mfccb;
- f[DIR_MM0] = mfaab;
- f[DIR_PM0] = mfcab;
- f[DIR_MP0] = mfacb;
- f[DIR_P0P] = mfcbc;
- f[DIR_M0M] = mfaba;
- f[DIR_P0M] = mfcba;
- f[DIR_M0P] = mfabc;
- f[DIR_0PP] = mfbcc;
- f[DIR_0MM] = mfbaa;
- f[DIR_0PM] = mfbca;
- f[DIR_0MP] = mfbac;
- f[DIR_000] = mfbbb;
- f[DIR_PPP] = mfccc;
- f[DIR_PMP] = mfcac;
- f[DIR_PPM] = mfcca;
- f[DIR_PMM] = mfcaa;
- f[DIR_MPP] = mfacc;
- f[DIR_MMP] = mfaac;
- f[DIR_MPM] = mfaca;
- f[DIR_MMM] = mfaaa;
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedVelocity(real x, real y, real z, real& vx1, real& vx2, real& vx3)
-{
- vx1 = a0 + ax*x + ay*y + az*z + axx*x*x + ayy*y*y + azz*z*z + axy*x*y + axz*x*z + ayz*y*z+axyz*x*y*z;
- vx2 = b0 + bx*x + by*y + bz*z + bxx*x*x + byy*y*y + bzz*z*z + bxy*x*y + bxz*x*z + byz*y*z+bxyz*x*y*z;
- vx3 = c0 + cx*x + cy*y + cz*z + cxx*x*x + cyy*y*y + czz*z*z + cxy*x*y + cxz*x*z + cyz*y*z+cxyz*x*y*z;
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz)
-{
- tauxx=ax+c2o1*axx*x+axy*y+axz*z+axyz*y*z;
- tauyy=by+c2o1*byy*y+bxy*x+byz*z+bxyz*x*z;
- tauzz=cz+c2o1*czz*z+cxz*x+cyz*y+cxyz*x*y;
- tauxy= c1o2*((ay+c2o1*ayy*y+axy*x+ayz*z+axyz*x*z)+(bx+c2o1*bxx*x+bxy*y+bxz*z+bxyz*y*z));
- tauxz= c1o2*((az+c2o1*azz*z+axz*x+ayz*y+axyz*x*y)+(cx+c2o1*cxx*x+cxy*y+cxz*z+cxyz*y*z));
- tauyz= c1o2*((bz+c2o1*bzz*z+bxz*x+byz*y+bxyz*x*y)+(cy+c2o1*cyy*y+cxy*x+cyz*z+cxyz*x*z));
-}
-//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetMomentsInterpolationProcessor::setBulkViscosity(real shearViscosity, real bulkViscosity)
-{
- this->shearViscosity = shearViscosity;
- this->bulkViscosity = bulkViscosity;
-}
-
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h
deleted file mode 100644
index 32ab8cedf89e2e644f2f939f49ed4b0101eb0e32..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef CompressibleOffsetMomentsInterpolationProcessor_H_
-#define CompressibleOffsetMomentsInterpolationProcessor_H_
-
-#include "InterpolationProcessor.h"
-#include "D3Q27System.h"
-
-//////////////////////////////////////////////////////////////////////////
-//it works only for cascaded LBM
-//super compact interpolation method by Martin Geier
-//////////////////////////////////////////////////////////////////////////
-
-class CompressibleOffsetMomentsInterpolationProcessor;
-
-class CompressibleOffsetMomentsInterpolationProcessor : public InterpolationProcessor
-{
-public:
- CompressibleOffsetMomentsInterpolationProcessor();
- CompressibleOffsetMomentsInterpolationProcessor(real omegaC, real omegaF);
- ~CompressibleOffsetMomentsInterpolationProcessor() override;
- InterpolationProcessorPtr clone() override;
- void setOmegas(real omegaC, real omegaF) override;
- void interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF) override;
- void interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff) override;
- void interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC) override;
- void interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff) override;
- void setBulkViscosity(real shearViscosity, real bulkViscosity);
-protected:
-private:
- real omegaC{0.0}, omegaF{0.0};
- real a0, ax, ay, az, axx, ayy, azz, axy, axz, ayz, b0, bx, by, bz, bxx, byy, bzz, bxy, bxz, byz, c0, cx, cy, cz, cxx, cyy, czz, cxy, cxz, cyz, axyz, bxyz, cxyz;
- real xoff, yoff, zoff;
- real xoff_sq, yoff_sq, zoff_sq;
- real press_SWT, press_NWT, press_NET, press_SET, press_SWB, press_NWB, press_NEB, press_SEB;
-
- real f_E, f_N, f_T, f_NE, f_SE, f_BE, f_TE, f_TN, f_BN, f_TNE, f_TNW, f_TSE, f_TSW, f_ZERO;
- real x_E, x_N, x_T, x_NE, x_SE, x_BE, x_TE, x_TN, x_BN, x_TNE, x_TNW, x_TSE, x_TSW, x_ZERO;
- real y_E, y_N, y_T, y_NE, y_SE, y_BE, y_TE, y_TN, y_BN, y_TNE, y_TNW, y_TSE, y_TSW, y_ZERO;
- real z_E, z_N, z_T, z_NE, z_SE, z_BE, z_TE, z_TN, z_BN, z_TNE, z_TNW, z_TSE, z_TSW, z_ZERO;
- real xy_E, xy_N, xy_T, xy_NE, xy_SE, xy_BE, xy_TE, xy_TN, xy_BN, xy_TNE, xy_TNW, xy_TSE, xy_TSW/*, xy_ZERO*/;
- real xz_E, xz_N, xz_T, xz_NE, xz_SE, xz_BE, xz_TE, xz_TN, xz_BN, xz_TNE, xz_TNW, xz_TSE, xz_TSW/*, xz_ZERO*/;
- real yz_E, yz_N, yz_T, yz_NE, yz_SE, yz_BE, yz_TE, yz_TN, yz_BN, yz_TNE, yz_TNW, yz_TSE, yz_TSW/*, yz_ZERO*/;
-
- real kxyAverage, kyzAverage, kxzAverage, kxxMyyAverage, kxxMzzAverage;
-
-// real a,b,c;
-
- // bulk viscosity
- real shearViscosity;
- real bulkViscosity;
- real OxxPyyPzzC;
- real OxxPyyPzzF;
-
- void setOffsets(real xoff, real yoff, real zoff) override;
- void calcMoments(const real* const f, real omega, real& rho, real& vx1, real& vx2, real& vx3,
- real& kxy, real& kyz, real& kxz, real& kxxMyy, real& kxxMzz);
- void calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new) override;
- void calcInterpolatedNodeCF(real* f, real omega, real x, real y, real z, real press, real xs, real ys, real zs);
- real calcPressBSW();
- real calcPressTSW();
- real calcPressTSE();
- real calcPressBSE();
- real calcPressBNW();
- real calcPressTNW();
- real calcPressTNE();
- real calcPressBNE();
- void calcInterpolatedNodeFC(real* f, real omega) override;
- void calcInterpolatedVelocity(real x, real y, real z,real& vx1, real& vx2, real& vx3) override;
- void calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz) override;
-};
-
-//////////////////////////////////////////////////////////////////////////
-inline void CompressibleOffsetMomentsInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF)
-{
- this->interpolateCoarseToFine(icellC, icellF, 0.0, 0.0, 0.0);
-}
-//////////////////////////////////////////////////////////////////////////
-inline void CompressibleOffsetMomentsInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC)
-{
- this->interpolateFineToCoarse(icellF, icellC, 0.0, 0.0, 0.0);
-}
-
-#endif
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp
index 548339f940d45ab2239ce6cb1cebbfa9bf0082b5..1b8d5a230ddf7a2d9b58c9e7ca8231f5c9d3500f 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp
@@ -1,6 +1,6 @@
#include "CumulantLBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include <math.h>
#include "DataSet3D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
index 990bb8f89f4b6abb1a0e77b550af4d751ad49a40..39d6fd268a56f4824babaccea3449ea097c85bf2 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
@@ -1,6 +1,6 @@
#include "IncompressibleCumulantLBMKernel.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include "DataSet3D.h"
#include <cmath>
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetInterpolator.cpp
similarity index 95%
rename from src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
rename to src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetInterpolator.cpp
index 5cf501e20012804b7e84090243dad466e06ad06c..509115d26edfaa398877739bf1f25919595e9aa6 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetInterpolator.cpp
@@ -1,32 +1,32 @@
-#include "CompressibleOffsetInterpolationProcessor.h"
+#include "CompressibleOffsetInterpolator.h"
#include "D3Q27System.h"
//using namespace UbMath;
using namespace vf::basics::constant;
//////////////////////////////////////////////////////////////////////////
-CompressibleOffsetInterpolationProcessor::CompressibleOffsetInterpolationProcessor(real omegaC, real omegaF)
+CompressibleOffsetInterpolator::CompressibleOffsetInterpolator(real omegaC, real omegaF)
: omegaC(omegaC), omegaF(omegaF)
{
}
//////////////////////////////////////////////////////////////////////////
-InterpolationProcessorPtr CompressibleOffsetInterpolationProcessor::clone()
+InterpolationProcessorPtr CompressibleOffsetInterpolator::clone()
{
- InterpolationProcessorPtr iproc = InterpolationProcessorPtr (new CompressibleOffsetInterpolationProcessor(this->omegaC, this->omegaF));
+ InterpolationProcessorPtr iproc = InterpolationProcessorPtr (new CompressibleOffsetInterpolator(this->omegaC, this->omegaF));
//dynamicPointerCast<D3Q27IncompressibleOffsetInterpolationProcessor>(iproc)->forcingC = forcingC;
//dynamicPointerCast<D3Q27IncompressibleOffsetInterpolationProcessor>(iproc)->forcingF = forcingF;
return iproc;
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::setOmegas( real omegaC, real omegaF )
+void CompressibleOffsetInterpolator::setOmegas( real omegaC, real omegaF )
{
this->omegaC = omegaC;
this->omegaF = omegaF;
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::setOffsets(real xoff, real yoff, real zoff)
+void CompressibleOffsetInterpolator::setOffsets(real xoff, real yoff, real zoff)
{
this->xoff = xoff;
this->yoff = yoff;
@@ -36,7 +36,7 @@ void CompressibleOffsetInterpolationProcessor::setOffsets(real xoff, real yoff,
this->zoff_sq = zoff * zoff;
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
+void CompressibleOffsetInterpolator::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
calcInterpolatedCoefficiets(icellC, omegaC, c1o2);
@@ -50,14 +50,14 @@ void CompressibleOffsetInterpolationProcessor::interpolateCoarseToFine(D3Q27ICel
calcInterpolatedNodeCF(icellF.TNE, omegaF, c1o4, c1o4, c1o4, calcPressTNE(), c1o1, c1o1, c1o1);
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
+void CompressibleOffsetInterpolator::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
calcInterpolatedCoefficiets(icellF, omegaF, c2o1);
calcInterpolatedNodeFC(icellC, omegaC);
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::calcMoments(const real* const f, real omega, real& press, real& vx1, real& vx2, real& vx3,
+void CompressibleOffsetInterpolator::calcMoments(const real* const f, real omega, real& press, real& vx1, real& vx2, real& vx3,
real& kxy, real& kyz, real& kxz, real& kxxMyy, real& kxxMzz)
{
using namespace D3Q27System;
@@ -76,7 +76,7 @@ void CompressibleOffsetInterpolationProcessor::calcMoments(const real* const f,
kxxMzz = -c3o1/c2o1*omega*((((f[DIR_MP0]+f[DIR_PM0])-(f[DIR_0MM]+f[DIR_0PP]))+((f[DIR_MM0]+f[DIR_PP0])-(f[DIR_0MP]+f[DIR_0PM])))+((f[DIR_M00]+f[DIR_P00])-(f[DIR_00M]+f[DIR_00P]))/(c1o1 + drho)-(vx1*vx1-vx3*vx3));
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
+void CompressibleOffsetInterpolator::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
{
real vx1_SWT,vx2_SWT,vx3_SWT;
real vx1_NWT,vx2_NWT,vx3_NWT;
@@ -457,7 +457,7 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const
yz_TNW = c1o16*eps_new *(( bxyz + cxyz)/(c72o1*o));
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeCF(real* f, real /*omega*/, real /*x*/, real /*y*/, real /*z*/, real press, real xs, real ys, real zs)
+void CompressibleOffsetInterpolator::calcInterpolatedNodeCF(real* f, real /*omega*/, real /*x*/, real /*y*/, real /*z*/, real press, real xs, real ys, real zs)
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
@@ -504,8 +504,8 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeCF(real* f, r
f[DIR_000] = f_ZERO + xs*x_ZERO + ys*y_ZERO + zs*z_ZERO + feq[DIR_000];
}
//////////////////////////////////////////////////////////////////////////
-//Position SWB -c1o4, -c1o4, -c1o4
-real CompressibleOffsetInterpolationProcessor::calcPressBSW()
+//Position SWB -0.25, -0.25, -0.25
+real CompressibleOffsetInterpolator::calcPressBSW()
{
return press_SWT * (c9o64 + c3o16 * xoff + c3o16 * yoff - c9o16 * zoff) +
press_NWT * (c3o64 + c1o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
@@ -517,8 +517,8 @@ real CompressibleOffsetInterpolationProcessor::calcPressBSW()
press_SWB * (c27o64 + c9o16 * xoff + c9o16 * yoff + c9o16 * zoff);
}
//////////////////////////////////////////////////////////////////////////
-//Position SWT -c1o4, -c1o4, c1o4
-real CompressibleOffsetInterpolationProcessor::calcPressTSW()
+//Position SWT -0.25, -0.25, 0.25
+real CompressibleOffsetInterpolator::calcPressTSW()
{
return press_SWT * (c27o64 + c9o16 * xoff + c9o16 * yoff - c9o16 * zoff) +
press_NWT * (c9o64 + c3o16 * xoff - c9o16 * yoff - c3o16 * zoff) +
@@ -531,7 +531,7 @@ real CompressibleOffsetInterpolationProcessor::calcPressTSW()
}
//////////////////////////////////////////////////////////////////////////
//Position SET 0.25, -0.25, 0.25
-real CompressibleOffsetInterpolationProcessor::calcPressTSE()
+real CompressibleOffsetInterpolator::calcPressTSE()
{
return press_SET * (c27o64 - c9o16 * xoff + c9o16 * yoff - c9o16 * zoff) +
press_NET * (c9o64 - c3o16 * xoff - c9o16 * yoff - c3o16 * zoff) +
@@ -544,7 +544,7 @@ real CompressibleOffsetInterpolationProcessor::calcPressTSE()
}
//////////////////////////////////////////////////////////////////////////
//Position SEB 0.25, -0.25, -0.25
-real CompressibleOffsetInterpolationProcessor::calcPressBSE()
+real CompressibleOffsetInterpolator::calcPressBSE()
{
return press_SET * (c9o64 - c3o16 * xoff + c3o16 * yoff - c9o16 * zoff) +
press_NET * (c3o64 - c1o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
@@ -557,7 +557,7 @@ real CompressibleOffsetInterpolationProcessor::calcPressBSE()
}
//////////////////////////////////////////////////////////////////////////
//Position NWB -0.25, 0.25, -0.25
-real CompressibleOffsetInterpolationProcessor::calcPressBNW()
+real CompressibleOffsetInterpolator::calcPressBNW()
{
return press_NWT * (c9o64 + c3o16 * xoff - c3o16 * yoff - c9o16 * zoff) +
press_NET * (c3o64 - c3o16 * xoff - c1o16 * yoff - c3o16 * zoff) +
@@ -570,7 +570,7 @@ real CompressibleOffsetInterpolationProcessor::calcPressBNW()
}
//////////////////////////////////////////////////////////////////////////
//Position NWT -0.25, 0.25, 0.25
-real CompressibleOffsetInterpolationProcessor::calcPressTNW()
+real CompressibleOffsetInterpolator::calcPressTNW()
{
return press_NWT * (c27o64 + c9o16 * xoff - c9o16 * yoff - c9o16 * zoff) +
press_NET * (c9o64 - c9o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
@@ -583,7 +583,7 @@ real CompressibleOffsetInterpolationProcessor::calcPressTNW()
}
//////////////////////////////////////////////////////////////////////////
//Position NET 0.25, 0.25, 0.25
-real CompressibleOffsetInterpolationProcessor::calcPressTNE()
+real CompressibleOffsetInterpolator::calcPressTNE()
{
return press_NET * (c27o64 - c9o16 * xoff - c9o16 * yoff - c9o16 * zoff) +
press_NWT * (c9o64 + c9o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
@@ -596,7 +596,7 @@ real CompressibleOffsetInterpolationProcessor::calcPressTNE()
}
//////////////////////////////////////////////////////////////////////////
//Position NEB 0.25, 0.25, -0.25
-real CompressibleOffsetInterpolationProcessor::calcPressBNE()
+real CompressibleOffsetInterpolator::calcPressBNE()
{
return press_NET * (c9o64 - c3o16 * xoff - c3o16 * yoff - c9o16 * zoff) +
press_NWT * (c3o64 + c3o16 * xoff - c1o16 * yoff - c3o16 * zoff) +
@@ -609,7 +609,7 @@ real CompressibleOffsetInterpolationProcessor::calcPressBNE()
}
//////////////////////////////////////////////////////////////////////////
//Position C 0.0, 0.0, 0.0
-void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f, real omega)
+void CompressibleOffsetInterpolator::calcInterpolatedNodeFC(real* f, real omega)
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
@@ -699,14 +699,14 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f, r
f[DIR_000] = f_ZERO + feq[DIR_000];
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::calcInterpolatedVelocity(real x, real y, real z, real& vx1, real& vx2, real& vx3)
+void CompressibleOffsetInterpolator::calcInterpolatedVelocity(real x, real y, real z, real& vx1, real& vx2, real& vx3)
{
vx1 = a0 + ax*x + ay*y + az*z + axx*x*x + ayy*y*y + azz*z*z + axy*x*y + axz*x*z + ayz*y*z+axyz*x*y*z;
vx2 = b0 + bx*x + by*y + bz*z + bxx*x*x + byy*y*y + bzz*z*z + bxy*x*y + bxz*x*z + byz*y*z+bxyz*x*y*z;
vx3 = c0 + cx*x + cy*y + cz*z + cxx*x*x + cyy*y*y + czz*z*z + cxy*x*y + cxz*x*z + cyz*y*z+cxyz*x*y*z;
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz)
+void CompressibleOffsetInterpolator::calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz)
{
tauxx=ax+c2o1*axx*x+axy*y+axz*z+axyz*y*z;
tauyy=by+c2o1*byy*y+bxy*x+byz*z+bxyz*x*z;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetInterpolator.h
similarity index 85%
rename from src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
rename to src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetInterpolator.h
index fefd6ed1566fe0a4c3c414748a522edbfede48a1..8b295977773ad95c00b36a9ef775d45140fe34df 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetInterpolator.h
@@ -1,7 +1,7 @@
#ifndef CompressibleOffsetInterpolationProcessor_H_
#define CompressibleOffsetInterpolationProcessor_H_
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27System.h"
//////////////////////////////////////////////////////////////////////////
@@ -9,14 +9,14 @@
//super compact interpolation method by Martin Geier
//////////////////////////////////////////////////////////////////////////
-class CompressibleOffsetInterpolationProcessor;
+class CompressibleOffsetInterpolator;
-class CompressibleOffsetInterpolationProcessor : public InterpolationProcessor
+class CompressibleOffsetInterpolator : public Interpolator
{
public:
- CompressibleOffsetInterpolationProcessor() = default;
- CompressibleOffsetInterpolationProcessor(real omegaC, real omegaF);
- ~CompressibleOffsetInterpolationProcessor() override = default;
+ CompressibleOffsetInterpolator() = default;
+ CompressibleOffsetInterpolator(real omegaC, real omegaF);
+ ~CompressibleOffsetInterpolator() override = default;
InterpolationProcessorPtr clone() override;
void setOmegas(real omegaC, real omegaF) override;
@@ -64,12 +64,12 @@ private:
};
//////////////////////////////////////////////////////////////////////////
-inline void CompressibleOffsetInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF)
+inline void CompressibleOffsetInterpolator::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF)
{
this->interpolateCoarseToFine(icellC, icellF, 0.0, 0.0, 0.0);
}
//////////////////////////////////////////////////////////////////////////
-inline void CompressibleOffsetInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC)
+inline void CompressibleOffsetInterpolator::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC)
{
this->interpolateFineToCoarse(icellF, icellC, 0.0, 0.0, 0.0);
}
diff --git a/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetMomentsInterpolator.cpp b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetMomentsInterpolator.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e7d891df037a05fed023fff3aaaa0db19f0cfa43
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetMomentsInterpolator.cpp
@@ -0,0 +1,65 @@
+#include "CompressibleOffsetMomentsInterpolator.h"
+
+#include <algorithm>
+
+#include <basics/constants/NumericConstants.h>
+
+#include <lbm/refinement/InterpolationCF.h>
+#include <lbm/refinement/InterpolationFC.h>
+#include <lbm/refinement/Coefficients.h>
+
+
+void calculateCoefficients(vf::lbm::Coefficients& coefficients, const D3Q27ICell& icell, real omega, real xoff, real yoff, real zoff)
+{
+ vf::lbm::MomentsOnSourceNodeSet momentsSet;
+
+ momentsSet.calculateMMM(icell.BSW, omega);
+ momentsSet.calculateMMP(icell.TSW, omega);
+ momentsSet.calculateMPP(icell.TNW, omega);
+ momentsSet.calculateMPM(icell.BNW, omega);
+ momentsSet.calculatePMM(icell.BSE, omega);
+ momentsSet.calculatePPP(icell.TNE, omega);
+ momentsSet.calculatePMP(icell.TSE, omega);
+ momentsSet.calculatePPM(icell.BNE, omega);
+
+ momentsSet.calculateCoefficients(coefficients, xoff, yoff, zoff);
+}
+
+CompressibleOffsetMomentsInterpolator::CompressibleOffsetMomentsInterpolator(real omegaC, real omegaF)
+ : omegaC(omegaC), omegaF(omegaF)
+{
+}
+
+InterpolationProcessorPtr CompressibleOffsetMomentsInterpolator::clone()
+{
+ return InterpolationProcessorPtr (new CompressibleOffsetMomentsInterpolator(this->omegaC, this->omegaF));
+}
+
+void CompressibleOffsetMomentsInterpolator::setOmegas(real omegaC, real omegaF)
+{
+ this->omegaC = omegaC;
+ this->omegaF = omegaF;
+}
+
+void CompressibleOffsetMomentsInterpolator::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
+{
+ vf::lbm::Coefficients coefficients;
+ calculateCoefficients(coefficients, icellC, omegaC, xoff, yoff, zoff);
+
+ vf::lbm::interpolateCF(icellF.BSW, omegaF, vf::basics::constant::c1o2, coefficients, -0.25, -0.25, -0.25);
+ vf::lbm::interpolateCF(icellF.BNE, omegaF, vf::basics::constant::c1o2, coefficients, 0.25, 0.25, -0.25);
+ vf::lbm::interpolateCF(icellF.TNW, omegaF, vf::basics::constant::c1o2, coefficients, -0.25, 0.25, 0.25);
+ vf::lbm::interpolateCF(icellF.TSE, omegaF, vf::basics::constant::c1o2, coefficients, 0.25, -0.25, 0.25);
+ vf::lbm::interpolateCF(icellF.BNW, omegaF, vf::basics::constant::c1o2, coefficients, -0.25, 0.25, -0.25);
+ vf::lbm::interpolateCF(icellF.BSE, omegaF, vf::basics::constant::c1o2, coefficients, 0.25, -0.25, -0.25);
+ vf::lbm::interpolateCF(icellF.TSW, omegaF, vf::basics::constant::c1o2, coefficients, -0.25, -0.25, 0.25);
+ vf::lbm::interpolateCF(icellF.TNE, omegaF, vf::basics::constant::c1o2, coefficients, 0.25, 0.25, 0.25);
+}
+
+void CompressibleOffsetMomentsInterpolator::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
+{
+ vf::lbm::Coefficients coefficients;
+ calculateCoefficients(coefficients, icellF, omegaF, xoff, yoff, zoff);
+
+ vf::lbm::interpolateFC(icellC, vf::basics::constant::c2o1, omegaC, coefficients);
+}
diff --git a/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetMomentsInterpolator.h b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetMomentsInterpolator.h
new file mode 100644
index 0000000000000000000000000000000000000000..444170d565fc80cf735cd134f0b46ac54fc38902
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetMomentsInterpolator.h
@@ -0,0 +1,41 @@
+#ifndef CompressibleOffsetMomentsInterpolationProcessor_H_
+#define CompressibleOffsetMomentsInterpolationProcessor_H_
+
+#include "Interpolator.h"
+#include "D3Q27System.h"
+
+//////////////////////////////////////////////////////////////////////////
+//it works only for cascaded LBM
+//super compact interpolation method by Martin Geier
+//////////////////////////////////////////////////////////////////////////
+
+class CompressibleOffsetMomentsInterpolator : public Interpolator
+{
+public:
+ CompressibleOffsetMomentsInterpolator() = default;
+ CompressibleOffsetMomentsInterpolator(real omegaC, real omegaF);
+ InterpolationProcessorPtr clone() override;
+
+ void setOmegas(real omegaC, real omegaF) override;
+
+ void interpolateCoarseToFine(D3Q27ICell &icellC, D3Q27ICell &icellF) override;
+ void interpolateCoarseToFine(D3Q27ICell &icellC, D3Q27ICell &icellF, real xoff, real yoff, real zoff) override;
+ void interpolateFineToCoarse(D3Q27ICell &icellF, real *icellC) override;
+ void interpolateFineToCoarse(D3Q27ICell &icellF, real *icellC, real xoff, real yoff, real zoff) override;
+
+private:
+ real omegaC{ 0.0 }, omegaF{ 0.0 };
+};
+
+//////////////////////////////////////////////////////////////////////////
+inline void CompressibleOffsetMomentsInterpolator::interpolateCoarseToFine(D3Q27ICell &icellC, D3Q27ICell &icellF)
+{
+ this->interpolateCoarseToFine(icellC, icellF, 0.0, 0.0, 0.0);
+}
+//////////////////////////////////////////////////////////////////////////
+inline void CompressibleOffsetMomentsInterpolator::interpolateFineToCoarse(D3Q27ICell &icellF, real *icellC)
+{
+ this->interpolateFineToCoarse(icellF, icellC, 0.0, 0.0, 0.0);
+}
+
+#endif
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetSquarePressureInterpolator.cpp
similarity index 96%
rename from src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
rename to src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetSquarePressureInterpolator.cpp
index dee6d12a5812e29d91aa1c12c25d61ade0759ef8..3b5d7386ae4e615a6f89d6ed07eb78d02b295799 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetSquarePressureInterpolator.cpp
@@ -1,10 +1,10 @@
-#include "CompressibleOffsetSquarePressureInterpolationProcessor.h"
+#include "CompressibleOffsetSquarePressureInterpolator.h"
#include "D3Q27System.h"
//using namespace UbMath;
using namespace vf::basics::constant;
-CompressibleOffsetSquarePressureInterpolationProcessor::CompressibleOffsetSquarePressureInterpolationProcessor()
+CompressibleOffsetSquarePressureInterpolator::CompressibleOffsetSquarePressureInterpolator()
{
this->bulkOmegaToOmega = false;
@@ -12,7 +12,7 @@ CompressibleOffsetSquarePressureInterpolationProcessor::CompressibleOffsetSquare
this->OxxPyyPzzF = c1o1;
}
//////////////////////////////////////////////////////////////////////////
-CompressibleOffsetSquarePressureInterpolationProcessor::CompressibleOffsetSquarePressureInterpolationProcessor(real omegaC, real omegaF)
+CompressibleOffsetSquarePressureInterpolator::CompressibleOffsetSquarePressureInterpolator(real omegaC, real omegaF)
: omegaC(omegaC), omegaF(omegaF)
{
this->bulkOmegaToOmega = false;
@@ -20,32 +20,32 @@ CompressibleOffsetSquarePressureInterpolationProcessor::CompressibleOffsetSquare
this->OxxPyyPzzF = c1o1;
}
//////////////////////////////////////////////////////////////////////////
-CompressibleOffsetSquarePressureInterpolationProcessor::~CompressibleOffsetSquarePressureInterpolationProcessor()
+CompressibleOffsetSquarePressureInterpolator::~CompressibleOffsetSquarePressureInterpolator()
= default;
//////////////////////////////////////////////////////////////////////////
-InterpolationProcessorPtr CompressibleOffsetSquarePressureInterpolationProcessor::clone()
+InterpolationProcessorPtr CompressibleOffsetSquarePressureInterpolator::clone()
{
- InterpolationProcessorPtr iproc = InterpolationProcessorPtr (new CompressibleOffsetSquarePressureInterpolationProcessor(this->omegaC, this->omegaF));
+ InterpolationProcessorPtr iproc = InterpolationProcessorPtr (new CompressibleOffsetSquarePressureInterpolator(this->omegaC, this->omegaF));
if (bulkOmegaToOmega)
{
- dynamicPointerCast<CompressibleOffsetSquarePressureInterpolationProcessor>(iproc)->OxxPyyPzzC = omegaC;
- dynamicPointerCast<CompressibleOffsetSquarePressureInterpolationProcessor>(iproc)->OxxPyyPzzF = omegaF;
+ dynamicPointerCast<CompressibleOffsetSquarePressureInterpolator>(iproc)->OxxPyyPzzC = omegaC;
+ dynamicPointerCast<CompressibleOffsetSquarePressureInterpolator>(iproc)->OxxPyyPzzF = omegaF;
}
else
{
- dynamicPointerCast<CompressibleOffsetSquarePressureInterpolationProcessor>(iproc)->OxxPyyPzzC = c1o1;
- dynamicPointerCast<CompressibleOffsetSquarePressureInterpolationProcessor>(iproc)->OxxPyyPzzF = c1o1;
+ dynamicPointerCast<CompressibleOffsetSquarePressureInterpolator>(iproc)->OxxPyyPzzC = c1o1;
+ dynamicPointerCast<CompressibleOffsetSquarePressureInterpolator>(iproc)->OxxPyyPzzF = c1o1;
}
return iproc;
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::setOmegas( real omegaC, real omegaF )
+void CompressibleOffsetSquarePressureInterpolator::setOmegas( real omegaC, real omegaF )
{
this->omegaC = omegaC;
this->omegaF = omegaF;
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::setOffsets(real xoff, real yoff, real zoff)
+void CompressibleOffsetSquarePressureInterpolator::setOffsets(real xoff, real yoff, real zoff)
{
this->xoff = xoff;
this->yoff = yoff;
@@ -55,7 +55,7 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::setOffsets(real xof
this->zoff_sq = zoff * zoff;
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
+void CompressibleOffsetSquarePressureInterpolator::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
calcInterpolatedCoefficiets(icellC, omegaC, c1o2);
@@ -69,14 +69,14 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::interpolateCoarseTo
calcInterpolatedNodeCF(icellF.TNE, omegaF, c1o4, c1o4, c1o4, calcPressTNE(), c1o1, c1o1, c1o1);
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
+void CompressibleOffsetSquarePressureInterpolator::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
calcInterpolatedCoefficiets(icellF, omegaF, c2o1);
calcInterpolatedNodeFC(icellC, omegaC);
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::calcMoments(const real* const f, real omega, real& press, real& vx1, real& vx2, real& vx3,
+void CompressibleOffsetSquarePressureInterpolator::calcMoments(const real* const f, real omega, real& press, real& vx1, real& vx2, real& vx3,
real& kxy, real& kyz, real& kxz, real& kxxMyy, real& kxxMzz)
{
using namespace D3Q27System;
@@ -94,7 +94,7 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcMoments(const r
kxxMzz = -c3o1/c2o1*omega*((((f[DIR_MP0]+f[DIR_PM0])-(f[DIR_0MM]+f[DIR_0PP]))+((f[DIR_MM0]+f[DIR_PP0])-(f[DIR_0MP]+f[DIR_0PM])))+((f[DIR_M00]+f[DIR_P00])-(f[DIR_00M]+f[DIR_00P]))/(c1o1 + drho)-(vx1*vx1-vx3*vx3));
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
+void CompressibleOffsetSquarePressureInterpolator::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
{
real vx1_SWT,vx2_SWT,vx3_SWT;
real vx1_NWT,vx2_NWT,vx3_NWT;
@@ -475,7 +475,7 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoe
yz_TNW = c1o16*eps_new *(( bxyz + cxyz)/(c72o1*o));
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNodeCF(real* f, real omega, real x, real y, real z, real press, real xs, real ys, real zs)
+void CompressibleOffsetSquarePressureInterpolator::calcInterpolatedNodeCF(real* f, real omega, real x, real y, real z, real press, real xs, real ys, real zs)
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
@@ -812,8 +812,8 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNod
f[DIR_MMM] = mfaaa;
}
//////////////////////////////////////////////////////////////////////////
-//Position SWB -c1o4, -c1o4, -c1o4
-real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressBSW()
+//Position SWB -0.25, -0.25, -0.25
+real CompressibleOffsetSquarePressureInterpolator::calcPressBSW()
{
return press_SWT * (c9o64 + c3o16 * xoff + c3o16 * yoff - c9o16 * zoff) +
press_NWT * (c3o64 + c1o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
@@ -826,7 +826,7 @@ real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressBSW()
}
//////////////////////////////////////////////////////////////////////////
//Position SWT -0.25, -0.25, 0.25
-real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressTSW()
+real CompressibleOffsetSquarePressureInterpolator::calcPressTSW()
{
return press_SWT * (c27o64 + c9o16 * xoff + c9o16 * yoff - c9o16 * zoff) +
press_NWT * (c9o64 + c3o16 * xoff - c9o16 * yoff - c3o16 * zoff) +
@@ -839,7 +839,7 @@ real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressTSW()
}
//////////////////////////////////////////////////////////////////////////
//Position SET 0.25, -0.25, 0.25
-real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressTSE()
+real CompressibleOffsetSquarePressureInterpolator::calcPressTSE()
{
return press_SET * (c27o64 - c9o16 * xoff + c9o16 * yoff - c9o16 * zoff) +
press_NET * (c9o64 - c3o16 * xoff - c9o16 * yoff - c3o16 * zoff) +
@@ -852,7 +852,7 @@ real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressTSE()
}
//////////////////////////////////////////////////////////////////////////
//Position SEB 0.25, -0.25, -0.25
-real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressBSE()
+real CompressibleOffsetSquarePressureInterpolator::calcPressBSE()
{
return press_SET * (c9o64 - c3o16 * xoff + c3o16 * yoff - c9o16 * zoff) +
press_NET * (c3o64 - c1o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
@@ -865,7 +865,7 @@ real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressBSE()
}
//////////////////////////////////////////////////////////////////////////
//Position NWB -0.25, 0.25, -0.25
-real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressBNW()
+real CompressibleOffsetSquarePressureInterpolator::calcPressBNW()
{
return press_NWT * (c9o64 + c3o16 * xoff - c3o16 * yoff - c9o16 * zoff) +
press_NET * (c3o64 - c3o16 * xoff - c1o16 * yoff - c3o16 * zoff) +
@@ -878,7 +878,7 @@ real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressBNW()
}
//////////////////////////////////////////////////////////////////////////
//Position NWT -0.25, 0.25, 0.25
-real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressTNW()
+real CompressibleOffsetSquarePressureInterpolator::calcPressTNW()
{
return press_NWT * (c27o64 + c9o16 * xoff - c9o16 * yoff - c9o16 * zoff) +
press_NET * (c9o64 - c9o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
@@ -891,7 +891,7 @@ real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressTNW()
}
//////////////////////////////////////////////////////////////////////////
//Position NET 0.25, 0.25, 0.25
-real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressTNE()
+real CompressibleOffsetSquarePressureInterpolator::calcPressTNE()
{
return press_NET * (c27o64 - c9o16 * xoff - c9o16 * yoff - c9o16 * zoff) +
press_NWT * (c9o64 + c9o16 * xoff - c3o16 * yoff - c3o16 * zoff) +
@@ -904,7 +904,7 @@ real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressTNE()
}
//////////////////////////////////////////////////////////////////////////
//Position NEB 0.25, 0.25, -0.25
-real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressBNE()
+real CompressibleOffsetSquarePressureInterpolator::calcPressBNE()
{
return press_NET * (c9o64 - c3o16 * xoff - c3o16 * yoff - c9o16 * zoff) +
press_NWT * (c3o64 + c3o16 * xoff - c1o16 * yoff - c3o16 * zoff) +
@@ -917,7 +917,7 @@ real CompressibleOffsetSquarePressureInterpolationProcessor::calcPressBNE()
}
//////////////////////////////////////////////////////////////////////////
//Position C 0.0, 0.0, 0.0
-void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNodeFC(real* f, real omega)
+void CompressibleOffsetSquarePressureInterpolator::calcInterpolatedNodeFC(real* f, real omega)
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
@@ -1266,14 +1266,14 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNod
f[DIR_MMM] = mfaaa;
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedVelocity(real x, real y, real z, real& vx1, real& vx2, real& vx3)
+void CompressibleOffsetSquarePressureInterpolator::calcInterpolatedVelocity(real x, real y, real z, real& vx1, real& vx2, real& vx3)
{
vx1 = a0 + ax*x + ay*y + az*z + axx*x*x + ayy*y*y + azz*z*z + axy*x*y + axz*x*z + ayz*y*z+axyz*x*y*z;
vx2 = b0 + bx*x + by*y + bz*z + bxx*x*x + byy*y*y + bzz*z*z + bxy*x*y + bxz*x*z + byz*y*z+bxyz*x*y*z;
vx3 = c0 + cx*x + cy*y + cz*z + cxx*x*x + cyy*y*y + czz*z*z + cxy*x*y + cxz*x*z + cyz*y*z+cxyz*x*y*z;
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz)
+void CompressibleOffsetSquarePressureInterpolator::calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz)
{
tauxx=ax+c2o1*axx*x+axy*y+axz*z+axyz*y*z;
tauyy=by+c2o1*byy*y+bxy*x+byz*z+bxyz*x*z;
@@ -1283,7 +1283,7 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedShe
tauyz=c1o2*((bz+c2o1*bzz*z+bxz*x+byz*y+bxyz*x*y)+(cy+c2o1*cyy*y+cxy*x+cyz*z+cxyz*x*z));
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetSquarePressureInterpolationProcessor::setBulkOmegaToOmega(bool value)
+void CompressibleOffsetSquarePressureInterpolator::setBulkOmegaToOmega(bool value)
{
bulkOmegaToOmega = value;
}
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetSquarePressureInterpolator.h
similarity index 84%
rename from src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h
rename to src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetSquarePressureInterpolator.h
index d9285289f63e7dfca694342df092b6e5f4ecb4d5..8a6308f947f79305079b1fa45edff0fb9c703a55 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/CompressibleOffsetSquarePressureInterpolator.h
@@ -1,7 +1,7 @@
#ifndef CompressibleOffsetSquarePressureInterpolationProcessor_H_
#define CompressibleOffsetSquarePressureInterpolationProcessor_H_
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27System.h"
//////////////////////////////////////////////////////////////////////////
@@ -9,14 +9,14 @@
//super compact interpolation method by Martin Geier
//////////////////////////////////////////////////////////////////////////
-class CompressibleOffsetSquarePressureInterpolationProcessor;
+class CompressibleOffsetSquarePressureInterpolator;
-class CompressibleOffsetSquarePressureInterpolationProcessor : public InterpolationProcessor
+class CompressibleOffsetSquarePressureInterpolator : public Interpolator
{
public:
- CompressibleOffsetSquarePressureInterpolationProcessor();
- CompressibleOffsetSquarePressureInterpolationProcessor(real omegaC, real omegaF);
- ~CompressibleOffsetSquarePressureInterpolationProcessor() override;
+ CompressibleOffsetSquarePressureInterpolator();
+ CompressibleOffsetSquarePressureInterpolator(real omegaC, real omegaF);
+ ~CompressibleOffsetSquarePressureInterpolator() override;
InterpolationProcessorPtr clone() override;
void setOmegas(real omegaC, real omegaF) override;
void interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF) override;
@@ -68,12 +68,12 @@ private:
};
//////////////////////////////////////////////////////////////////////////
-inline void CompressibleOffsetSquarePressureInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF)
+inline void CompressibleOffsetSquarePressureInterpolator::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF)
{
this->interpolateCoarseToFine(icellC, icellF, 0.0, 0.0, 0.0);
}
//////////////////////////////////////////////////////////////////////////
-inline void CompressibleOffsetSquarePressureInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC)
+inline void CompressibleOffsetSquarePressureInterpolator::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC)
{
this->interpolateFineToCoarse(icellF, icellC, 0.0, 0.0, 0.0);
}
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/Interpolation/IncompressibleOffsetInterpolator.cpp
similarity index 95%
rename from src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
rename to src/cpu/VirtualFluidsCore/LBM/Interpolation/IncompressibleOffsetInterpolator.cpp
index 26635dbac5d4b2844e6f0205f30a063c5533d612..0cd44125559e1ccf2ed0704f1a7214888a27739d 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/IncompressibleOffsetInterpolator.cpp
@@ -1,31 +1,31 @@
-#include "IncompressibleOffsetInterpolationProcessor.h"
+#include "IncompressibleOffsetInterpolator.h"
#include "D3Q27System.h"
//////////////////////////////////////////////////////////////////////////
-IncompressibleOffsetInterpolationProcessor::IncompressibleOffsetInterpolationProcessor(real omegaC, real omegaF)
+IncompressibleOffsetInterpolator::IncompressibleOffsetInterpolator(real omegaC, real omegaF)
: omegaC(omegaC), omegaF(omegaF)
{
}
//////////////////////////////////////////////////////////////////////////
-InterpolationProcessorPtr IncompressibleOffsetInterpolationProcessor::clone()
+InterpolationProcessorPtr IncompressibleOffsetInterpolator::clone()
{
- InterpolationProcessorPtr iproc = InterpolationProcessorPtr (new IncompressibleOffsetInterpolationProcessor(this->omegaC, this->omegaF));
+ InterpolationProcessorPtr iproc = InterpolationProcessorPtr (new IncompressibleOffsetInterpolator(this->omegaC, this->omegaF));
//dynamicPointerCast<D3Q27IncompressibleOffsetInterpolationProcessor>(iproc)->forcingC = forcingC;
//dynamicPointerCast<D3Q27IncompressibleOffsetInterpolationProcessor>(iproc)->forcingF = forcingF;
return iproc;
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::setOmegas( real omegaC, real omegaF )
+void IncompressibleOffsetInterpolator::setOmegas( real omegaC, real omegaF )
{
this->omegaC = omegaC;
this->omegaF = omegaF;
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::setOffsets(real xoff, real yoff, real zoff)
+void IncompressibleOffsetInterpolator::setOffsets(real xoff, real yoff, real zoff)
{
this->xoff = xoff;
this->yoff = yoff;
@@ -35,7 +35,7 @@ void IncompressibleOffsetInterpolationProcessor::setOffsets(real xoff, real yoff
this->zoff_sq = zoff * zoff;
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
+void IncompressibleOffsetInterpolator::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
{
using namespace vf::basics::constant;
@@ -51,14 +51,14 @@ void IncompressibleOffsetInterpolationProcessor::interpolateCoarseToFine(D3Q27IC
calcInterpolatedNode(icellF.TNE, omegaF, c1o4, c1o4, c1o4, calcPressTNE(), c1o1, c1o1, c1o1);
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
+void IncompressibleOffsetInterpolator::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
calcInterpolatedCoefficiets(icellF, omegaF, vf::basics::constant::c2o1);
calcInterpolatedNodeFC(icellC, omegaC);
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::calcMoments(const real* const f, real omega, real& press, real& vx1, real& vx2, real& vx3,
+void IncompressibleOffsetInterpolator::calcMoments(const real* const f, real omega, real& press, real& vx1, real& vx2, real& vx3,
real& kxy, real& kyz, real& kxz, real& kxxMyy, real& kxxMzz)
{
using namespace D3Q27System;
@@ -104,7 +104,7 @@ void IncompressibleOffsetInterpolationProcessor::calcMoments(const real* const f
//UBLOG(logINFO,"f[TN] = " << f[TN] << " TN = " << TN);
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
+void IncompressibleOffsetInterpolator::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
{
using namespace vf::basics::constant;
@@ -532,7 +532,7 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
yz_TNW = c1o16*eps_new *(( bxyz + cxyz)/(c72o1*o));
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNode(real* f, real /*omega*/, real /*x*/, real /*y*/, real /*z*/, real press, real xs, real ys, real zs)
+void IncompressibleOffsetInterpolator::calcInterpolatedNode(real* f, real /*omega*/, real /*x*/, real /*y*/, real /*z*/, real press, real xs, real ys, real zs)
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
@@ -581,7 +581,7 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNode(real* f, r
}
//////////////////////////////////////////////////////////////////////////
//Position SWB -0.25, -0.25, -0.25
-real IncompressibleOffsetInterpolationProcessor::calcPressBSW()
+real IncompressibleOffsetInterpolator::calcPressBSW()
{
using namespace vf::basics::constant;
@@ -596,7 +596,7 @@ real IncompressibleOffsetInterpolationProcessor::calcPressBSW()
}
//////////////////////////////////////////////////////////////////////////
//Position SWT -0.25, -0.25, 0.25
-real IncompressibleOffsetInterpolationProcessor::calcPressTSW()
+real IncompressibleOffsetInterpolator::calcPressTSW()
{
using namespace vf::basics::constant;
@@ -611,7 +611,7 @@ real IncompressibleOffsetInterpolationProcessor::calcPressTSW()
}
//////////////////////////////////////////////////////////////////////////
//Position SET 0.25, -0.25, 0.25
-real IncompressibleOffsetInterpolationProcessor::calcPressTSE()
+real IncompressibleOffsetInterpolator::calcPressTSE()
{
using namespace vf::basics::constant;
@@ -626,7 +626,7 @@ real IncompressibleOffsetInterpolationProcessor::calcPressTSE()
}
//////////////////////////////////////////////////////////////////////////
//Position SEB 0.25, -0.25, -0.25
-real IncompressibleOffsetInterpolationProcessor::calcPressBSE()
+real IncompressibleOffsetInterpolator::calcPressBSE()
{
using namespace vf::basics::constant;
@@ -641,7 +641,7 @@ real IncompressibleOffsetInterpolationProcessor::calcPressBSE()
}
//////////////////////////////////////////////////////////////////////////
//Position NWB -0.25, 0.25, -0.25
-real IncompressibleOffsetInterpolationProcessor::calcPressBNW()
+real IncompressibleOffsetInterpolator::calcPressBNW()
{
using namespace vf::basics::constant;
@@ -656,7 +656,7 @@ real IncompressibleOffsetInterpolationProcessor::calcPressBNW()
}
//////////////////////////////////////////////////////////////////////////
//Position NWT -0.25, 0.25, 0.25
-real IncompressibleOffsetInterpolationProcessor::calcPressTNW()
+real IncompressibleOffsetInterpolator::calcPressTNW()
{
using namespace vf::basics::constant;
@@ -671,7 +671,7 @@ real IncompressibleOffsetInterpolationProcessor::calcPressTNW()
}
//////////////////////////////////////////////////////////////////////////
//Position NET 0.25, 0.25, 0.25
-real IncompressibleOffsetInterpolationProcessor::calcPressTNE()
+real IncompressibleOffsetInterpolator::calcPressTNE()
{
using namespace vf::basics::constant;
@@ -686,7 +686,7 @@ real IncompressibleOffsetInterpolationProcessor::calcPressTNE()
}
//////////////////////////////////////////////////////////////////////////
//Position NEB 0.25, 0.25, -0.25
-real IncompressibleOffsetInterpolationProcessor::calcPressBNE()
+real IncompressibleOffsetInterpolator::calcPressBNE()
{
using namespace vf::basics::constant;
@@ -701,7 +701,7 @@ real IncompressibleOffsetInterpolationProcessor::calcPressBNE()
}
//////////////////////////////////////////////////////////////////////////
//Position C 0.0, 0.0, 0.0
-void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f, real omega)
+void IncompressibleOffsetInterpolator::calcInterpolatedNodeFC(real* f, real omega)
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
@@ -792,14 +792,14 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f,
f[DIR_000] = f_ZERO + feq[DIR_000];
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::calcInterpolatedVelocity(real x, real y, real z, real& vx1, real& vx2, real& vx3)
+void IncompressibleOffsetInterpolator::calcInterpolatedVelocity(real x, real y, real z, real& vx1, real& vx2, real& vx3)
{
vx1 = a0 + ax*x + ay*y + az*z + axx*x*x + ayy*y*y + azz*z*z + axy*x*y + axz*x*z + ayz*y*z+axyz*x*y*z;
vx2 = b0 + bx*x + by*y + bz*z + bxx*x*x + byy*y*y + bzz*z*z + bxy*x*y + bxz*x*z + byz*y*z+bxyz*x*y*z;
vx3 = c0 + cx*x + cy*y + cz*z + cxx*x*x + cyy*y*y + czz*z*z + cxy*x*y + cxz*x*z + cyz*y*z+cxyz*x*y*z;
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz)
+void IncompressibleOffsetInterpolator::calcInterpolatedShearStress(real x, real y, real z,real& tauxx, real& tauyy, real& tauzz,real& tauxy, real& tauxz, real& tauyz)
{
using namespace vf::basics::constant;
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/Interpolation/IncompressibleOffsetInterpolator.h
similarity index 83%
rename from src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
rename to src/cpu/VirtualFluidsCore/LBM/Interpolation/IncompressibleOffsetInterpolator.h
index 866c0f6933e67d66b3b36d65a0f484ba2d8cbf86..2fee5d62c30162e0f2af514e3551c8aa93ca9dab 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/IncompressibleOffsetInterpolator.h
@@ -1,7 +1,7 @@
#ifndef IncompressibleOffsetInterpolationProcessor_H_
#define IncompressibleOffsetInterpolationProcessor_H_
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "D3Q27System.h"
//////////////////////////////////////////////////////////////////////////
@@ -9,15 +9,15 @@
//super compact interpolation method by Martin Geier
//////////////////////////////////////////////////////////////////////////
-class IncompressibleOffsetInterpolationProcessor;
-using D3Q27IncompressibleOffsetInterpolationProcessorPtr = SPtr<IncompressibleOffsetInterpolationProcessor>;
+class IncompressibleOffsetInterpolator;
+using D3Q27IncompressibleOffsetInterpolationProcessorPtr = SPtr<IncompressibleOffsetInterpolator>;
-class IncompressibleOffsetInterpolationProcessor : public InterpolationProcessor
+class IncompressibleOffsetInterpolator : public Interpolator
{
public:
- IncompressibleOffsetInterpolationProcessor() = default;
- IncompressibleOffsetInterpolationProcessor(real omegaC, real omegaF);
- ~IncompressibleOffsetInterpolationProcessor() override = default;
+ IncompressibleOffsetInterpolator() = default;
+ IncompressibleOffsetInterpolator(real omegaC, real omegaF);
+ ~IncompressibleOffsetInterpolator() override = default;
InterpolationProcessorPtr clone() override;
void setOmegas(real omegaC, real omegaF) override;
void interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF) override;
@@ -25,7 +25,7 @@ public:
void interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC) override;
void interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff) override;
//real forcingC, forcingF;
-protected:
+protected:
private:
real omegaC{0.0}, omegaF{0.0};
real a0, ax, ay, az, axx, ayy, azz, axy, axz, ayz, b0, bx, by, bz, bxx, byy, bzz, bxy, bxz, byz, c0, cx, cy, cz, cxx, cyy, czz, cxy, cxz, cyz, axyz, bxyz, cxyz;
@@ -64,12 +64,12 @@ private:
};
//////////////////////////////////////////////////////////////////////////
-inline void IncompressibleOffsetInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF)
+inline void IncompressibleOffsetInterpolator::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF)
{
this->interpolateCoarseToFine(icellC, icellF, 0.0, 0.0, 0.0);
}
//////////////////////////////////////////////////////////////////////////
-inline void IncompressibleOffsetInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC)
+inline void IncompressibleOffsetInterpolator::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC)
{
this->interpolateFineToCoarse(icellF, icellC, 0.0, 0.0, 0.0);
}
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/Interpolation/Interpolator.cpp
similarity index 73%
rename from src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
rename to src/cpu/VirtualFluidsCore/LBM/Interpolation/Interpolator.cpp
index a82f397c9f89d7605d8409b8f32f8d87a8f8a402..f28b1efed4836ca71b09a390078dd2aaf5463710 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/Interpolator.cpp
@@ -1,11 +1,22 @@
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
+
+
+struct Range
+{
+ Range(int maxX1, int maxX2, int maxX3) : m_maxX1(maxX1), m_maxX2(maxX2), m_maxX3(maxX3) {}
+ inline bool operator()(int x1, int x2, int x3)
+ {
+ return x1 >= 0 && x1 < m_maxX1 && x2 >= 0 && x2 < m_maxX2 && x3 >= 0 && x3 < m_maxX3;
+ }
+
+ int m_maxX1;
+ int m_maxX2;
+ int m_maxX3;
+};
+
//////////////////////////////////////////////////////////////////////////
-InterpolationProcessor::InterpolationProcessor() = default;
-//////////////////////////////////////////////////////////////////////////
-InterpolationProcessor::~InterpolationProcessor() = default;
-//////////////////////////////////////////////////////////////////////////
-void InterpolationProcessor::readICell(SPtr<DistributionArray3D> f, D3Q27ICell &icell, int x1, int x2, int x3)
+void Interpolator::readICell(SPtr<DistributionArray3D> f, D3Q27ICell &icell, int x1, int x2, int x3)
{
f->getDistribution(icell.BSW, x1, x2, x3);
f->getDistribution(icell.BSE, x1 + 1, x2, x3);
@@ -17,7 +28,7 @@ void InterpolationProcessor::readICell(SPtr<DistributionArray3D> f, D3Q27ICell &
f->getDistribution(icell.TNE, x1 + 1, x2 + 1, x3 + 1);
}
//////////////////////////////////////////////////////////////////////////
-void InterpolationProcessor::writeICell(SPtr<DistributionArray3D> f, const D3Q27ICell &icell, int x1, int x2, int x3)
+void Interpolator::writeICell(SPtr<DistributionArray3D> f, const D3Q27ICell &icell, int x1, int x2, int x3)
{
f->setDistribution(icell.BSW, x1, x2, x3);
f->setDistribution(icell.BSE, x1 + 1, x2, x3);
@@ -29,7 +40,7 @@ void InterpolationProcessor::writeICell(SPtr<DistributionArray3D> f, const D3Q27
f->setDistribution(icell.TNE, x1 + 1, x2 + 1, x3 + 1);
}
//////////////////////////////////////////////////////////////////////////
-void InterpolationProcessor::writeICellInv(SPtr<DistributionArray3D> f, const D3Q27ICell &icell, int x1, int x2, int x3)
+void Interpolator::writeICellInv(SPtr<DistributionArray3D> f, const D3Q27ICell &icell, int x1, int x2, int x3)
{
f->setDistributionInv(icell.BSW, x1, x2, x3);
f->setDistributionInv(icell.BSE, x1 + 1, x2, x3);
@@ -41,18 +52,18 @@ void InterpolationProcessor::writeICellInv(SPtr<DistributionArray3D> f, const D3
f->setDistributionInv(icell.TNE, x1 + 1, x2 + 1, x3 + 1);
}
//////////////////////////////////////////////////////////////////////////
-void InterpolationProcessor::writeINode(SPtr<DistributionArray3D> f, const real *const inode, int x1, int x2, int x3)
+void Interpolator::writeINode(SPtr<DistributionArray3D> f, const real *const inode, int x1, int x2, int x3)
{
f->setDistribution(inode, x1, x2, x3);
}
//////////////////////////////////////////////////////////////////////////
-void InterpolationProcessor::writeINodeInv(SPtr<DistributionArray3D> f, const real *const inode, int x1, int x2,
+void Interpolator::writeINodeInv(SPtr<DistributionArray3D> f, const real *const inode, int x1, int x2,
int x3)
{
f->setDistributionInv(inode, x1, x2, x3);
}
//////////////////////////////////////////////////////////////////////////
-bool InterpolationProcessor::iCellHasSolid(const SPtr<BCArray3D> bcArray, int x1, int x2, int x3)
+bool Interpolator::iCellHasSolid(const SPtr<BCArray3D> bcArray, int x1, int x2, int x3)
{
for (int ix3 = x3; ix3 <= x3 + 1; ix3++)
for (int ix2 = x2; ix2 <= x2 + 1; ix2++)
@@ -63,13 +74,12 @@ bool InterpolationProcessor::iCellHasSolid(const SPtr<BCArray3D> bcArray, int x1
return false;
}
//////////////////////////////////////////////////////////////////////////
-bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SPtr<DistributionArray3D> f,
+bool Interpolator::findNeighborICell(const SPtr<BCArray3D> bcArray, SPtr<DistributionArray3D> f,
D3Q27ICell &icell, int maxX1, int maxX2, int maxX3, int x1, int x2,
int x3, real &xoff, real &yoff, real &zoff)
{
- m_maxX1 = maxX1;
- m_maxX2 = maxX2;
- m_maxX3 = maxX3;
+
+ Range inRange(maxX1, maxX2, maxX3);
// GoWest
if (inRange(x1 - 1, x2, x3) && !iCellHasSolid(bcArray, x1 - 1, x2, x3)) {
@@ -80,7 +90,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
}
// GoEast
else if (inRange(x1 + 2, x2, x3) &&
- !iCellHasSolid(bcArray, x1 + 1, x2, x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ !iCellHasSolid(bcArray, x1 + 1, x2, x3)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 + 1, x2, x3);
xoff = -1;
@@ -96,7 +106,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
}
// GoNorth
else if (inRange(x1, x2 + 2, x3) &&
- !iCellHasSolid(bcArray, x1, x2 + 1, x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ !iCellHasSolid(bcArray, x1, x2 + 1, x3)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1, x2 + 1, x3);
xoff = 0;
@@ -112,7 +122,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
}
// GoTop
else if (inRange(x1, x2, x3 + 2) &&
- !iCellHasSolid(bcArray, x1, x2, x3 + 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ !iCellHasSolid(bcArray, x1, x2, x3 + 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1, x2, x3 + 1);
xoff = 0;
@@ -122,7 +132,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoNW
else if (inRange(x1 - 1, x2 + 2, x3) &&
!iCellHasSolid(bcArray, x1 - 1, x2 + 1,
- x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 - 1, x2 + 1, x3);
xoff = 1;
@@ -132,7 +142,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoNE
else if (inRange(x1 + 2, x2 + 2, x3) &&
!iCellHasSolid(bcArray, x1 + 1, x2 + 1,
- x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 + 1, x2 + 1, x3);
xoff = -1;
@@ -142,7 +152,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoSW
else if (inRange(x1 - 1, x2 - 1, x3) &&
!iCellHasSolid(bcArray, x1 - 1, x2 - 1,
- x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 - 1, x2 - 1, x3);
xoff = 1;
@@ -152,7 +162,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoSE
else if (inRange(x1 + 2, x2 - 1, x3) &&
!iCellHasSolid(bcArray, x1 + 1, x2 - 1,
- x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 + 1, x2 - 1, x3);
xoff = -1;
@@ -169,7 +179,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoBE
else if (inRange(x1 + 2, x2, x3 - 1) &&
!iCellHasSolid(bcArray, x1 + 1, x2,
- x3 - 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 - 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 + 1, x2, x3 - 1);
xoff = -1;
@@ -186,7 +196,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoBN
else if (inRange(x1, x2 + 2, x3 - 1) &&
!iCellHasSolid(bcArray, x1, x2 + 1,
- x3 - 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 - 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1, x2 + 1, x3 - 1);
xoff = 0;
@@ -203,7 +213,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoTE
else if (inRange(x1 + 2, x2, x3 + 2) &&
!iCellHasSolid(bcArray, x1 + 1, x2,
- x3 + 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 + 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 + 1, x2, x3 + 1);
xoff = -1;
@@ -220,7 +230,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoTN
else if (inRange(x1, x2 + 2, x3 + 2) &&
!iCellHasSolid(bcArray, x1, x2 + 1,
- x3 + 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 + 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1, x2 + 1, x3 + 1);
xoff = 0;
@@ -230,7 +240,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoTNW
else if (inRange(x1 - 1, x2 + 2, x3 + 2) &&
!iCellHasSolid(bcArray, x1 - 1, x2 + 1,
- x3 + 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 + 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 - 1, x2 + 1, x3 + 1);
xoff = 1;
@@ -240,7 +250,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoTNE
else if (inRange(x1 + 2, x2 + 2, x3 + 2) &&
!iCellHasSolid(bcArray, x1 + 1, x2 + 1,
- x3 + 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 + 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 + 1, x2 + 1, x3 + 1);
xoff = -1;
@@ -250,7 +260,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoTSE
else if (inRange(x1 + 2, x2 - 1, x3 + 2) &&
!iCellHasSolid(bcArray, x1 + 1, x2 - 1,
- x3 + 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 + 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 + 1, x2 - 1, x3 + 1);
xoff = -1;
@@ -260,7 +270,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoTSW
else if (inRange(x1 - 1, x2 - 1, x3 + 2) &&
!iCellHasSolid(bcArray, x1 - 1, x2 - 1,
- x3 + 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 + 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 - 1, x2 - 1, x3 + 1);
xoff = 1;
@@ -270,7 +280,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoBNW
else if (inRange(x1 - 1, x2 + 2, x3 - 1) &&
!iCellHasSolid(bcArray, x1 - 1, x2 + 1,
- x3 - 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 - 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 - 1, x2 + 1, x3 - 1);
xoff = 1;
@@ -280,7 +290,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoBNE
else if (inRange(x1 + 2, x2 + 2, x3 - 1) &&
!iCellHasSolid(bcArray, x1 + 1, x2 + 1,
- x3 - 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 - 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 + 1, x2 + 1, x3 - 1);
xoff = -1;
@@ -290,7 +300,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoBSE
else if (inRange(x1 + 2, x2 - 1, x3 - 1) &&
!iCellHasSolid(bcArray, x1 + 1, x2 - 1,
- x3 - 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 - 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 + 1, x2 - 1, x3 - 1);
xoff = -1;
@@ -300,7 +310,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// GoBSW
else if (inRange(x1 - 1, x2 - 1, x3 - 1) &&
!iCellHasSolid(bcArray, x1 - 1, x2 - 1,
- x3 - 1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ x3 - 1)) // is next but one node in area (base node at 0,0,0)
{
readICell(f, icell, x1 - 1, x2 - 1, x3 - 1);
xoff = 1;
@@ -320,7 +330,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
return true;
}
//////////////////////////////////////////////////////////////////////////
-int InterpolationProcessor::iCellHowManySolids(const SPtr<BCArray3D> bcArray, int x1, int x2, int x3)
+int Interpolator::iCellHowManySolids(const SPtr<BCArray3D> bcArray, int x1, int x2, int x3)
{
int count = 0;
for (int ix3 = x3; ix3 <= x3 + 1; ix3++)
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/Interpolation/Interpolator.h
similarity index 75%
rename from src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h
rename to src/cpu/VirtualFluidsCore/LBM/Interpolation/Interpolator.h
index f298a531b61ca4c4d9ddffc6e2dfeab535be0aa1..81a0d7a363b73a01f079c412b2fd97765841d939 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/Interpolation/Interpolator.h
@@ -1,5 +1,7 @@
-#ifndef INTERPOLATIONPROCESSOR_H
-#define INTERPOLATIONPROCESSOR_H
+#ifndef CPU_INTERPOLATER_H
+#define CPU_INTERPOLATER_H
+
+#include <memory>
#include "BCArray3D.h"
#include "BoundaryConditions.h"
@@ -17,17 +19,16 @@ struct D3Q27ICell {
real BSE[27];
};
-class InterpolationProcessor;
-using InterpolationProcessorPtr = SPtr<InterpolationProcessor>;
+class Interpolator;
+using InterpolationProcessorPtr = std::shared_ptr<Interpolator>;
-#include "InterpolationHelper.h"
-class InterpolationProcessor
+class Interpolator
{
public:
- InterpolationProcessor();
- virtual ~InterpolationProcessor();
- virtual InterpolationProcessorPtr clone() = 0;
+ virtual ~Interpolator() = default;
+ virtual InterpolationProcessorPtr clone() = 0;
+
virtual void setOmegas(real omegaC, real omegaF) = 0;
virtual void interpolateCoarseToFine(D3Q27ICell &icellC, D3Q27ICell &icellF) = 0;
virtual void interpolateCoarseToFine(D3Q27ICell &icellC, D3Q27ICell &icellF, real xoff, real yoff,
@@ -52,21 +53,9 @@ protected:
virtual void calcInterpolatedNodeFC(real *f, real omega) {}
virtual void calcInterpolatedVelocity(real x, real y, real z, real &vx1, real &vx2, real &vx3) {}
virtual void calcInterpolatedShearStress(real x, real y, real z, real &tauxx, real &tauyy,
- real &tauzz, real &tauxy, real &tauxz, real &tauyz)
- {
- }
+ real &tauzz, real &tauxy, real &tauxz, real &tauyz) {}
virtual void setOffsets(real xoff, real yoff, real zoff) {}
- friend class InterpolationHelper;
-private:
- bool inRange(int x1, int x2, int x3);
- int m_maxX1, m_maxX2, m_maxX3;
};
-//////////////////////////////////////////////////////////////////////////
-inline bool InterpolationProcessor::inRange(int x1, int x2, int x3)
-{
- return x1 >= 0 && x1 < m_maxX1 && x2 >= 0 && x2 < m_maxX2 && x3 >= 0 && x3 < m_maxX3;
-}
-
#endif
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
deleted file mode 100644
index f4b54988b4c3c20928f93359b22d74cf671c03e6..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "InterpolationHelper.h"
-
-InterpolationHelper::InterpolationHelper(InterpolationProcessorPtr iProcessor) : iProcessor(iProcessor) {}
-//////////////////////////////////////////////////////////////////////////
-InterpolationHelper::~InterpolationHelper() = default;
-//////////////////////////////////////////////////////////////////////////
-void InterpolationHelper::interpolate8to1(D3Q27ICell &icellF, real *icellC, real /*x1*/, real /*x2*/,
- real /*x3*/, real omega)
-{
- iProcessor->calcInterpolatedCoefficiets(icellF, omega, vf::basics::constant::c1o1);
- iProcessor->calcInterpolatedNodeFC(icellC, omega);
-}
-//////////////////////////////////////////////////////////////////////////
-void InterpolationHelper::interpolate8to1WithVelocity(D3Q27ICell &icellF, real x1, real x2, real x3,
- real omega, real &vx1, real &vx2, real &vx3)
-{
- iProcessor->setOffsets(vf::basics::constant::c0o1, vf::basics::constant::c0o1, vf::basics::constant::c0o1);
- iProcessor->calcInterpolatedCoefficiets(icellF, omega, vf::basics::constant::c0o1);
- iProcessor->calcInterpolatedVelocity(x1, x2, x3, vx1, vx2, vx3);
-}
-//////////////////////////////////////////////////////////////////////////
-void InterpolationHelper::interpolate8to1WithVelocityWithShearStress(D3Q27ICell &icellF, real x1, real x2,
- real x3, real omega, real &vx1,
- real &vx2, real &vx3, real &tauxx,
- real &tauyy, real &tauzz, real &tauxy,
- real &tauxz, real &tauyz)
-{
- iProcessor->setOffsets(vf::basics::constant::c0o1, vf::basics::constant::c0o1, vf::basics::constant::c0o1);
- iProcessor->calcInterpolatedCoefficiets(icellF, omega, vf::basics::constant::c0o1);
- iProcessor->calcInterpolatedVelocity(x1, x2, x3, vx1, vx2, vx3);
- iProcessor->calcInterpolatedShearStress(x1, x2, x3, tauxx, tauyy, tauzz, tauxy, tauxz, tauyz);
-}
-
-//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h
deleted file mode 100644
index b67e8d18ac5c54c775c098aad484d4b5657a917b..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef D3Q27InterpolationHelper_H_
-#define D3Q27InterpolationHelper_H_
-
-#include "InterpolationProcessor.h"
-
-class InterpolationHelper;
-using InterpolationHelperPtr = SPtr<InterpolationHelper>;
-
-class InterpolationHelper
-{
-public:
- InterpolationHelper(InterpolationProcessorPtr iProcessor);
- ~InterpolationHelper();
- void interpolate8to1(D3Q27ICell &icellF, real *icellC, real x1, real x2, real x3, real omega);
- void interpolate8to1WithVelocity(D3Q27ICell &icellF, real x1, real x2, real x3, real omega, real &vx1,
- real &vx2, real &vx3);
- void interpolate8to1WithVelocityWithShearStress(D3Q27ICell &icellF, real x1, real x2, real x3, real omega,
- real &vx1, real &vx2, real &vx3, real &tauxx,
- real &tauyy, real &tauzz, real &tauxy, real &tauxz,
- real &tauyz);
-
-protected:
-private:
- InterpolationProcessorPtr iProcessor;
-};
-
-#endif
diff --git a/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp b/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp
index 51d74e3bf1b5d5109904e1fa581bcff366fad505..a2da1904ecbfda60be9139aa9ded1cb1b5efc15f 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp
+++ b/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp
@@ -17,8 +17,6 @@ MetisPartitioner::MetisPartitioner()
// options[METIS_OPTION_IPTYPE] = METIS_IPTYPE_GROW;
}
//////////////////////////////////////////////////////////////////////////
-MetisPartitioner::~MetisPartitioner() = default;
-//////////////////////////////////////////////////////////////////////////
idx_t *MetisPartitioner::getMetisOptions() { return options; }
void MetisPartitioner::setMetisOptions(int option, idx_t value) { options[option] = value; }
//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.h b/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.h
index 8fd7a82d52e1ac4c7199d5b2e1a1cbe43ea25369..18e222760bf4a0c93db17ea6fa96a6afdf7f3313 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.h
+++ b/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.h
@@ -10,7 +10,6 @@
#if defined VF_METIS
-#include "basics/utilities/UbLogger.h"
#include "basics/utilities/UbSystem.h"
#include "metis.h"
#include <PointerDefinitions.h>
@@ -24,7 +23,6 @@ public:
public:
MetisPartitioner();
- virtual ~MetisPartitioner();
idx_t *getMetisOptions();
void setMetisOptions(int option, idx_t value);
int partition(int nofParts, PartType ptype);
@@ -47,9 +45,9 @@ public:
real_t *
ubvec; // This is an array of size ncon that specifies the allowed load imbalance tolerance for each constraint.
// For the ith partition and jth constraint the allowed weight is the ubvec[j]*tpwgts[i*ncon+j] fraction
- // of the jth’s constraint total weight. The load imbalances must be greater than 1.0.
+ // of the jths constraint total weight. The load imbalances must be greater than 1.0.
// A NULL value can be passed indicating that the load imbalance tolerance for each constraint should
- // be 1.001 (for ncon=1) or 1.01 (for ncon¿1).
+ // be 1.001 (for ncon=1) or 1.01 (for ncon1).
std::vector<idx_t>
part; // This is a vector of size n that upon successful completion stores the partition vector of the graph.
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp
index ef220856838baabadb3b8cf40270d0e505147069..5cdc87c6867c5ec2a8676e66a228ba5e768014fb 100644
--- a/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp
@@ -130,7 +130,6 @@ void MPIIOMigrationBESimulationObserver::writeDataSet(int step)
DSArraysPresence arrPresence;
bool firstBlock = true;
int doubleCountInBlock = 0;
- int ic = 0;
SPtr<D3Q27EsoTwist3DSplittedVector> D3Q27EsoTwist3DSplittedVectorPtrF = 0, D3Q27EsoTwist3DSplittedVectorPtrH1 = 0, D3Q27EsoTwist3DSplittedVectorPtrH2 = 0;
CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr localDistributionsF = 0, localDistributionsH1 = 0, localDistributionsH2 = 0;
CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributionsF = 0, nonLocalDistributionsH1 = 0, nonLocalDistributionsH2 = 0;
@@ -280,8 +279,6 @@ void MPIIOMigrationBESimulationObserver::writeDataSet(int step)
if (zeroDistributionsH2 && (dataSetParamStr3.nx[0] > 0) && (dataSetParamStr3.nx[1] > 0) && (dataSetParamStr3.nx[2] > 0))
doubleValuesArrayH2.insert(doubleValuesArrayH2.end(), zeroDistributionsH2->getDataVector().begin(), zeroDistributionsH2->getDataVector().end());
}
-
- ic++;
}
}
@@ -431,7 +428,6 @@ void MPIIOMigrationBESimulationObserver::write4DArray(int step, Arrays arrayType
dataSetParam dataSetParamStr;
bool firstBlock = true;
int doubleCountInBlock = 0;
- int ic = 0;
SPtr<CbArray4D<real, IndexerX4X3X2X1>> ___Array;
if (comm->isRoot())
@@ -482,8 +478,6 @@ void MPIIOMigrationBESimulationObserver::write4DArray(int step, Arrays arrayType
if ((dataSetParamStr.nx[0] > 0) && (dataSetParamStr.nx[1] > 0) && (dataSetParamStr.nx[2] > 0) && (dataSetParamStr.nx[3] > 0))
doubleValuesArray.insert(doubleValuesArray.end(), ___Array->getDataVector().begin(), ___Array->getDataVector().end());
-
- ic++;
}
}
@@ -550,7 +544,6 @@ void MPIIOMigrationBESimulationObserver::write3DArray(int step, Arrays arrayType
dataSetParam dataSetParamStr;
bool firstBlock = true;
int doubleCountInBlock = 0;
- int ic = 0;
SPtr<CbArray3D<real, IndexerX3X2X1>> ___Array;
if (comm->isRoot())
@@ -599,8 +592,6 @@ void MPIIOMigrationBESimulationObserver::write3DArray(int step, Arrays arrayType
if ((dataSetParamStr.nx[0] > 0) && (dataSetParamStr.nx[1] > 0) && (dataSetParamStr.nx[2] > 0))
doubleValuesArray.insert(doubleValuesArray.end(), ___Array->getDataVector().begin(), ___Array->getDataVector().end());
-
- ic++;
}
}
@@ -659,8 +650,6 @@ void MPIIOMigrationBESimulationObserver::writeBoundaryConds(int step)
int blocksCount = 0; // quantity of blocks, that belong to this process
size_t allBytesCount = 0; // quantity of bytes, that one process writes to the file
- size_t count_boundCond = 0; // how many BoundaryConditions in all blocks
- int count_indexContainer = 0; // how many indexContainer-values in all blocks
std::vector<SPtr<Block3D>> blocksVector[25];
int minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -721,7 +710,6 @@ void MPIIOMigrationBESimulationObserver::writeBoundaryConds(int step)
bcVector[ic].push_back(*bouCond);
bcAddArray[ic].boundCond_count++;
- count_boundCond++;
bytesCount[ic] += sizeof(BoundaryCondition);
}
@@ -738,7 +726,6 @@ void MPIIOMigrationBESimulationObserver::writeBoundaryConds(int step)
indexContainerVector[ic].insert(indexContainerVector[ic].begin(), bcArr->indexContainer.begin(), bcArr->indexContainer.end());
bcAddArray[ic].indexContainer_count = static_cast<int>(bcArr->indexContainer.size());
- count_indexContainer += bcAddArray[ic].indexContainer_count;
bytesCount[ic] += bcAddArray[ic].indexContainer_count * sizeof(int);
allBytesCount += bytesCount[ic];
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.cpp
index 32e6ba5188626c0a37fba8e9db0ad4447502d001..860b3f02ab1db6c1554ca9f87069281520100bd6 100644
--- a/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.cpp
@@ -730,8 +730,6 @@ void MPIIOMigrationSimulationObserver::writeBoundaryConds(int step)
int blocksCount = 0; // quantity of blocks, that belong to this process
size_t allBytesCount = 0; // quantity of bytes, that one process writes to the file
- size_t count_boundCond = 0; // how many BoundaryConditions in all blocks
- int count_indexContainer = 0; // how many indexContainer-values in all blocks
std::vector<SPtr<Block3D>> blocksVector[25];
int minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -793,7 +791,6 @@ void MPIIOMigrationSimulationObserver::writeBoundaryConds(int step)
bcVector[ic].push_back(*bouCond);
bcAddArray[ic].boundCond_count++;
- count_boundCond++;
bytesCount[ic] += sizeof(BoundaryCondition);
}
@@ -810,7 +807,6 @@ void MPIIOMigrationSimulationObserver::writeBoundaryConds(int step)
indexContainerVector[ic].insert(indexContainerVector[ic].begin(), bcArr->indexContainer.begin(), bcArr->indexContainer.end());
bcAddArray[ic].indexContainer_count = static_cast<int>(bcArr->indexContainer.size());
- count_indexContainer += bcAddArray[ic].indexContainer_count;
bytesCount[ic] += bcAddArray[ic].indexContainer_count * sizeof(int);
allBytesCount += bytesCount[ic];
@@ -1505,8 +1501,8 @@ void MPIIOMigrationSimulationObserver::readBoundaryConds(int step)
block1->getKernel()->setBCSet(bcProc);
- delete bcArray;
- delete intArray1;
+ delete[] bcArray;
+ delete[] intArray1;
ic++;
}
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.cpp
index e1181e9df12ea737779c543b7cba5011c3027442..d0e50585a473b58780ba5e4372fc87e0524ca7a4 100644
--- a/src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.cpp
@@ -218,13 +218,13 @@ void QCriterionSimulationObserver::getNeighborVelocities(int offx, int offy, int
// int minX3 = 0;
int maxX1 = (int)(distributions->getNX1());
- int maxX2 = (int)(distributions->getNX2());
- int maxX3 = (int)(distributions->getNX3());
+ // int maxX2 = (int)(distributions->getNX2());
+ // int maxX3 = (int)(distributions->getNX3());
if (maxX1 < 3)
throw UbException(UB_EXARGS, "QCriterionSimulationObserver: NX1 too small for FD stencils!");
maxX1 -= 2;
- maxX2 -= 2;
- maxX3 -= 2;
+ // maxX2 -= 2;
+ // maxX3 -= 2;
bool checkInterpolation = true;
bool neighNodeIsBC = false;
SPtr<BoundaryConditions> bcPtr;
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp
index 0a754b6d21864c53bba10b3698e9314d3b7fdb8e..fa566d21aaff03689be1d7b8dfb8848a76eaca07 100644
--- a/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp
@@ -8,7 +8,7 @@
#include "D3Q27Interactor.h"
#include "DataSet3D.h"
#include "Grid3D.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "LBMKernel.h"
#include "UbScheduler.h"
@@ -429,139 +429,139 @@ void ShearStressSimulationObserver::findPlane(int ix1, int ix2, int ix3, SPtr<Gr
bcPtr = bcArray->getBC(ix1, ix2, ix3);
int x, y, z;
- if (InterpolationProcessor::iCellHasSolid(bcArray, ix1, ix2, ix3)) {
+ if (Interpolator::iCellHasSolid(bcArray, ix1, ix2, ix3)) {
x = ix1;
y = ix2;
z = ix3;
- } else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1, ix2 - 1, ix3)) {
+ } else if (Interpolator::iCellHasSolid(bcArray, ix1, ix2 - 1, ix3)) {
x = ix1 + 0;
y = ix2 - 1;
z = ix3 + 0;
} // S
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1, ix2, ix3 - 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1, ix2, ix3 - 1)) {
x = ix1 + 0;
y = ix2 + 0;
z = ix3 - 1;
} // B
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 - 1, ix2, ix3)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 - 1, ix2, ix3)) {
x = ix1 - 1;
y = ix2 + 0;
z = ix3 + 0;
} // w
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1, ix2 - 1, ix3 - 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1, ix2 - 1, ix3 - 1)) {
x = ix1 + 0;
y = ix2 - 1;
z = ix3 - 1;
} // BS
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 - 1, ix2, ix3 - 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 - 1, ix2, ix3 - 1)) {
x = ix1 - 1;
y = ix2 + 0;
z = ix3 - 1;
} // BW
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 - 1, ix2 - 1, ix3)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 - 1, ix2 - 1, ix3)) {
x = ix1 - 1;
y = ix2 - 1;
z = ix3 + 0;
} // SW
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 - 1, ix2 - 1, ix3 - 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 - 1, ix2 - 1, ix3 - 1)) {
x = ix1 - 1;
y = ix2 - 1;
z = ix3 - 1;
} // BSW
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 1, ix2, ix3)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 1, ix2, ix3)) {
x = ix1 + 1;
y = ix2 + 0;
z = ix3 + 0;
} // E
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1, ix2 + 1, ix3)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1, ix2 + 1, ix3)) {
x = ix1 + 0;
y = ix2 + 1;
z = ix3 + 0;
} // N
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1, ix2, ix3 + 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1, ix2, ix3 + 1)) {
x = ix1 + 0;
y = ix2 + 0;
z = ix3 + 1;
} // T
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 1, ix2 + 1, ix3)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 1, ix2 + 1, ix3)) {
x = ix1 + 1;
y = ix2 + 1;
z = ix3 + 0;
} // NE
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 1, ix2, ix3 + 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 1, ix2, ix3 + 1)) {
x = ix1 + 1;
y = ix2 + 0;
z = ix3 + 1;
} // TE
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1, ix2 + 1, ix3 + 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1, ix2 + 1, ix3 + 1)) {
x = ix1 + 0;
y = ix2 + 1;
z = ix3 + 1;
} // TN
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 1, ix2 + 1, ix3 + 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 1, ix2 + 1, ix3 + 1)) {
x = ix1 + 1;
y = ix2 + 1;
z = ix3 + 1;
} // TNE
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 1, ix2 - 1, ix3)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 1, ix2 - 1, ix3)) {
x = ix1 + 1;
y = ix2 - 1;
z = ix3 + 0;
} // SE
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 - 1, ix2 + 1, ix3)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 - 1, ix2 + 1, ix3)) {
x = ix1 - 1;
y = ix2 + 1;
z = ix3 + 0;
} // NW
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 1, ix2, ix3 - 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 1, ix2, ix3 - 1)) {
x = ix1 + 1;
y = ix2 + 0;
z = ix3 - 1;
} // BE
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 - 1, ix2, ix3 + 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 - 1, ix2, ix3 + 1)) {
x = ix1 - 1;
y = ix2 + 0;
z = ix3 + 1;
} // TW
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 0, ix2 + 1, ix3 - 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 0, ix2 + 1, ix3 - 1)) {
x = ix1 + 0;
y = ix2 + 1;
z = ix3 - 1;
} // BN
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 0, ix2 - 1, ix3 + 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 0, ix2 - 1, ix3 + 1)) {
x = ix1 + 0;
y = ix2 - 1;
z = ix3 + 1;
} // TS
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 - 1, ix2 + 1, ix3 + 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 - 1, ix2 + 1, ix3 + 1)) {
x = ix1 - 1;
y = ix2 + 1;
z = ix3 + 1;
} // TNW
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 1, ix2 - 1, ix3 + 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 1, ix2 - 1, ix3 + 1)) {
x = ix1 + 1;
y = ix2 - 1;
z = ix3 + 1;
} // TSE
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 - 1, ix2 - 1, ix3 + 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 - 1, ix2 - 1, ix3 + 1)) {
x = ix1 - 1;
y = ix2 - 1;
z = ix3 + 1;
} // TSW
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 1, ix2 + 1, ix3 - 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 1, ix2 + 1, ix3 - 1)) {
x = ix1 + 1;
y = ix2 + 1;
z = ix3 - 1;
} // BNE
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 - 1, ix2 + 1, ix3 - 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 - 1, ix2 + 1, ix3 - 1)) {
x = ix1 - 1;
y = ix2 + 1;
z = ix3 - 1;
} // BNW
- else if (InterpolationProcessor::iCellHasSolid(bcArray, ix1 + 1, ix2 - 1, ix3 - 1)) {
+ else if (Interpolator::iCellHasSolid(bcArray, ix1 + 1, ix2 - 1, ix3 - 1)) {
x = ix1 + 1;
y = ix2 - 1;
z = ix3 - 1;
@@ -602,7 +602,7 @@ void ShearStressSimulationObserver::findPlane(int ix1, int ix2, int ix3, SPtr<Gr
}
}
- if (InterpolationProcessor::iCellHasSolid(bcArray, x, y, z)) {
+ if (Interpolator::iCellHasSolid(bcArray, x, y, z)) {
for (int i = x; i <= x + 1; i++) {
for (int j = y; j <= y + 1; j++) {
for (int k = z; k <= z + 1; k++) {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
index 0c3adfb893bef12351c686e88bf907ecf6e12d99..2996ceeece9710079e898d02b0cceff447479d39 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
@@ -34,7 +34,7 @@
#ifndef Block3DVisitor_h
#define Block3DVisitor_h
-#include <PointerDefinitions.h>
+#include <basics/PointerDefinitions.h>
class Block3D;
class Grid3D;
diff --git a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
index 21d06dffa9f1fb09a1b5d7baa43d72393eeda47b..e6ab0193cdbc417c28fa90fa83fa897570048ae3 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
@@ -8,7 +8,7 @@
#include "DataSet3D.h"
#include "Grid3D.h"
#include "D3Q27System.h"
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
#include "LBMKernel.h"
#include <CbArray2D.h>
#include <basics/utilities/UbFileInputASCII.h>
diff --git a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.h
index a143ab6b0b40a8b35023a4916ffcbd20ae4b726c..eab801e448b4c797c7260274af66ea50a4677def 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.h
@@ -8,12 +8,12 @@
class Grid3D;
class Block3D;
-class InterpolationProcessor;
+class Interpolator;
class InitDistributionsWithInterpolationGridVisitor : public Grid3DVisitor
{
public:
- InitDistributionsWithInterpolationGridVisitor(SPtr<Grid3D> oldGrid, SPtr<InterpolationProcessor> iProcessor,
+ InitDistributionsWithInterpolationGridVisitor(SPtr<Grid3D> oldGrid, SPtr<Interpolator> iProcessor,
real nu);
~InitDistributionsWithInterpolationGridVisitor() override;
void visit(SPtr<Grid3D> grid) override;
@@ -30,7 +30,7 @@ private:
SPtr<Grid3D> oldGrid;
real nu;
- SPtr<InterpolationProcessor> iProcessor;
+ SPtr<Interpolator> iProcessor;
};
#endif // InitDistributionsWithVelocityProfileBlockVisitor_h__
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationConnectorsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationConnectorsBlockVisitor.cpp
index 7ff7d20b9fcd85b6939f3184fcde86c6fdaae77d..362e8c92751e1275bfdaa7d7daf1567f117ecdf4 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationConnectorsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationConnectorsBlockVisitor.cpp
@@ -40,9 +40,9 @@
#include <basics/transmitter/TbTransmitterLocal.h>
#include <mpi/Communicator.h>
-#include "InterpolationProcessor.h"
+#include "Interpolator.h"
-SetInterpolationConnectorsBlockVisitor::SetInterpolationConnectorsBlockVisitor(std::shared_ptr<vf::mpi::Communicator> comm, real nue, SPtr<InterpolationProcessor> iProcessor) :
+SetInterpolationConnectorsBlockVisitor::SetInterpolationConnectorsBlockVisitor(std::shared_ptr<vf::mpi::Communicator> comm, real nue, SPtr<Interpolator> iProcessor) :
Block3DVisitor(0, D3Q27System::MAXLEVEL),
comm(comm),
nue(nue),
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationConnectorsBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationConnectorsBlockVisitor.h
index c30d87ecaa042a30d931e29ba185fdd5230e2a68..b1f6f99e1c4eff543f87dfcd70e7b45bf27701d5 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationConnectorsBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationConnectorsBlockVisitor.h
@@ -44,13 +44,13 @@
class Grid3D;
class Block3D;
namespace vf::mpi {class Communicator;}
-class InterpolationProcessor;
+class Interpolator;
//! \brief A class sets connectors between blocks.
class SetInterpolationConnectorsBlockVisitor : public Block3DVisitor
{
public:
- SetInterpolationConnectorsBlockVisitor(std::shared_ptr<vf::mpi::Communicator> comm, real nue, SPtr<InterpolationProcessor> iProcessor);
+ SetInterpolationConnectorsBlockVisitor(std::shared_ptr<vf::mpi::Communicator> comm, real nue, SPtr<Interpolator> iProcessor);
~SetInterpolationConnectorsBlockVisitor() override;
void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
//////////////////////////////////////////////////////////////////////////
@@ -66,7 +66,7 @@ protected:
std::shared_ptr<vf::mpi::Communicator> comm;
int gridRank;
real nue;
- SPtr<InterpolationProcessor> iProcessor;
+ SPtr<Interpolator> iProcessor;
};
#endif // SetInterpolationConnectorsBlockVisitor_H
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
index 329662ec8aeb6405c8f8f4b06645c9d1500a59e6..17fa5b2ebb2b7230955e9ce4209a3cb341369326 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
@@ -1,7 +1,7 @@
#ifndef SetUndefinedNodesBlockVisitor_h
#define SetUndefinedNodesBlockVisitor_h
-#include <PointerDefinitions.h>
+#include <basics/PointerDefinitions.h>
#include "Block3DVisitor.h"
diff --git a/src/cpu/simulationconfig/include/simulationconfig/AbstractLBMSystem.h b/src/cpu/simulationconfig/AbstractLBMSystem.h
similarity index 100%
rename from src/cpu/simulationconfig/include/simulationconfig/AbstractLBMSystem.h
rename to src/cpu/simulationconfig/AbstractLBMSystem.h
diff --git a/src/cpu/simulationconfig/CMakeLists.txt b/src/cpu/simulationconfig/CMakeLists.txt
index f0659f67a2af8d40a20991be42b4b49e1cab8ff1..255c83dfc2bff125e15f67e98080a76017abe6e9 100644
--- a/src/cpu/simulationconfig/CMakeLists.txt
+++ b/src/cpu/simulationconfig/CMakeLists.txt
@@ -1,8 +1,6 @@
-project(simulationconfig)
-
-vf_add_library(NAME simulationconfig PUBLIC_LINK VirtualFluidsCore basics muparser lbm)
+vf_add_library(PUBLIC_LINK VirtualFluidsCore basics muparser lbm)
set_target_properties(simulationconfig PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_include_directories(simulationconfig PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(simulationconfig PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
\ No newline at end of file
diff --git a/src/cpu/simulationconfig/src/D3Q27LBMSystem.cpp b/src/cpu/simulationconfig/D3Q27LBMSystem.cpp
similarity index 100%
rename from src/cpu/simulationconfig/src/D3Q27LBMSystem.cpp
rename to src/cpu/simulationconfig/D3Q27LBMSystem.cpp
diff --git a/src/cpu/simulationconfig/include/simulationconfig/D3Q27LBMSystem.h b/src/cpu/simulationconfig/D3Q27LBMSystem.h
similarity index 96%
rename from src/cpu/simulationconfig/include/simulationconfig/D3Q27LBMSystem.h
rename to src/cpu/simulationconfig/D3Q27LBMSystem.h
index 374d64318f1fe64308002af71b2b67d2edb3d1a4..581d8049b7ca5717ed44e746d55766b82ad57e0e 100644
--- a/src/cpu/simulationconfig/include/simulationconfig/D3Q27LBMSystem.h
+++ b/src/cpu/simulationconfig/D3Q27LBMSystem.h
@@ -6,8 +6,6 @@
class D3Q27LBMSystem : public AbstractLBMSystem {
public:
- D3Q27LBMSystem() = default;
-
int getNumberOfDirections() override;
std::shared_ptr<Interactor3D> makeInteractor() override;
diff --git a/src/cpu/simulationconfig/include/simulationconfig/KernelConfigStructs.h b/src/cpu/simulationconfig/KernelConfigStructs.h
similarity index 59%
rename from src/cpu/simulationconfig/include/simulationconfig/KernelConfigStructs.h
rename to src/cpu/simulationconfig/KernelConfigStructs.h
index 53ea667c9da3a9c57d5aeeac67588cab0afbff3f..c7e46854933e7a8e64abc7b8ab961fc0f6e5eeb3 100644
--- a/src/cpu/simulationconfig/include/simulationconfig/KernelConfigStructs.h
+++ b/src/cpu/simulationconfig/KernelConfigStructs.h
@@ -4,14 +4,16 @@
#include <string>
#include <basics/DataTypes.h>
+#include "KernelFactory.h"
+
struct LBMKernelConfiguration {
KernelFactory::KernelType kernelType;
- bool useForcing = false;
- real forcingX1{};
- real forcingX2{};
- real forcingX3{};
+ bool useForcing {false};
+ real forcingX1 {};
+ real forcingX2 {};
+ real forcingX3 {};
- explicit LBMKernelConfiguration(KernelFactory::KernelType kernelType) : kernelType(kernelType)
+ LBMKernelConfiguration(KernelFactory::KernelType kernelType) : kernelType(kernelType)
{
}
};
diff --git a/src/cpu/simulationconfig/src/KernelFactory.cpp b/src/cpu/simulationconfig/KernelFactory.cpp
similarity index 100%
rename from src/cpu/simulationconfig/src/KernelFactory.cpp
rename to src/cpu/simulationconfig/KernelFactory.cpp
diff --git a/src/cpu/simulationconfig/include/simulationconfig/KernelFactory.h b/src/cpu/simulationconfig/KernelFactory.h
similarity index 100%
rename from src/cpu/simulationconfig/include/simulationconfig/KernelFactory.h
rename to src/cpu/simulationconfig/KernelFactory.h
diff --git a/src/cpu/simulationconfig/src/Simulation.cpp b/src/cpu/simulationconfig/Simulation.cpp
similarity index 58%
rename from src/cpu/simulationconfig/src/Simulation.cpp
rename to src/cpu/simulationconfig/Simulation.cpp
index 8fd14885de136e523664700590c336b9a9558bcb..67c4e469d41ea24f1029f09e1beb78a597974e4c 100644
--- a/src/cpu/simulationconfig/src/Simulation.cpp
+++ b/src/cpu/simulationconfig/Simulation.cpp
@@ -1,25 +1,32 @@
+#include <simulationconfig/Simulation.h>
+
#include <memory>
#include <string>
#include <set>
#include <utility>
#include <cmath>
+
+#ifdef _OPENMP
#include <omp.h>
+#endif
+
#include <mpi.h>
#include <basics/utilities/UbScheduler.h>
#include <geometry3d/GbCuboid3D.h>
#include <geometry3d/GbSystem3D.h>
+#include <BoundaryConditions/BCStrategy.h>
#include <BoundaryConditions/BCSet.h>
-#include <SimulationObservers/SimulationObserver.h>
#include <SimulationObservers/NUPSCounterSimulationObserver.h>
#include <SimulationObservers/WriteBlocksSimulationObserver.h>
#include <SimulationObservers/WriteBoundaryConditionsSimulationObserver.h>
#include <SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.h>
+
#include <Simulation/Simulation.h>
#include <Simulation/Grid3D.h>
#include <Interactors/InteractorsHelper.h>
-#include <LBM/CompressibleOffsetMomentsInterpolationProcessor.h>
+#include <LBM/Interpolation/CompressibleOffsetMomentsInterpolator.h>
#include <LBM/LBMKernel.h>
#include <LBM/LBMUnitConverter.h>
#include <mpi/MPICommunicator.h>
@@ -30,38 +37,34 @@
#include <Visitors/SetKernelBlockVisitor.h>
#include <simulationconfig/SimulationParameters.h>
-#include <simulationconfig/Simulation.h>
#include <lbm/constants/D3Q27.h>
+#include <logger/Logger.h>
-Simulation::Simulation()
+
+CPUSimulation::CPUSimulation()
{
this->communicator = vf::mpi::MPICommunicator::getInstance();
- this->grid = std::shared_ptr<Grid3D>(new Grid3D(communicator));
- this->interactors = std::vector<std::shared_ptr<Interactor3D>>();
- this->bcVisitor = BoundaryConditionsBlockVisitor();
- this->registeredAdapters = std::set<std::shared_ptr<BCAdapter>>();
+ this->grid = std::make_shared<Grid3D>(communicator);
}
-void Simulation::setGridParameters(std::shared_ptr<GridParameters> parameters)
+void CPUSimulation::setGridParameters(std::shared_ptr<GridParameters> parameters)
{
this->gridParameters = std::move(parameters);
}
-void Simulation::setPhysicalParameters(std::shared_ptr<PhysicalParameters> parameters)
+void CPUSimulation::setPhysicalParameters(std::shared_ptr<PhysicalParameters> parameters)
{
this->physicalParameters = std::move(parameters);
}
-void Simulation::setRuntimeParameters(std::shared_ptr<RuntimeParameters> parameters)
+void CPUSimulation::setRuntimeParameters(std::shared_ptr<RuntimeParameters> parameters)
{
this->simulationParameters = std::move(parameters);
}
-void
-Simulation::addObject(const std::shared_ptr<GbObject3D> &object, const std::shared_ptr<BCA> &bcAdapter, int state,
- const std::string &folderPath)
+void CPUSimulation::addObject(const std::shared_ptr<GbObject3D> &object, const std::shared_ptr<BC> &bcAdapter, int state, const std::string &folderPath)
{
const bool is_in = registeredAdapters.find(bcAdapter) != registeredAdapters.end();
if (!is_in) addBCAdapter(bcAdapter);
@@ -71,38 +74,32 @@ Simulation::addObject(const std::shared_ptr<GbObject3D> &object, const std::shar
GbSystem3D::writeGeoObject(object, writerConfig.outputPath + folderPath, writerConfig.getWriter());
}
-void Simulation::addBCAdapter(const std::shared_ptr<BC> &bcAdapter)
+void CPUSimulation::addBCAdapter(const std::shared_ptr<BC> &bcAdapter)
{
registeredAdapters.insert(bcAdapter);
this->bcVisitor.addBC(bcAdapter);
}
-void Simulation::setKernelConfiguration(const std::shared_ptr<LBMKernelConfiguration> &kernel)
+void CPUSimulation::setKernelConfiguration(const std::shared_ptr<LBMKernelConfiguration> &kernel)
{
this->kernelConfig = kernel;
this->lbmKernel = kernelFactory.makeKernel(kernel->kernelType);
this->lbmSystem = kernelFactory.makeLBMSystem(kernel->kernelType);
}
-void Simulation::setWriterConfiguration(const WriterConfiguration &config)
+void CPUSimulation::setWriterConfiguration(WriterConfiguration config)
{
this->writerConfig = config;
}
-WriterConfiguration &Simulation::getWriterConfig()
-{
- return writerConfig;
-}
-
-void Simulation::run()
+void CPUSimulation::run()
{
- UBLOG(logINFO, "Beginning simulation setup for MPI rank " << communicator->getProcessID())
+ VF_LOG_INFO("Beginning simulation setup for MPI rank {}", communicator->getProcessID());
grid->setDeltaX(gridParameters->nodeDistance);
grid->setPeriodicX1(gridParameters->periodicBoundaryInX1);
grid->setPeriodicX2(gridParameters->periodicBoundaryInX2);
grid->setPeriodicX3(gridParameters->periodicBoundaryInX3);
- //int &numberOfNodesInReferenceDirection = gridParameters->numberOfNodesPerDirection[gridParameters->referenceDirectionIndex];
std::shared_ptr<LBMUnitConverter> converter = makeLBMUnitConverter();
int &nodesInX1 = gridParameters->numberOfNodesPerDirection[0];
@@ -145,32 +142,31 @@ void Simulation::run()
#ifdef _OPENMP
omp_set_num_threads(simulationParameters->numberOfThreads);
if (isMainProcess())
- UBLOG(logINFO, "OpenMP is set to run with " << simulationParameters->numberOfThreads << " threads")
+ VF_LOG_INFO("OpenMP is set to run with {} threads", simulationParameters->numberOfThreads);
#endif
auto visualizationScheduler = std::make_shared<UbScheduler>(simulationParameters->timeStepLogInterval);
- auto mqSimulationObserver = makeMacroscopicQuantitiesSimulationObserver(converter,
+ auto mqCoProcessor = makeMacroscopicQuantitiesCoProcessor(converter,
visualizationScheduler);
- auto nupsSimulationObserver = makeNupsSimulationObserver();
+ auto nupsCoProcessor = makeNupsCoProcessor();
- auto calculator = std::make_shared<BasicCalculator>(grid, visualizationScheduler,
+ auto simulation = std::make_shared<Simulation>(grid, visualizationScheduler,
simulationParameters->numberOfTimeSteps);
- calculator->addSimulationObserver(nupsSimulationObserver);
- calculator->addSimulationObserver(mqSimulationObserver);
+ simulation->addSimulationObserver(nupsCoProcessor);
+ simulation->addSimulationObserver(mqCoProcessor);
- if (isMainProcess()) UBLOG(logINFO, "Simulation-start")
- calculator->calculate();
- if (isMainProcess()) UBLOG(logINFO, "Simulation-end")
+ if (isMainProcess()) VF_LOG_TRACE("Simulation start");
+ simulation->run();
+ if (isMainProcess()) VF_LOG_TRACE("Simulation end");
}
-bool Simulation::isMainProcess()
+bool CPUSimulation::isMainProcess()
{
return communicator->getProcessID() == 0;
}
-void
-Simulation::setKernelForcing(const std::shared_ptr<LBMKernel> &kernel,
+void CPUSimulation::setKernelForcing(const std::shared_ptr<LBMKernel> &kernel,
std::shared_ptr<LBMUnitConverter> &converter) const
{
kernel->setWithForcing(kernelConfig->useForcing);
@@ -179,79 +175,74 @@ Simulation::setKernelForcing(const std::shared_ptr<LBMKernel> &kernel,
kernel->setForcingX3(kernelConfig->forcingX3 * converter->getFactorForceWToLb());
}
-void Simulation::logSimulationData(const int &nodesInX1, const int &nodesInX2, const int &nodesInX3) const
+void CPUSimulation::logSimulationData(const int &nodesInX1, const int &nodesInX2, const int &nodesInX3) const
{
- UBLOG(logINFO, "Domain size = " << nodesInX1 << " x " << nodesInX2 << " x " << nodesInX3)
- UBLOG(logINFO, "dx = " << gridParameters->nodeDistance << " m")
- UBLOG(logINFO, "latticeViscosity = " << physicalParameters->latticeViscosity)
+ VF_LOG_INFO("Domain size = {} x {} x {}", nodesInX1, nodesInX2, nodesInX3);
+ VF_LOG_INFO("dx = {} m", gridParameters->nodeDistance);
+ VF_LOG_INFO("latticeViscosity = {}", physicalParameters->latticeViscosity);
}
-void Simulation::generateBlockGrid(const std::shared_ptr<GbObject3D> &gridCube) const
+void CPUSimulation::generateBlockGrid(const std::shared_ptr<GbObject3D> &gridCube) const
{
- UBLOG(logINFO, "Generate block grid")
+ VF_LOG_TRACE("Generate block grid");
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
}
-void Simulation::setBoundaryConditionProcessor(const std::shared_ptr<LBMKernel> &kernel)
+void CPUSimulation::setBoundaryConditionProcessor(const std::shared_ptr<LBMKernel> &kernel)
{
- UBLOG(logINFO, "Create boundary conditions processor")
- auto bcProc = std::make_shared<BCProcessor>();
- kernel->setBCProcessor(bcProc);
+ VF_LOG_TRACE("Create boundary conditions processor");
+ auto bcProc = std::make_shared<BCSet>();
+ kernel->setBCSet(bcProc);
}
-void Simulation::setBlockSize(const int &nodesInX1, const int &nodesInX2, const int &nodesInX3) const
+void CPUSimulation::setBlockSize(const int &nodesInX1, const int &nodesInX2, const int &nodesInX3) const
{
int blockSizeX1 = nodesInX1 / gridParameters->blocksPerDirection[0];
int blockSizeX2 = nodesInX2 / gridParameters->blocksPerDirection[1];
int blockSizeX3 = nodesInX3 / gridParameters->blocksPerDirection[2];
- UBLOG(logINFO, "Block size = " << blockSizeX1 << " x " << blockSizeX2 << " x " << blockSizeX3)
+ VF_LOG_INFO("Block size = {} x {} x {}", blockSizeX1, blockSizeX2, blockSizeX3);
grid->setBlockNX(blockSizeX1,
blockSizeX2,
blockSizeX3);
}
std::shared_ptr<LBMUnitConverter>
-Simulation::makeLBMUnitConverter()
+CPUSimulation::makeLBMUnitConverter()
{
return std::make_shared<LBMUnitConverter>();
}
-void Simulation::writeBoundaryConditions() const
+void CPUSimulation::writeBoundaryConditions() const
{
auto geoSch = std::make_shared<UbScheduler>(1);
WriteBoundaryConditionsSimulationObserver ppgeo(grid, geoSch, writerConfig.outputPath, writerConfig.getWriter(),
communicator);
- ppgeo.process(0);
+ ppgeo.update(0);
}
-void Simulation::writeBlocksToFile() const
+void CPUSimulation::writeBlocksToFile() const
{
- UBLOG(logINFO, "Write block grid to VTK-file")
+ VF_LOG_TRACE("Write block grid to VTK-file");
auto scheduler = std::make_shared<UbScheduler>(1);
auto ppblocks = std::make_shared<WriteBlocksSimulationObserver>(grid,
scheduler,
writerConfig.outputPath,
writerConfig.getWriter(),
communicator);
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
}
-std::shared_ptr<GbObject3D>
-Simulation::makeSimulationBoundingBox()
+std::shared_ptr<GbObject3D> CPUSimulation::makeSimulationBoundingBox()
{
auto box = gridParameters->boundingBox();
- auto gridCube = std::make_shared<GbCuboid3D>(box->minX1, box->minX2, box->minX3, box->maxX1, box->maxX2,
- box->maxX3);
+ auto gridCube = std::make_shared<GbCuboid3D>(box->minX1, box->minX2, box->minX3, box->maxX1, box->maxX2, box->maxX3);
- if (isMainProcess())
- {
- UBLOG(logINFO, "Bounding box dimensions = [("
- << box->minX1 << ", " << box->minX2 << ", " << box->minX3 << "); ("
- << box->maxX1 << ", " << box->maxX2 << ", " << box->maxX3 << ")]")
+ if (isMainProcess()) {
+ VF_LOG_INFO("Bounding box dimensions = [({}},{}},{}}); ({}}, {}}, {}})]", box->minX1, box->minX2, box->minX3, box->maxX1, box->maxX2, box->maxX3);
GbSystem3D::writeGeoObject(gridCube.get(), writerConfig.outputPath + "/geo/gridCube", writerConfig.getWriter());
}
@@ -259,38 +250,29 @@ Simulation::makeSimulationBoundingBox()
return gridCube;
}
-void Simulation::setConnectors()
+void CPUSimulation::setConnectors()
{
OneDistributionSetConnectorsBlockVisitor setConnsVisitor(communicator);
grid->accept(setConnsVisitor);
}
-void Simulation::initializeDistributions()
+void CPUSimulation::initializeDistributions()
{
InitDistributionsBlockVisitor initVisitor;
grid->accept(initVisitor);
}
-std::shared_ptr<SimulationObserver>
-Simulation::makeMacroscopicQuantitiesSimulationObserver(const std::shared_ptr<LBMUnitConverter> &converter,
- const std::shared_ptr<UbScheduler> &visualizationScheduler) const
+std::shared_ptr<SimulationObserver> CPUSimulation::makeMacroscopicQuantitiesCoProcessor(const std::shared_ptr<LBMUnitConverter> &converter, const std::shared_ptr<UbScheduler> &visualizationScheduler) const
{
- auto mqSimulationObserver = std::make_shared<WriteMacroscopicQuantitiesSimulationObserver>(grid, visualizationScheduler,
- writerConfig.outputPath,
- writerConfig.getWriter(),
- converter,
- communicator);
- mqSimulationObserver->process(0);
- return mqSimulationObserver;
+ auto mqCoProcessor = std::make_shared<WriteMacroscopicQuantitiesSimulationObserver>(grid, visualizationScheduler, writerConfig.outputPath, writerConfig.getWriter(), converter, communicator);
+ mqCoProcessor->update(0);
+ return mqCoProcessor;
}
-std::shared_ptr<SimulationObserver> Simulation::makeNupsSimulationObserver() const
+std::shared_ptr<SimulationObserver> CPUSimulation::makeNupsCoProcessor() const
{
auto scheduler = std::make_shared<UbScheduler>(100, 100);
return std::make_shared<NUPSCounterSimulationObserver>(grid, scheduler,
simulationParameters->numberOfThreads,
communicator);
}
-
-
-Simulation::~Simulation() = default;
diff --git a/src/cpu/simulationconfig/include/simulationconfig/Simulation.h b/src/cpu/simulationconfig/Simulation.h
similarity index 84%
rename from src/cpu/simulationconfig/include/simulationconfig/Simulation.h
rename to src/cpu/simulationconfig/Simulation.h
index ba5c5eb2768723bdf842d089d96c7a7fd444ed75..ee8fc911c684b55d0f624ab8db960d225e24790b 100644
--- a/src/cpu/simulationconfig/include/simulationconfig/Simulation.h
+++ b/src/cpu/simulationconfig/Simulation.h
@@ -20,34 +20,13 @@
#include "WriterConfiguration.h"
-class Simulation {
-private:
- KernelFactory kernelFactory = KernelFactory();
-
- std::shared_ptr<LBMKernel> lbmKernel;
- std::shared_ptr<AbstractLBMSystem> lbmSystem;
- std::shared_ptr<vf::mpi::Communicator> communicator;
-
- std::shared_ptr<Grid3D> grid;
- std::vector<std::shared_ptr<Interactor3D>> interactors;
- BoundaryConditionsBlockVisitor bcVisitor;
- std::set<std::shared_ptr<BC>> registeredAdapters;
-
- std::shared_ptr<LBMKernelConfiguration> kernelConfig;
- std::shared_ptr<RuntimeParameters> simulationParameters;
- std::shared_ptr<GridParameters> gridParameters;
- std::shared_ptr<PhysicalParameters> physicalParameters;
-
- WriterConfiguration &writerConfig = *(new WriterConfiguration());
+class CPUSimulation
+{
public:
- explicit Simulation();
-
- ~Simulation();
+ CPUSimulation();
- WriterConfiguration &getWriterConfig();
-
- void setWriterConfiguration(const WriterConfiguration &config);
+ void setWriterConfiguration(WriterConfiguration config);
void setGridParameters(std::shared_ptr<GridParameters> parameters);
@@ -60,7 +39,7 @@ public:
void addObject(const std::shared_ptr<GbObject3D> &object, const std::shared_ptr<BC> &bcAdapter, int state,
const std::string &folderPath);
- void addBC(const std::shared_ptr<BC> &bcAdapter);
+ void addBCAdapter(const std::shared_ptr<BC> &bcAdapter);
void run();
@@ -73,7 +52,7 @@ private:
void writeBoundaryConditions() const;
- std::shared_ptr<SimulationObserver> makeMacroscopicQuantitiesSimulationObserver(const std::shared_ptr<LBMUnitConverter> &converter,
+ std::shared_ptr<SimulationObserver> makeMacroscopicQuantitiesCoProcessor(const std::shared_ptr<LBMUnitConverter> &converter,
const std::shared_ptr<UbScheduler> &visualizationScheduler) const;
static std::shared_ptr<LBMUnitConverter> makeLBMUnitConverter();
@@ -86,14 +65,33 @@ private:
void logSimulationData(const int &nodesInX1, const int &nodesInX2, const int &nodesInX3) const;
-
void setKernelForcing(const std::shared_ptr<LBMKernel> &kernel, std::shared_ptr<LBMUnitConverter> &converter) const;
void setConnectors();
void initializeDistributions();
- std::shared_ptr<SimulationObserver> makeNupsSimulationObserver() const;
+ std::shared_ptr<SimulationObserver> makeNupsCoProcessor() const;
+
+private:
+ KernelFactory kernelFactory = KernelFactory();
+
+ std::shared_ptr<LBMKernel> lbmKernel;
+ std::shared_ptr<AbstractLBMSystem> lbmSystem;
+ std::shared_ptr<vf::mpi::Communicator> communicator;
+
+ std::shared_ptr<Grid3D> grid;
+ std::vector<std::shared_ptr<Interactor3D>> interactors;
+ BoundaryConditionsBlockVisitor bcVisitor {};
+ std::set<std::shared_ptr<BC>> registeredAdapters;
+
+ std::shared_ptr<LBMKernelConfiguration> kernelConfig;
+ std::shared_ptr<RuntimeParameters> simulationParameters;
+ std::shared_ptr<GridParameters> gridParameters;
+ std::shared_ptr<PhysicalParameters> physicalParameters;
+
+ WriterConfiguration writerConfig;
};
+
#endif
\ No newline at end of file
diff --git a/src/cpu/simulationconfig/include/simulationconfig/SimulationParameters.h b/src/cpu/simulationconfig/SimulationParameters.h
similarity index 100%
rename from src/cpu/simulationconfig/include/simulationconfig/SimulationParameters.h
rename to src/cpu/simulationconfig/SimulationParameters.h
diff --git a/src/cpu/simulationconfig/include/simulationconfig/WriterConfiguration.h b/src/cpu/simulationconfig/WriterConfiguration.h
similarity index 95%
rename from src/cpu/simulationconfig/include/simulationconfig/WriterConfiguration.h
rename to src/cpu/simulationconfig/WriterConfiguration.h
index a487917ff3c8a9a7b7f3847e5b04de1801a0fce0..7f7e5fc25d0042317ea7c7ca7f3cef808f09aa96 100644
--- a/src/cpu/simulationconfig/include/simulationconfig/WriterConfiguration.h
+++ b/src/cpu/simulationconfig/WriterConfiguration.h
@@ -14,7 +14,7 @@ struct WriterConfiguration {
OutputFormat outputFormat{};
std::string outputPath{"./output"};
- WbWriter *getWriter()
+ WbWriter *getWriter() const
{
if (outputFormat == ASCII) return WbWriterVtkXmlASCII::getInstance();
if (outputFormat == BINARY) return WbWriterVtkXmlBinary::getInstance();
diff --git a/src/cuda/DeviceInfo.cpp b/src/cuda/DeviceInfo.cpp
index 20ea2c4f6ba098b17e444f55625a6791e46141e5..81fea1cf21418ef98217293985f8c1101f8635be 100644
--- a/src/cuda/DeviceInfo.cpp
+++ b/src/cuda/DeviceInfo.cpp
@@ -15,7 +15,7 @@ void verifyNumberOfDevices(int deviceId)
int device_count = 0;
cudaError_t errorId = cudaGetDeviceCount(&device_count);
if(errorId != cudaSuccess) {
- VF_LOG_CRITICAL("Error while accessing the device count: {}", cudaGetErrorString(errorId));
+ VF_LOG_CRITICAL("Device {}: Error while accessing the device count: {}", deviceId, cudaGetErrorString(errorId));
}
if (deviceId > device_count) {
throw std::runtime_error("chosen gpudevice >= device_count ... exiting\n");
@@ -28,13 +28,13 @@ void verifyComputeCapability(int deviceId)
cudaError_t errorId = cudaGetDeviceProperties(&deviceProp, deviceId);
if(errorId != cudaSuccess){
- VF_LOG_CRITICAL("Error while accessing the device properties occurs: {}", cudaGetErrorString(errorId));
+ VF_LOG_CRITICAL("Device {}: Error while accessing the device properties occurs: {}", deviceId, cudaGetErrorString(errorId));
}
VF_LOG_INFO("[compute capability] = [{}.{}]\n", deviceProp.major, deviceProp.minor);
if (deviceProp.major > 999) {
- throw std::runtime_error("warning, CUDA Device Emulation (CPU) detected, exiting\n");
+ throw std::runtime_error("Warning, CUDA Device Emulation (CPU) detected, exiting\n");
}
}
@@ -43,13 +43,13 @@ void setCudaDevice(int deviceId)
// choose a cuda device for kernel execution
cudaError_t errorId = cudaSetDevice(deviceId);
if (errorId != cudaSuccess) {
- VF_LOG_CRITICAL("Error while setting the device to {}: {}", deviceId, cudaGetErrorString(errorId));
+ VF_LOG_CRITICAL("Device {}: Error while setting the device to: {}", deviceId, cudaGetErrorString(errorId));
} else {
int device;
// double check that device was properly selected
errorId = cudaGetDevice(&device);
if(errorId != cudaSuccess) {
- VF_LOG_CRITICAL("Error while getting the device: {}", cudaGetErrorString(errorId));
+ VF_LOG_CRITICAL("Device {}: Error while getting the device: {}", deviceId, cudaGetErrorString(errorId));
}
}
}
@@ -70,7 +70,7 @@ void printCudaInformation(int deviceId)
cudaError_t errorId = cudaGetDeviceProperties(&prop, deviceId);
if(errorId != cudaSuccess){
- VF_LOG_CRITICAL("Error while accessing the device properties occurs: {}", cudaGetErrorString(errorId));
+ VF_LOG_CRITICAL("Device {}: Error while accessing the device properties occurs: {}", deviceId, cudaGetErrorString(errorId));
}
printf(" --- General Information for device %d ---\n", deviceId);
diff --git a/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.cpp b/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.cpp
index 571796d503a1a73b3eccf631a347884c7522b533..15efa9d3204cc37d4c4ccd8778ea13769ef655b8 100644
--- a/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.cpp
+++ b/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.cpp
@@ -49,16 +49,16 @@ std::vector<T> readStringToVector(std::string s)
std::string readElement(std::string line)
{
- size_t elemStart = line.find("<")+1;
+ const size_t elemStart = line.find('<')+1;
// size_t elemEnd = line.find("/>", elemStart);
- size_t nameLen = line.find(" ", elemStart)-elemStart;
+ const size_t nameLen = line.find(' ', elemStart)-elemStart;
return line.substr(elemStart, nameLen);
}
std::string readAttribute(std::string line, std::string attributeName)
{
- size_t attributeStart = line.find(attributeName)+attributeName.size() + 2; // add 2 for '="'
- size_t attributeLen = line.find("\"", attributeStart)-attributeStart;
+ const size_t attributeStart = line.find(attributeName)+attributeName.size() + 2; // add 2 for '="'
+ const size_t attributeLen = line.find("\"", attributeStart)-attributeStart;
return line.substr(attributeStart, attributeLen);
}
@@ -94,7 +94,7 @@ void VTKFile::readHeader()
getline(file, line); // </ImageData
getline(file, line); // AppendedData
- int offset = int(file.tellg())+sizeof(char)+4; // skip underscore and bytesPerVal
+ const int offset = int(file.tellg())+sizeof(char)+4; // skip underscore and bytesPerVal
for(auto& quantity: this->quantities)
{
@@ -118,7 +118,7 @@ void VTKFile::readHeader()
}
-bool VTKFile::markNANs(std::vector<uint> readIndices)
+bool VTKFile::markNANs(const std::vector<uint>& readIndices) const
{
std::ifstream buf(fileName.c_str(), std::ios::in | std::ios::binary);
@@ -126,7 +126,7 @@ bool VTKFile::markNANs(std::vector<uint> readIndices)
tmp.reserve(readIndices.size());
buf.seekg(this->quantities[0].offset);
buf.read((char*) tmp.data(), sizeof(double)*readIndices.size());
- auto firstNAN = std::find_if(tmp.begin(), tmp.end(), [](auto it){ return isnan(it); });
+ const auto firstNAN = std::find_if(tmp.begin(), tmp.end(), [](auto it){ return isnan(it); });
return firstNAN != tmp.end();
}
@@ -161,7 +161,7 @@ void VTKFile::getData(real *data, uint numberOfNodes, const std::vector<uint> &r
{
if(!this->loaded) loadFile();
- size_t nPoints = writeIndices.size();
+ const size_t nPoints = writeIndices.size();
for(size_t j=0; j<this->quantities.size(); j++)
{
@@ -177,7 +177,7 @@ void VTKFile::printFileInfo()
{
printf("file %s with \n nx %i ny %i nz %i \n origin %f %f %f \n spacing %f %f %f \n",
fileName.c_str(), nx, ny, nz, minX, minY, minZ, deltaX, deltaY, deltaZ);
- for(auto quantity: this->quantities)
+ for(const auto& quantity: this->quantities)
{
printf("\t quantity %s offset %i \n", quantity.name.c_str(), quantity.offset);
}
@@ -199,8 +199,8 @@ void VTKFileCollection::findFiles()
std::vector<VTKFile> filesWithThisId;
while (!foundLastPart)
{
- std::string fname = makeFileName((int)files.size(), (int)filesOnThisLevel.size(), (int)filesWithThisId.size());
- std::ifstream f(fname);
+ const std::string fname = makeFileName((int)files.size(), (int)filesOnThisLevel.size(), (int)filesWithThisId.size());
+ const std::ifstream f(fname);
if(f.good())
filesWithThisId.emplace_back(fname);
else
@@ -223,7 +223,7 @@ void VTKFileCollection::findFiles()
}
if(files.empty())
- VF_LOG_CRITICAL("VTKFileCollection found no files!");
+ throw std::runtime_error("VTKFileCollection found no files!");
}
void TransientBCInputFileReader::getNeighbors(uint* neighbor0PP, uint* neighbor0PM, uint* neighbor0MP, uint* neighbor0MM)
@@ -260,8 +260,8 @@ void VTKReader::fillArrays(std::vector<real>& coordsY, std::vector<real>& coords
{
this->nPoints = (uint)coordsY.size();
this->initializeIndexVectors();
- real max_diff = 1e-4; // maximum distance between point on grid and precursor plane to count as exact match
- real eps = 1e-7; // small number to avoid division by zero
+ const real max_diff = 1e-4; // maximum distance between point on grid and precursor plane to count as exact match
+ const real eps = 1e-7; // small number to avoid division by zero
bool perfect_match = true;
this->weights0PP.reserve(this->nPoints);
@@ -277,11 +277,11 @@ void VTKReader::fillArrays(std::vector<real>& coordsY, std::vector<real>& coords
for(uint i=0; i<nPoints; i++)
{
- real posY = coordsY[i];
- real posZ = coordsZ[i];
+ const real posY = coordsY[i];
+ const real posZ = coordsZ[i];
bool found0PP = false, found0PM = false, found0MP = false, found0MM = false, foundAll = false;
- uint level = this->readLevel;
+ const uint level = this->readLevel;
for(int fileId=0; fileId<(int)this->fileCollection->files[level].size(); fileId++)
{
@@ -290,7 +290,7 @@ void VTKReader::fillArrays(std::vector<real>& coordsY, std::vector<real>& coords
// y in simulation is x in precursor/file, z in simulation is y in precursor/file
// simulation -> file: N -> E, S -> W, T -> N, B -> S
- int idx = file.findNeighborMMM(posY, posZ, 0.f); //!> index of nearest WSB neighbor on precursor file
+ const int idx = file.findNeighborMMM(posY, posZ, 0.f); //!> index of nearest WSB neighbor on precursor file
if(idx!=-1)
{
@@ -301,7 +301,7 @@ void VTKReader::fillArrays(std::vector<real>& coordsY, std::vector<real>& coords
this->weights0PM.emplace_back(0.f);
this->weights0MP.emplace_back(0.f);
this->weights0MM.emplace_back(0.f);
- uint writeIdx = this->getWriteIndex(level, fileId, idx); //!> writeIdx: index on host/device array where precursor value will be written to after loading from file
+ const uint writeIdx = this->getWriteIndex(level, fileId, idx); //!> writeIdx: index on host/device array where precursor value will be written to after loading from file
this->planeNeighbor0PP.push_back(writeIdx); //!> neighbor lists mapping where BC kernel should read from on host/device array
this->planeNeighbor0PM.push_back(writeIdx);
this->planeNeighbor0MP.push_back(writeIdx);
@@ -319,8 +319,8 @@ void VTKReader::fillArrays(std::vector<real>& coordsY, std::vector<real>& coords
if(!found0MM)
{
found0MM = true;
- real dy = file.getX(idx)-posY;
- real dz = file.getY(idx)-posZ;
+ const real dy = file.getX(idx)-posY;
+ const real dz = file.getY(idx)-posZ;
this->weights0MM.emplace_back(1.f/(dy*dy+dz*dz+eps));
this->planeNeighbor0MM.emplace_back(getWriteIndex(level, fileId, idx));
}
@@ -329,12 +329,12 @@ void VTKReader::fillArrays(std::vector<real>& coordsY, std::vector<real>& coords
if(!found0PP) //NT in simulation is EN in precursor
{
- int index = file.findNeighborPPM(posY, posZ, 0.f);
+ const int index = file.findNeighborPPM(posY, posZ, 0.f);
if(index!=-1)
{
found0PP = true;
- real dy = file.getX(index)-posY;
- real dz = file.getY(index)-posZ;
+ const real dy = file.getX(index)-posY;
+ const real dz = file.getY(index)-posZ;
this->weights0PP.emplace_back(1.f/(dy*dy+dz*dz+eps));
this->planeNeighbor0PP.emplace_back(getWriteIndex(level, fileId, index));
}
@@ -342,12 +342,12 @@ void VTKReader::fillArrays(std::vector<real>& coordsY, std::vector<real>& coords
if(!found0PM) //NB in simulation is ES in precursor
{
- int index = file.findNeighborPMM(posY, posZ, 0.f);
+ const int index = file.findNeighborPMM(posY, posZ, 0.f);
if(index!=-1)
{
found0PM = true;
- real dy = file.getX(index)-posY;
- real dz = file.getY(index)-posZ;
+ const real dy = file.getX(index)-posY;
+ const real dz = file.getY(index)-posZ;
this->weights0PM.emplace_back(1.f/(dy*dy+dz*dz+eps));
this->planeNeighbor0PP.emplace_back(getWriteIndex(level, fileId, index));
}
@@ -355,12 +355,12 @@ void VTKReader::fillArrays(std::vector<real>& coordsY, std::vector<real>& coords
if(!found0MP) //ST in simulation is WN in precursor
{
- int index = file.findNeighborMPM(posY, posZ, 0.f);
+ const int index = file.findNeighborMPM(posY, posZ, 0.f);
if(index!=-1)
{
found0MP = true;
- real dy = file.getX(index)-posY;
- real dz = file.getY(index)-posZ;
+ const real dy = file.getX(index)-posY;
+ const real dz = file.getY(index)-posZ;
this->weights0MP.emplace_back(1.f/(dy*dy+dz*dz+eps));
this->planeNeighbor0MP.emplace_back(getWriteIndex(level, fileId, index));
}
@@ -391,8 +391,8 @@ void VTKReader::fillArrays(std::vector<real>& coordsY, std::vector<real>& coords
uint VTKReader::getWriteIndex(int level, int id, int linearIndex)
{
- auto it = std::find(this->writeIndices[level][id].begin(), this->writeIndices[level][id].end(), linearIndex);
- uint idx = it-this->writeIndices[level][id].begin();
+ const auto it = std::find(this->writeIndices[level][id].begin(), this->writeIndices[level][id].end(), linearIndex);
+ const uint idx = it-this->writeIndices[level][id].begin();
if(it==this->writeIndices[level][id].end())
{
this->writeIndices[level][id].push_back(this->nPointsRead); //!> index on host/device array where value from file will be written to
@@ -407,17 +407,16 @@ void VTKReader::getNextData(real* data, uint numberOfNodes, real time)
{
// for(size_t level=0; level<this->fileCollection->files.size(); level++)
// {
- uint level = this->readLevel;
+ const uint level = this->readLevel;
for(size_t id=0; id<this->fileCollection->files[level].size(); id++)
{
size_t numberOfFiles = this->nFile[level][id];
-
if(!this->fileCollection->files[level][id][numberOfFiles].inZBounds(time))
{
numberOfFiles++;
- VF_LOG_INFO("PrecursorBC on level {}: switching to file no. {}\n", level, numberOfFiles);
+ VF_LOG_INFO("PrecursorBC on level {}: switching to file no. {}", level, numberOfFiles);
if(numberOfFiles == this->fileCollection->files[level][id].size())
throw std::runtime_error("Not enough Precursor Files to read");
@@ -433,10 +432,9 @@ void VTKReader::getNextData(real* data, uint numberOfNodes, real time)
}
}
-
VTKFile* file = &this->fileCollection->files[level][id][numberOfFiles];
- int off = file->getClosestIdxZ(time)*file->getNumberOfPointsInXYPlane();
+ const int off = file->getClosestIdxZ(time)*file->getNumberOfPointsInXYPlane();
file->getData(data, numberOfNodes, this->readIndices[level][id], this->writeIndices[level][id], off, this->writingOffset);
this->nFile[level][id] = numberOfFiles;
}
diff --git a/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.h b/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.h
index bdf29745a0a60473d0454c33dcb10a193ca10780..5b9ea91a831da4d9bf189418e0e3eaaf8abd7357 100644
--- a/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.h
+++ b/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.h
@@ -41,7 +41,7 @@ public:
};
void getData(real* data, uint numberOfNodes, const std::vector<uint>& readIndices, const std::vector<uint>& writeIndices, uint offsetRead, uint offsetWrite);
- bool markNANs(std::vector<uint> readIndices);
+ bool markNANs(const std::vector<uint>& readIndices) const;
bool inBoundingBox(real posX, real posY, real posZ){return inXBounds(posX) && inYBounds(posY) && inZBounds(posZ); };
bool inXBounds(real posX){ return posX<=maxX && posX>=minX; };
bool inYBounds(real posY){ return posY<=maxY && posY>=minY; };
@@ -183,7 +183,7 @@ public:
void getNextData(real* data, uint numberOfNodes, real time) override;
void fillArrays(std::vector<real>& coordsY, std::vector<real>& coordsZ) override;
private:
- uint getWriteIndex(int level, int id, int linearIdx);
+ uint getWriteIndex(int level, int id, int linearIndex);
void initializeIndexVectors();
private:
diff --git a/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMeshStrategy.cpp b/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMeshStrategy.cpp
index f66b216525253d26d0402c08ec89131130245ca0..6d12a19cc097c0b8e98c59a938380be97dc0b15c 100644
--- a/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMeshStrategy.cpp
+++ b/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMeshStrategy.cpp
@@ -124,10 +124,6 @@ void RayCastingDiscretizationStrategy::doDiscretize(TriangularMesh* triangularMe
}
}
-
-
- int counter = 0;
-
// Test line intersection
for (z = minZ; z <= maxZ; z += grid->getDelta())
{
@@ -135,7 +131,6 @@ void RayCastingDiscretizationStrategy::doDiscretize(TriangularMesh* triangularMe
{
for (x = minX; x <= maxX; x += grid->getDelta())
{
- counter++;
if (mesh->intersectLine((x - grid->getDelta()), y, z, x, y, z))
break;
grid->setNodeTo(grid->transCoordToIndex(x, y, z), OuterType);
@@ -152,7 +147,6 @@ void RayCastingDiscretizationStrategy::doDiscretize(TriangularMesh* triangularMe
{
if (!grid->isNode(grid->transCoordToIndex(x, y, z), OuterType))
{
- counter++;
if (mesh->intersectLine((x + grid->getDelta()), y, z, x, y, z))
break;
grid->setNodeTo(grid->transCoordToIndex(x, y, z), OuterType);
@@ -170,7 +164,6 @@ void RayCastingDiscretizationStrategy::doDiscretize(TriangularMesh* triangularMe
{
if (!grid->isNode(grid->transCoordToIndex(x, y, z), OuterType))
{
- counter++;
if (mesh->intersectLine(x, (y - grid->getDelta()), z, x, y, z))
break;
grid->setNodeTo(grid->transCoordToIndex(x, y, z), OuterType);
@@ -188,7 +181,6 @@ void RayCastingDiscretizationStrategy::doDiscretize(TriangularMesh* triangularMe
{
if (!grid->isNode(grid->transCoordToIndex(x, y, z), OuterType))
{
- counter++;
if (mesh->intersectLine(x, (y + grid->getDelta()), z, x, y, z))
break;
grid->setNodeTo(grid->transCoordToIndex(x, y, z), OuterType);
@@ -206,7 +198,6 @@ void RayCastingDiscretizationStrategy::doDiscretize(TriangularMesh* triangularMe
{
if (!grid->isNode(grid->transCoordToIndex(x, y, z), OuterType))
{
- counter++;
if (mesh->intersectLine(x, y, (z - grid->getDelta()), x, y, z))
break;
grid->setNodeTo(grid->transCoordToIndex(x, y, z), OuterType);
@@ -224,7 +215,6 @@ void RayCastingDiscretizationStrategy::doDiscretize(TriangularMesh* triangularMe
{
if (!grid->isNode(grid->transCoordToIndex(x, y, z), OuterType))
{
- counter++;
if (mesh->intersectLine(x, y, (z + grid->getDelta()), x, y, z))
break;
grid->setNodeTo(grid->transCoordToIndex(x, y, z), OuterType);
diff --git a/src/gpu/GridGenerator/io/STLReaderWriter/STLReader.cpp b/src/gpu/GridGenerator/io/STLReaderWriter/STLReader.cpp
index d73adc73eeffce56397829c115def5bfd1d8bc59..669d7fb258759266b06a5cc214befdb3f1a6ec29 100644
--- a/src/gpu/GridGenerator/io/STLReaderWriter/STLReader.cpp
+++ b/src/gpu/GridGenerator/io/STLReaderWriter/STLReader.cpp
@@ -217,7 +217,7 @@ std::vector<Triangle> STLReader::readBinarySTL(const std::string& name)
char nTri[4];
sizef = fread(nTri, sizeof(char), 4, file);
- unsigned long nTriLong = *((unsigned long*)nTri);
+ unsigned int nTriLong = *((unsigned int*)nTri);
VF_LOG_INFO("Number of Triangles: {}" , nTriLong);
std::vector<Triangle> triangles;
@@ -309,7 +309,7 @@ std::vector<Triangle> STLReader::readBinarySTL(const BoundingBox &box, const std
sizef = fread(nTri, sizeof(char), 4, file);
- nTriLong = *((unsigned long*)nTri);
+ nTriLong = *((unsigned int*)nTri);
VF_LOG_INFO("Number of Triangles complete geometry: {}", nTriLong);
std::vector<Triangle> triangles;
diff --git a/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.cpp b/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.cpp
index eb7e6b22e160de4fedb5832be807dabf36531c9c..d3a467b0511f7f4b40d06b4c6d9b57ff09b9694a 100644
--- a/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.cpp
+++ b/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.cpp
@@ -479,8 +479,8 @@ void SimulationFileWriter::addShortQsToVector(int index, std::vector<std::vector
}
}
if (qKey > 0) {
- real transportKey = *((real*)&qKey);
- qNode.push_back(transportKey);
+ float transportKey = *((float*)&qKey);
+ qNode.push_back((real)transportKey);
qNode.push_back((real)index);
qs[GEOMQS].push_back(qNode);
}
@@ -522,8 +522,8 @@ void SimulationFileWriter::fillRBForNode(int index, int direction, int direction
qNode.push_back(0.5f);
}
if (qKey > 0) {
- real transportKey = *((real*)&qKey);
- qNode.push_back(transportKey);
+ float transportKey = *((float*)&qKey);
+ qNode.push_back((real)transportKey);
qNode.push_back((real)index);
qs[rb].push_back(qNode);
}
diff --git a/src/gpu/VirtualFluids_GPU/CMakeLists.txt b/src/gpu/VirtualFluids_GPU/CMakeLists.txt
index ed647cb406bca23ef90667b7d17171c7b3f46283..d7e4a776271c5bc243a4ed663ffecd23dec5cebb 100644
--- a/src/gpu/VirtualFluids_GPU/CMakeLists.txt
+++ b/src/gpu/VirtualFluids_GPU/CMakeLists.txt
@@ -1,8 +1,5 @@
project(VirtualFluids_GPU LANGUAGES CUDA CXX)
-find_package(CUDA REQUIRED)
-include_directories("${CUDA_INCLUDE_DIRS}")
-
set(additional_libraries "")
if(MSVC)
set(additional_libraries ws2_32 Traffic) # ws_32 throws an error on Phoenix
@@ -20,9 +17,13 @@ vf_add_tests()
if(BUILD_VF_UNIT_TESTS)
set_target_properties(VirtualFluids_GPUTests PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
- set_source_files_properties(Kernel/Utilities/DistributionHelperTests.cpp PROPERTIES LANGUAGE CUDA)
- set_source_files_properties(DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp PROPERTIES LANGUAGE CUDA)
- set_source_files_properties(Communication/ExchangeData27Test.cpp PROPERTIES LANGUAGE CUDA)
- set_source_files_properties(BoundaryConditions/BoundaryConditionFactoryTest.cpp PROPERTIES LANGUAGE CUDA)
target_include_directories(VirtualFluids_GPUTests PRIVATE "${VF_THIRD_DIR}/cuda_samples/")
+ target_include_directories(VirtualFluids_GPUTests PRIVATE "${VF_ROOT_DIR}/src/gpu/GridGenerator/")
+ set_source_files_properties(Communication/ExchangeData27Test.cpp PROPERTIES LANGUAGE CUDA)
+ set_source_files_properties(Factories/BoundaryConditionFactoryTest.cpp PROPERTIES LANGUAGE CUDA)
+ set_source_files_properties(DataStructureInitializer/GridReaderGenerator/GridGeneratorTest.cpp PROPERTIES LANGUAGE CUDA)
+ set_source_files_properties(DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp PROPERTIES LANGUAGE CUDA)
+ set_source_files_properties(Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/CumulantK17Test.cpp PROPERTIES LANGUAGE CUDA)
+ set_source_files_properties(Kernel/Utilities/DistributionHelperTests.cpp PROPERTIES LANGUAGE CUDA)
+ set_source_files_properties(Parameter/ParameterTest.cpp PROPERTIES LANGUAGE CUDA)
endif()
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp b/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
index 3956bcbee4478e7c780559ef2dc74b2bd1fc79f7..2bb2bd943f6f24a8b904f949a43e75426e497ba1 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
@@ -463,7 +463,6 @@ void printGeoFile(Parameter* para, bool fileFormat)
}
else //Binary:
{
- int tempX = 0;
//////////////////////////////////////////////////////////////////////////
std::ofstream ostr;
ostr.open(fname, std::ios::out | std::ios::binary);
@@ -491,10 +490,8 @@ void printGeoFile(Parameter* para, bool fileFormat)
{
tempCoord = (para->getParH((int)lev)->coordinateX[para->getParH((int)lev)->cpTopIndex[i]] * para->getScaleLBMtoSI().at(0) + para->getTranslateLBMtoSI().at(0));
writeFloatToFile(tempCoord, ostr);
- tempX++;
}
}
- //std::cout << "tempX in geo: " << tempX << endl;
}
//////////////////////////////////////////////////////////////////////////
// Y
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp b/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
index f220c9a811486d14977ac9e55527c9e3e60c2478..c498721e56ff3aea1eab6258b26bfd2c4d95e33a 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
@@ -1,4 +1,4 @@
-#include "Calculation/ForceCalculations.h"
+#include "ForceCalculations.h"
//////////////////////////////////////////////////////////////////////////
#include "GPU/GPU_Interface.h"
@@ -35,18 +35,12 @@ ForceCalculations::ForceCalculations(Parameter* para)
isPID = true;
}
-ForceCalculations::~ForceCalculations()
-{
-}
-
-
-
void ForceCalculations::calcPIDControllerForForce(Parameter* para, CudaMemoryManager* cudaMemoryManager)
{
//////////////////////////////////////////////////////////////////////////
- double tempVeloX = 0.0, tempVeloY = 0.0, tempVeloZ = 0.0;
- double veloAverageX = 0.0; //, veloAverageY = 0.0, veloAverageZ = 0.0;
- double levelVeloAverageX = 0.0, levelVeloAverageY = 0.0, levelVeloAverageZ = 0.0;
+ double tempVeloX = 0.0;
+ double veloAverageX = 0.0;
+ double levelVeloAverageX = 0.0;
int counter = 0;
//////////////////////////////////////////////////////////////////////////
for (int lev = para->getCoarse(); lev <= para->getFine(); lev++)
@@ -72,21 +66,14 @@ void ForceCalculations::calcPIDControllerForForce(Parameter* para, CudaMemoryMan
getLastCudaError("CalcMacSP27 execution failed");
//////////////////////////////////////////////////////////////////
cudaMemoryManager->cudaCopyPrint(lev);
-// para->cudaCopyForceVelo(i,numberOfElements);
//////////////////////////////////////////////////////////////////
for (size_t pos = 0; pos < numberOfElements; pos++)
{
tempVeloX += (double)para->getParH(lev)->velocityX[pos];
- tempVeloY += (double)para->getParH(lev)->velocityY[pos];
- tempVeloZ += (double)para->getParH(lev)->velocityZ[pos];
}
tempVeloX /= (double)numberOfElements;
- tempVeloY /= (double)numberOfElements;
- tempVeloZ /= (double)numberOfElements;
//////////////////////////////////////////////////////////////////
levelVeloAverageX += tempVeloX;
- levelVeloAverageY += tempVeloY;
- levelVeloAverageZ += tempVeloZ;
//////////////////////////////////////////////////////////////////
counter++;
//////////////////////////////////////////////////////////////////
@@ -94,8 +81,6 @@ void ForceCalculations::calcPIDControllerForForce(Parameter* para, CudaMemoryMan
}
//////////////////////////////////////////////////////////////////////////
veloAverageX = levelVeloAverageX / (double)counter;
- //veloAverageY = levelVeloAverageY / (double)counter;
- //veloAverageZ = levelVeloAverageZ / (double)counter;
//////////////////////////////////////////////////////////////////////////
if (isPID)
{
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.h b/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.h
index 4506d23abd7068697a089c926d684406af789aef..867e1327d1a6e2fefaa049f9e3d8e3dd6eb19666 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.h
+++ b/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.h
@@ -13,7 +13,6 @@ class ForceCalculations
{
public:
ForceCalculations(Parameter* para);
- ~ForceCalculations();
void calcPIDControllerForForce(Parameter* para, CudaMemoryManager* cudaMemoryManager);
void printForcing(Parameter* para);
@@ -34,9 +33,4 @@ private:
bool isPID;
};
-
-//void calcVeloForce(Parameter* para);
-//void allocVeloForForcing(Parameter* para);
-//void printForcing(Parameter* para);
-
#endif /* FORCE_CALCULATIONS_H */
diff --git a/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutineMocks.h b/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutineMocks.h
new file mode 100644
index 0000000000000000000000000000000000000000..d05e5b6a3fdb75f9073d9f376980612f040c4038
--- /dev/null
+++ b/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutineMocks.h
@@ -0,0 +1,21 @@
+#ifndef VF_GPU_COMMUNICATIONROUTINEMOCKS_H
+#define VF_GPU_COMMUNICATIONROUTINEMOCKS_H
+
+#include "CommunicationRoutine.h"
+
+namespace vf::gpu::test
+{
+
+class CommunicationRoutineTestDouble : public vf::gpu::CommunicationRoutine
+{
+public:
+ void receive_send(uint *buffer_receive, int size_buffer_recv, int neighbor_rank_recv, uint *buffer_send,
+ int size_buffer_send, int neighbor_rank_send) const override { }
+ int getPID() const override { return 0; }
+};
+
+}
+
+
+
+#endif
diff --git a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
index 716eb6c7c2c091cb79ce502504d634d53ea40937..c52d5af9cacb4d5ae4e46090a263f67d4e63f12d 100644
--- a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
+++ b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
@@ -2,21 +2,10 @@
#define COMMUNICATOR_GPU_H
#include <vector>
-
-#include <mpi.h>
+#include <basics/DataTypes.h>
#include "VirtualFluids_GPU_export.h"
-
#include "CommunicationRoutine.h"
-#include <basics/DataTypes.h>
-
-//////////////////////////////////
-#ifdef VF_DOUBLE_ACCURACY
-#define MPI_Type_GPU MPI_DOUBLE
-#else
-#define MPI_Type_GPU MPI_FLOAT
-#endif
-//////////////////////////////////
namespace vf::gpu
{
@@ -24,59 +13,25 @@ namespace vf::gpu
class VIRTUALFLUIDS_GPU_EXPORT Communicator : public CommunicationRoutine
{
public:
- static Communicator &getInstance();
- Communicator(const Communicator &) = delete;
- Communicator &operator=(const Communicator &) = delete;
- ~Communicator() override;
-
- void exchngBottomToTop(float *sbuf, float *rbuf, int count);
- void exchngTopToBottom(float *sbuf, float *rbuf, int count);
- void waitAll();
- void distributeGeometry(unsigned int *dataRoot, unsigned int *dataNode, int dataSizePerNode);
- int getPID() const override;
- int getNumberOfProcess() const;
- int getNeighbourTop();
- int getNeighbourBottom();
- void exchngData(float *sbuf_t, float *rbuf_t, float *sbuf_b, float *rbuf_b, int count);
- void exchngDataNB(float *sbuf_t, int count_st, float *rbuf_t, int count_rt, float *sbuf_b, int count_sb,
- float *rbuf_b, int count_rb);
+ virtual void waitAll() = 0;
+ virtual int getPID() const override = 0;
+ virtual int getNumberOfProcess() const = 0;
+ virtual void exchngData(float *sbuf_t, float *rbuf_t, float *sbuf_b, float *rbuf_b, int count) = 0;
//////////////////////////////////////////////////////////////////////////
- void exchngDataGPU(real *sbuf, int count_s, real *rbuf, int count_r, int nb_rank);
- void sendRecvGPU(real *sbuf, int count_s, real *rbuf, int count_r, int nb_rank);
- void nbRecvDataGPU(real *rbuf, int count_r, int nb_rank);
- void nbSendDataGPU(real *sbuf, int count_s, int nb_rank);
- void waitallGPU();
- void sendDataGPU(real *sbuf, int count_s, int nb_rank);
- void waitGPU(int id);
- void resetRequest();
- void barrierGPU();
- void barrier();
+ virtual void exchngDataGPU(real *sbuf, int count_s, real *rbuf, int count_r, int nb_rank) = 0;
+ virtual void nbRecvDataGPU(real *rbuf, int count_r, int nb_rank) = 0;
+ virtual void nbSendDataGPU(real *sbuf, int count_s, int nb_rank) = 0;
+ virtual void waitallGPU() = 0;
+ virtual void sendDataGPU(real *sbuf, int count_s, int nb_rank) = 0;
+ virtual void waitGPU(int id) = 0;
+ virtual void resetRequest() = 0;
//////////////////////////////////////////////////////////////////////////
- void exchngDataGeo(int *sbuf_t, int *rbuf_t, int *sbuf_b, int *rbuf_b, int count);
- MPI_Comm getCommunicator();
- void startTimer();
- void stopTimer();
- double getTime();
- int mapCudaDevice(const int &rank, const int &size, const std::vector<unsigned int> &devices, const int &maxdev);
- std::vector<double> gatherNUPS(double processNups);
- double sumNups(double processNups);
+ virtual int mapCudaDevice(const int &rank, const int &size, const std::vector<unsigned int> &devices, const int &maxdev) = 0;
+ virtual double reduceSum(double quantityPerProcess) = 0;
//////////////////////////////////////////////////////////////////////////
- void receive_send(uint *buffer_receive, int size_buffer_recv, int neighbor_rank_recv, uint *buffer_send,
- int size_buffer_send, int neighbor_rank_send) const override;
+ virtual void receive_send(uint *buffer_receive, int size_buffer_recv, int neighbor_rank_recv, uint *buffer_send,
+ int size_buffer_send, int neighbor_rank_send) const override = 0;
-private:
- int numprocs, PID;
- int nbrbottom, nbrtop;
- MPI_Comm comm1d, commGPU;
- MPI_Status status[4];
- MPI_Request request[4];
- //////////////////////////////////////////////////////////////////////////
- std::vector<MPI_Request> requestGPU;
- int rcount;
- //////////////////////////////////////////////////////////////////////////
- double starttime;
- double endtime;
- Communicator();
};
} // namespace vf::gpu
diff --git a/src/gpu/VirtualFluids_GPU/Communication/Communicator.cpp b/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.cpp
similarity index 70%
rename from src/gpu/VirtualFluids_GPU/Communication/Communicator.cpp
rename to src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.cpp
index 89f3595cf6ed4919548d27d47ae987f89053e1d5..8af5931ce92b6fa4904ab3aea7c901773f61a6b3 100644
--- a/src/gpu/VirtualFluids_GPU/Communication/Communicator.cpp
+++ b/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.cpp
@@ -1,4 +1,4 @@
-#include "Communicator.h"
+#include "MpiCommunicator.h"
#include <mpi.h>
#include <vector>
@@ -16,13 +16,13 @@ namespace vf::gpu
{
-Communicator::Communicator()
+MpiCommunicator::MpiCommunicator()
{
int mpiInitialized = 0; // false
MPI_Initialized(&mpiInitialized);
if (!mpiInitialized) {
MPI_Init(NULL, NULL);
- VF_LOG_TRACE("vf::gpu::Communicator(): MPI_Init");
+ VF_LOG_TRACE("vf::gpu::MpiCommunicator(): MPI_Init");
}
MPI_Comm_rank(MPI_COMM_WORLD, &PID);
@@ -40,41 +40,41 @@ Communicator::Communicator()
MPI_Cart_shift(comm1d, 0, 1, &nbrbottom, &nbrtop);
}
-Communicator::~Communicator()
+MpiCommunicator::~MpiCommunicator()
{
// proof if MPI is finalized
int _mpiFinalized = 0; // false
MPI_Finalized(&_mpiFinalized);
if (!_mpiFinalized) {
MPI_Finalize();
- VF_LOG_TRACE("vf::gpu::~Communicator(): MPI_Finalize");
+ VF_LOG_TRACE("vf::gpu::~MpiCommunicator(): MPI_Finalize");
}
}
// C++11 thread safe singelton implementation:
// https://stackoverflow.com/questions/1661529/is-meyers-implementation-of-the-singleton-pattern-thread-safe
-Communicator& Communicator::getInstance()
+MpiCommunicator& MpiCommunicator::getInstance()
{
- static Communicator comm;
+ static MpiCommunicator comm;
return comm;
}
-void Communicator::exchngBottomToTop(float *sbuf, float *rbuf, int count)
+void MpiCommunicator::exchngBottomToTop(float *sbuf, float *rbuf, int count)
{
MPI_Sendrecv(sbuf, count, MPI_FLOAT, nbrtop, 0, rbuf, count, MPI_FLOAT, nbrbottom, 0, comm1d, status);
}
-void Communicator::exchngTopToBottom(float *sbuf, float *rbuf, int count)
+void MpiCommunicator::exchngTopToBottom(float *sbuf, float *rbuf, int count)
{
MPI_Sendrecv(sbuf, count, MPI_FLOAT, nbrbottom, 0, rbuf, count, MPI_FLOAT, nbrtop, 0, comm1d, status);
}
-void Communicator::waitAll() { MPI_Waitall(4, request, status); }
-void Communicator::exchngData(float *sbuf_t, float *rbuf_t, float *sbuf_b, float *rbuf_b, int count)
+void MpiCommunicator::waitAll() { MPI_Waitall(4, request, status); }
+void MpiCommunicator::exchngData(float *sbuf_t, float *rbuf_t, float *sbuf_b, float *rbuf_b, int count)
{
MPI_Sendrecv(sbuf_t, count, MPI_FLOAT, nbrtop, 0, rbuf_t, count, MPI_FLOAT, nbrbottom, 0, comm1d, status);
MPI_Sendrecv(sbuf_b, count, MPI_FLOAT, nbrbottom, 0, rbuf_b, count, MPI_FLOAT, nbrtop, 0, comm1d, status);
}
-void Communicator::exchngDataNB(float *sbuf_t, int count_st, float *rbuf_t, int count_rt, float *sbuf_b, int count_sb,
+void MpiCommunicator::exchngDataNB(float *sbuf_t, int count_st, float *rbuf_t, int count_rt, float *sbuf_b, int count_sb,
float *rbuf_b, int count_rb)
{
MPI_Irecv(rbuf_t, count_rt, MPI_FLOAT, nbrbottom, 0, comm1d, &request[0]);
@@ -85,7 +85,7 @@ void Communicator::exchngDataNB(float *sbuf_t, int count_st, float *rbuf_t, int
}
//////////////////////////////////////////////////////////////////////////
// Crap by Martin Sch.
-void Communicator::exchngDataGPU(real *sbuf, int count_s, real *rbuf, int count_r, int nb_rank)
+void MpiCommunicator::exchngDataGPU(real *sbuf, int count_s, real *rbuf, int count_r, int nb_rank)
{
MPI_Status MSstatus;
MPI_Send(sbuf, count_s, MPI_Type_GPU, nb_rank, 0, commGPU);
@@ -94,13 +94,13 @@ void Communicator::exchngDataGPU(real *sbuf, int count_s, real *rbuf, int count_
// MPI_Sendrecv(sbuf, count_s, MPI_Type_GPU, nb_rank, 0, rbuf, count_r, MPI_Type_GPU, nb_rank, 0, comm1d,
// MPI_STATUSES_IGNORE);
}
-void Communicator::sendRecvGPU(real *sbuf, int count_s, real *rbuf, int count_r, int nb_rank)
+void MpiCommunicator::sendRecvGPU(real *sbuf, int count_s, real *rbuf, int count_r, int nb_rank)
{
// test only - please don't use
MPI_Sendrecv(sbuf, count_s, MPI_Type_GPU, nb_rank, 0, rbuf, count_r, MPI_Type_GPU, nb_rank, 0, commGPU,
MPI_STATUSES_IGNORE);
}
-void Communicator::nbRecvDataGPU(real *rbuf, int count_r, int nb_rank)
+void MpiCommunicator::nbRecvDataGPU(real *rbuf, int count_r, int nb_rank)
{
// printf("\n Start Recv Rank: %d, neighbor Rank: %d, request = %d \n", PID, nb_rank, (int)requestGPU.size());
// fflush(stdout);
@@ -112,7 +112,7 @@ void Communicator::nbRecvDataGPU(real *rbuf, int count_r, int nb_rank)
// printf("\n End Recv - Rank: %d , neighbor Rank: %d \n", PID, nb_rank);
// fflush(stdout);
}
-void Communicator::nbSendDataGPU(real *sbuf, int count_s, int nb_rank)
+void MpiCommunicator::nbSendDataGPU(real *sbuf, int count_s, int nb_rank)
{
// printf("\n Start Send Rank: %d, neighbor Rank: %d, request = %d \n", PID, nb_rank, (int)requestGPU.size());
// fflush(stdout);
@@ -124,7 +124,7 @@ void Communicator::nbSendDataGPU(real *sbuf, int count_s, int nb_rank)
// printf("\n End Send - Rank: %d , neighbor Rank: %d \n", PID, nb_rank);
// fflush(stdout);
}
-void Communicator::waitallGPU()
+void MpiCommunicator::waitallGPU()
{
// printf("\n Start Waitall Rank: %d, request = %d \n", PID, (int)requestGPU.size());
// fflush(stdout);
@@ -136,19 +136,19 @@ void Communicator::waitallGPU()
// printf("\n End Waitall \n");
// fflush(stdout);
}
-void Communicator::sendDataGPU(real *sbuf, int count_s, int nb_rank)
+void MpiCommunicator::sendDataGPU(real *sbuf, int count_s, int nb_rank)
{
MPI_Send(sbuf, count_s, MPI_Type_GPU, nb_rank, 0, commGPU);
}
-void Communicator::waitGPU(int id) { MPI_Wait(&requestGPU[id], MPI_STATUSES_IGNORE); }
-void Communicator::resetRequest()
+void MpiCommunicator::waitGPU(int id) { MPI_Wait(&requestGPU[id], MPI_STATUSES_IGNORE); }
+void MpiCommunicator::resetRequest()
{
if (requestGPU.size() > 0) {
requestGPU.resize(0);
rcount = 0;
}
}
-void Communicator::barrierGPU()
+void MpiCommunicator::barrierGPU()
{
// printf("\n Start Waitall Rank: %d, request = %d \n", PID, (int)requestGPU.size());
// fflush(stdout);
@@ -158,10 +158,10 @@ void Communicator::barrierGPU()
// printf("\n End Waitall \n");
// fflush(stdout);
}
-void Communicator::barrier() { MPI_Barrier(commGPU); }
+void MpiCommunicator::barrier() { MPI_Barrier(commGPU); }
//////////////////////////////////////////////////////////////////////////
-void Communicator::exchngDataGeo(int *sbuf_t, int *rbuf_t, int *sbuf_b, int *rbuf_b, int count)
+void MpiCommunicator::exchngDataGeo(int *sbuf_t, int *rbuf_t, int *sbuf_b, int *rbuf_b, int count)
{
MPI_Irecv(rbuf_t, count, MPI_INT, nbrbottom, 0, comm1d, &request[0]);
MPI_Irecv(rbuf_b, count, MPI_INT, nbrtop, 0, comm1d, &request[1]);
@@ -169,19 +169,16 @@ void Communicator::exchngDataGeo(int *sbuf_t, int *rbuf_t, int *sbuf_b, int *rbu
MPI_Isend(sbuf_b, count, MPI_INT, nbrbottom, 0, comm1d, &request[3]);
MPI_Waitall(4, request, status);
}
-int Communicator::getPID() const { return PID; }
-int Communicator::getNumberOfProcess() const { return numprocs; }
-int Communicator::getNeighbourTop() { return nbrtop; }
-int Communicator::getNeighbourBottom() { return nbrbottom; }
-MPI_Comm Communicator::getCommunicator() { return comm1d; }
-void Communicator::startTimer() { starttime = MPI_Wtime(); }
-void Communicator::stopTimer() { endtime = MPI_Wtime(); }
-double Communicator::getTime() { return endtime - starttime; }
-void Communicator::distributeGeometry(unsigned int *dataRoot, unsigned int *dataNode, int dataSizePerNode)
+int MpiCommunicator::getPID() const { return PID; }
+int MpiCommunicator::getNumberOfProcess() const { return numprocs; }
+int MpiCommunicator::getNeighbourTop() { return nbrtop; }
+int MpiCommunicator::getNeighbourBottom() { return nbrbottom; }
+MPI_Comm MpiCommunicator::getMpiCommunicator() { return comm1d; }
+void MpiCommunicator::distributeGeometry(unsigned int *dataRoot, unsigned int *dataNode, int dataSizePerNode)
{
MPI_Scatter(dataRoot, dataSizePerNode, MPI_UNSIGNED, dataNode, dataSizePerNode, MPI_UNSIGNED, 0, MPI_COMM_WORLD);
}
-int Communicator::mapCudaDevice(const int &rank, const int &size, const std::vector<unsigned int> &devices,
+int MpiCommunicator::mapCudaDevice(const int &rank, const int &size, const std::vector<unsigned int> &devices,
const int &maxdev)
{
int device = -1;
@@ -219,21 +216,9 @@ int Communicator::mapCudaDevice(const int &rank, const int &size, const std::vec
return device;
}
-std::vector<double> Communicator::gatherNUPS(double processNups)
+double MpiCommunicator::reduceSum(double quantityPerProcess)
{
- double *buffer_send = &processNups;
- double *buffer_recv = (double *)malloc(sizeof(double) * this->numprocs);
-
- MPI_Gather(buffer_send, 1, MPI_DOUBLE, buffer_recv, 1, MPI_DOUBLE, 0, commGPU);
-
- if (this->PID == 0)
- return std::vector<double>(buffer_recv, buffer_recv + this->numprocs);
- return std::vector<double>();
-}
-
-double Communicator::sumNups(double processNups)
-{
- double *buffer_send = &processNups;
+ double *buffer_send = &quantityPerProcess;
double *buffer_recv = (double *)malloc(sizeof(double));
MPI_Reduce(buffer_send, buffer_recv, 1, MPI_DOUBLE, MPI_SUM, 0, commGPU);
@@ -241,7 +226,7 @@ double Communicator::sumNups(double processNups)
return *buffer_recv;
}
-void Communicator::receive_send(uint *buffer_receive, int size_buffer_recv, int neighbor_rank_recv, uint *buffer_send,
+void MpiCommunicator::receive_send(uint *buffer_receive, int size_buffer_recv, int neighbor_rank_recv, uint *buffer_send,
int size_buffer_send, int neighbor_rank_send) const
{
MPI_Request recv_request;
diff --git a/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.h b/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.h
new file mode 100644
index 0000000000000000000000000000000000000000..c6a71c0bf2e292133db90f5a1e2110cb1c484c31
--- /dev/null
+++ b/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.h
@@ -0,0 +1,78 @@
+#ifndef MPIMpiCommunicator_GPU_H
+#define MPIMpiCommunicator_GPU_H
+
+#include <vector>
+
+#include <mpi.h>
+
+#include "VirtualFluids_GPU_export.h"
+
+#include "Communicator.h"
+#include <basics/DataTypes.h>
+
+//////////////////////////////////
+#ifdef VF_DOUBLE_ACCURACY
+#define MPI_Type_GPU MPI_DOUBLE
+#else
+#define MPI_Type_GPU MPI_FLOAT
+#endif
+//////////////////////////////////
+
+namespace vf::gpu
+{
+
+class VIRTUALFLUIDS_GPU_EXPORT MpiCommunicator : public Communicator
+{
+public:
+ static MpiCommunicator &getInstance();
+ MpiCommunicator(const MpiCommunicator &) = delete;
+ MpiCommunicator &operator=(const MpiCommunicator &) = delete;
+ ~MpiCommunicator() override;
+
+ void exchngBottomToTop(float *sbuf, float *rbuf, int count);
+ void exchngTopToBottom(float *sbuf, float *rbuf, int count);
+ void waitAll() override;
+ void distributeGeometry(unsigned int *dataRoot, unsigned int *dataNode, int dataSizePerNode);
+ int getPID() const override;
+ int getNumberOfProcess() const override;
+ int getNeighbourTop();
+ int getNeighbourBottom();
+ void exchngData(float *sbuf_t, float *rbuf_t, float *sbuf_b, float *rbuf_b, int count) override;
+ void exchngDataNB(float *sbuf_t, int count_st, float *rbuf_t, int count_rt, float *sbuf_b, int count_sb,
+ float *rbuf_b, int count_rb);
+ //////////////////////////////////////////////////////////////////////////
+ void exchngDataGPU(real *sbuf, int count_s, real *rbuf, int count_r, int nb_rank) override;
+ void sendRecvGPU(real *sbuf, int count_s, real *rbuf, int count_r, int nb_rank);
+ void nbRecvDataGPU(real *rbuf, int count_r, int nb_rank) override;
+ void nbSendDataGPU(real *sbuf, int count_s, int nb_rank) override;
+ void waitallGPU() override;
+ void sendDataGPU(real *sbuf, int count_s, int nb_rank) override;
+ void waitGPU(int id) override;
+ void resetRequest() override;
+ void barrierGPU();
+ void barrier();
+ //////////////////////////////////////////////////////////////////////////
+ void exchngDataGeo(int *sbuf_t, int *rbuf_t, int *sbuf_b, int *rbuf_b, int count);
+ MPI_Comm getMpiCommunicator();
+ int mapCudaDevice(const int &rank, const int &size, const std::vector<unsigned int> &devices, const int &maxdev) override;
+ double reduceSum(double quantityPerProcess) override;
+ //////////////////////////////////////////////////////////////////////////
+ void receive_send(uint *buffer_receive, int size_buffer_recv, int neighbor_rank_recv, uint *buffer_send,
+ int size_buffer_send, int neighbor_rank_send) const override;
+
+private:
+ int numprocs, PID;
+ int nbrbottom, nbrtop;
+ MPI_Comm comm1d, commGPU;
+ MPI_Status status[4];
+ MPI_Request request[4];
+ //////////////////////////////////////////////////////////////////////////
+ std::vector<MPI_Request> requestGPU;
+ int rcount;
+ //////////////////////////////////////////////////////////////////////////
+ MpiCommunicator();
+};
+
+} // namespace vf::gpu
+
+#endif
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.cpp
index 3b511264e9c7edc80bbe367cac4a9b6d8725674b..9b2d1c4f5fa742b46ecd9ad3a9f8e86b499909fb 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.cpp
@@ -9,7 +9,7 @@
#include <GPU/CudaMemoryManager.h>
-std::shared_ptr<GridProvider> GridProvider::makeGridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::gpu::Communicator& communicator)
+std::shared_ptr<GridProvider> GridProvider::makeGridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::gpu::CommunicationRoutine& communicator)
{
return std::shared_ptr<GridProvider>(new GridGenerator(builder, para, cudaMemoryManager, communicator));
}
@@ -35,7 +35,7 @@ void GridProvider::setNumberOfTaggedFluidNodes(uint numberOfNodes, CollisionTemp
para->getParD(level)->numberOfTaggedFluidNodes[tag] = numberOfNodes;
}
-void GridProvider::setInitalNodeValues(uint numberOfNodes, int level) const
+void GridProvider::setInitialNodeValues(uint numberOfNodes, int level) const
{
for (uint pos = 1; pos <= numberOfNodes; pos++)
{
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
index 007db1e0d8e27b3810aa38c089bae8069bbe5813..ee6c93a5f718a2e6907e178bf7b751fbaed824dd 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
@@ -11,7 +11,7 @@
#include "gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h"
namespace vf::gpu
{
-class Communicator;
+class CommunicationRoutine;
}
class Parameter;
@@ -21,7 +21,7 @@ class CudaMemoryManager;
class VIRTUALFLUIDS_GPU_EXPORT GridProvider
{
public:
- static std::shared_ptr<GridProvider> makeGridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::gpu::Communicator& communicator);
+ static std::shared_ptr<GridProvider> makeGridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::gpu::CommunicationRoutine& communicator);
static std::shared_ptr<GridProvider> makeGridReader(FILEFORMAT format, std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager);
virtual void allocArrays_CoordNeighborGeo() = 0;
@@ -48,7 +48,7 @@ public:
protected:
void setNumberOfNodes(uint numberOfNodes, int level) const;
void setNumberOfTaggedFluidNodes(uint numberOfNodes, CollisionTemplate tag, int level) const;
- virtual void setInitalNodeValues(uint numberOfNodes, int level) const;
+ virtual void setInitialNodeValues(uint numberOfNodes, int level) const;
void setPressSizePerLevel(int level, int sizePerLevel) const;
void setVelocitySizePerLevel(int level, int sizePerLevel) const;
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp
index c126b2f79e02272a0bd86bfe0f76fe5efe09a5a7..000e97e9a14e51d140dfa30cb325d2a04cd83f50 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp
@@ -94,7 +94,7 @@ void GridReader::allocArrays_CoordNeighborGeo()
neighWSB->initalNeighbors(para->getParH(level)->neighborInverse, level);
geoV.initalNeighbors( para->getParH(level)->typeOfGridNode, level);
rearrangeGeometry(para.get(), level);
- setInitalNodeValues(numberOfNodesPerLevel, level);
+ setInitialNodeValues(numberOfNodesPerLevel, level);
cudaMemoryManager->cudaCopyNeighborWSB(level);
cudaMemoryManager->cudaCopySP(level);
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
index 789db6d192cfffe5630eb093ad108df57b6870f4..e3c86317c3bf7e4ece5720ac8117e5f418b22fa4 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
@@ -4,6 +4,7 @@
#include "Parameter/Parameter.h"
#include "GridGenerator/grid/GridBuilder/GridBuilder.h"
#include "GPU/CudaMemoryManager.h"
+#include "Parameter/CudaStreamManager.h"
#include "IndexRearrangementForStreams.h"
#include "InterpolationCellGrouper.h"
@@ -14,14 +15,14 @@
#include "GridGenerator/TransientBCSetter/TransientBCSetter.h"
#include "utilities/communication.h"
-#include "Communication/Communicator.h"
+#include "Communication/CommunicationRoutine.h"
#include <logger/Logger.h>
using namespace vf::lbm::dir;
GridGenerator::GridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_ptr<Parameter> para,
- std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::gpu::Communicator &communicator)
+ std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::gpu::CommunicationRoutine &communicator)
: mpiProcessID(communicator.getPID()), builder(builder)
{
this->para = para;
@@ -31,7 +32,7 @@ GridGenerator::GridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_p
std::make_unique<InterpolationCellGrouper>(para->getParHallLevels(), para->getParDallLevels(), builder);
}
-GridGenerator::~GridGenerator() {}
+GridGenerator::~GridGenerator() = default;
void GridGenerator::setIndexRearrangementForStreams(std::unique_ptr<IndexRearrangementForStreams> &&indexRearrangement)
{
@@ -92,7 +93,7 @@ void GridGenerator::allocArrays_CoordNeighborGeo()
para->getParH(level)->typeOfGridNode,
level);
- setInitalNodeValues(numberOfNodesPerLevel, level);
+ setInitialNodeValues(numberOfNodesPerLevel, level);
cudaMemoryManager->cudaCopyNeighborWSB(level);
cudaMemoryManager->cudaCopySP(level);
@@ -201,7 +202,6 @@ void GridGenerator::sortFluidNodeTags() {
void GridGenerator::allocArrays_BoundaryValues()
{
VF_LOG_TRACE("-----alloc BoundaryValues------");
- int blocks;
for (uint level = 0; level < builder->getNumberOfGridLevels(); level++) {
const auto numberOfPressureValues = int(builder->getPressureSize(level));
@@ -212,8 +212,7 @@ void GridGenerator::allocArrays_BoundaryValues()
para->getParD(level)->outflowPressureCorrectionFactor = para->getOutflowPressureCorrectionFactor();
if (numberOfPressureValues > 1)
{
- blocks = (numberOfPressureValues / para->getParH(level)->numberofthreads) + 1;
- para->getParH(level)->pressureBC.numberOfBCnodes = blocks * para->getParH(level)->numberofthreads;
+ para->getParH(level)->pressureBC.numberOfBCnodes = numberOfPressureValues;
cudaMemoryManager->cudaAllocPress(level);
builder->getPressureValues(para->getParH(level)->pressureBC.RhoBC, para->getParH(level)->pressureBC.k, para->getParH(level)->pressureBC.kN, level);
cudaMemoryManager->cudaCopyPress(level);
@@ -229,9 +228,9 @@ void GridGenerator::allocArrays_BoundaryValues()
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->slipBC.numberOfBCnodes = 0;
- if (numberOfSlipValues > 1) {
- blocks = (numberOfSlipValues / para->getParH(level)->numberofthreads) + 1;
- para->getParH(level)->slipBC.numberOfBCnodes = blocks * para->getParH(level)->numberofthreads;
+ if (numberOfSlipValues > 1)
+ {
+ para->getParH(level)->slipBC.numberOfBCnodes = numberOfSlipValues;
cudaMemoryManager->cudaAllocSlipBC(level);
builder->getSlipValues(para->getParH(level)->slipBC.normalX, para->getParH(level)->slipBC.normalY,
para->getParH(level)->slipBC.normalZ, para->getParH(level)->slipBC.k, level);
@@ -250,8 +249,7 @@ void GridGenerator::allocArrays_BoundaryValues()
para->getParH(level)->stressBC.numberOfBCnodes = 0;
if (numberOfStressValues > 1)
{
- blocks = (numberOfStressValues / para->getParH(level)->numberofthreads) + 1;
- para->getParH(level)->stressBC.numberOfBCnodes = blocks * para->getParH(level)->numberofthreads;
+ para->getParH(level)->stressBC.numberOfBCnodes = numberOfStressValues;
cudaMemoryManager->cudaAllocStressBC(level);
cudaMemoryManager->cudaAllocWallModel(level, para->getHasWallModelMonitor());
builder->getStressValues( para->getParH(level)->stressBC.normalX, para->getParH(level)->stressBC.normalY, para->getParH(level)->stressBC.normalZ,
@@ -279,8 +277,7 @@ void GridGenerator::allocArrays_BoundaryValues()
if (numberOfVelocityValues > 1)
{
- blocks = (numberOfVelocityValues / para->getParH(level)->numberofthreads) + 1;
- para->getParH(level)->velocityBC.numberOfBCnodes = blocks * para->getParH(level)->numberofthreads;
+ para->getParH(level)->velocityBC.numberOfBCnodes = numberOfVelocityValues;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
cudaMemoryManager->cudaAllocVeloBC(level);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -328,7 +325,7 @@ void GridGenerator::allocArrays_BoundaryValues()
const auto numberOfPrecursorValues = int(builder->getPrecursorSize(level));
VF_LOG_INFO("size precursor level {}: {}", level, numberOfPrecursorValues);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- blocks = (numberOfPrecursorValues / para->getParH(level)->numberofthreads) + 1;
+ auto blocks = (numberOfPrecursorValues / para->getParH(level)->numberofthreads) + 1;
para->getParH(level)->precursorBC.sizeQ = blocks * para->getParH(level)->numberofthreads;
para->getParD(level)->precursorBC.sizeQ = para->getParH(level)->precursorBC.sizeQ;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -368,6 +365,8 @@ void GridGenerator::allocArrays_BoundaryValues()
cudaMemoryManager->cudaCopyPrecursorBC(level);
cudaMemoryManager->cudaAllocPrecursorData(level);
+ para->getParD(level)->precursorBC.streamIndex = para->getStreamManager()->registerAndLaunchStream(CudaStreamIndex::Precursor);
+
// read first timestep of precursor into next and copy to next on device
for(auto reader : para->getParH(level)->transientBCInputFileReader)
@@ -429,9 +428,8 @@ void GridGenerator::allocArrays_BoundaryValues()
para->getParH(level)->geometryBC.numberOfBCnodes = 0;
if (numberOfGeometryValues > 0)
- {
- blocks = (numberOfGeometryValues / para->getParH(level)->numberofthreads) + 1;
- para->getParH(level)->geometryBC.numberOfBCnodes = blocks * para->getParH(level)->numberofthreads;
+ {;
+ para->getParH(level)->geometryBC.numberOfBCnodes = numberOfGeometryValues;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
cudaMemoryManager->cudaAllocGeomValuesBC(level);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
index 157eb5c37660f4de5f5d547b7bac2bbc5c749fc8..b03de24ec452e37c45280c90497e95fd782ef26c 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
@@ -45,6 +45,10 @@ class Parameter;
class GridBuilder;
class IndexRearrangementForStreams;
class InterpolationCellGrouper;
+namespace vf::gpu
+{
+class CommunicationRoutine;
+}
//! \class GridGenerator derived class of GridProvider
//! \brief mapping the grid of grid generator to data structure for simulation
@@ -63,7 +67,7 @@ private:
const uint mpiProcessID;
public:
- VIRTUALFLUIDS_GPU_EXPORT GridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::gpu::Communicator& communicator);
+ VIRTUALFLUIDS_GPU_EXPORT GridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::gpu::CommunicationRoutine& communicator);
~GridGenerator() override;
//! \brief overwrites the default IndexRearrangementForStreams
void setIndexRearrangementForStreams(std::unique_ptr<IndexRearrangementForStreams>&& indexRearrangement);
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGeneratorTest.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGeneratorTest.cpp
index 23d858f5bb5d8abcfda34a9ccfb5b3ff91ff313c..8685ea9db2d570b1aa6773659d954ac57333e366 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGeneratorTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGeneratorTest.cpp
@@ -1,7 +1,8 @@
#include "GridGenerator.h"
#include <gmock/gmock.h>
-#include "Communication/Communicator.h"
+#include "Communication/CommunicationRoutine.h"
+#include "Communication/MpiCommunicator.h"
#include "DataTypes.h"
#include "GPU/CudaMemoryManager.h"
#include "IndexRearrangementForStreams.h"
@@ -10,6 +11,8 @@
#include "gpu/GridGenerator/grid/GridImp.h"
#include "gpu/GridGenerator/utilities/communication.h"
+#include "Communication/CommunicationRoutineMocks.h"
+
namespace GridGeneratorTest
{
@@ -69,7 +72,7 @@ class IndexRearrangementForStreamsDouble : public IndexRearrangementForStreams
{
public:
IndexRearrangementForStreamsDouble(std::shared_ptr<Parameter> para, std::shared_ptr<GridBuilder> builder,
- vf::gpu::Communicator &communicator)
+ vf::gpu::CommunicationRoutine &communicator)
: IndexRearrangementForStreams(para, builder, communicator){};
void initCommunicationArraysForCommAfterFinetoCoarseX(uint level, int indexOfProcessNeighbor,
@@ -113,7 +116,7 @@ private:
para->setNumprocs(2);
builder = std::make_shared<LevelGridBuilderStub>(nullptr);
- vf::gpu::Communicator &communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::test::CommunicationRoutineTestDouble communicator;
gridGenerator = std::make_shared<GridGenerator>(builder, para, std::make_shared<CudaMemoryManagerDouble>(para),
communicator);
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp
index 696254c44e0fe1150ded8566650483878377928c..d59fa8d017069b665bd6b91f6cf1e685782fab24 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp
@@ -445,7 +445,7 @@ void IndexRearrangementForStreams::findIfSparseIndexIsInSendIndicesAndAddToCommV
void IndexRearrangementForStreams::findIndicesNotInCommAfterFtoC(const uint &numberOfSendOrRecvIndices,
int *sendOrReceiveIndices,
std::vector<int> &sendOrReceiveIndicesAfterFtoC,
- std::vector<int> &sendOrIndicesOther) const
+ std::vector<int> &sendOrIndicesOther)
{
int sparseIndexSend;
for (uint posInSendIndices = 0; posInSendIndices < numberOfSendOrRecvIndices; posInSendIndices++) {
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h
index 6102c2b10f70e54feb10c4b575cd8c07473b608b..0b0401d3424f7a953bf2fa92d0382fd9256a635a 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h
@@ -62,9 +62,12 @@ protected:
std::vector<uint> &sendIndicesForCommAfterFtoCPositions) const;
//! \brief Initializes the send indices for the communication after the interpolation from fine to coarse
- void initRecvIndicesForCommAfterFToCX(uint level, int indexOfProcessNeighbor, int direction, std::vector<uint>& recvIndicesForCommAfterFtoCPositions) const;
- void initRecvIndicesForCommAfterFToCY(uint level, int indexOfProcessNeighbor, int direction, std::vector<uint>& recvIndicesForCommAfterFtoCPositions) const;
- void initRecvIndicesForCommAfterFToCZ(uint level, int indexOfProcessNeighbor, int direction, std::vector<uint>& recvIndicesForCommAfterFtoCPositions) const;
+ void initRecvIndicesForCommAfterFToCX(uint level, int indexOfProcessNeighbor, int direction,
+ std::vector<uint> &recvIndicesForCommAfterFtoCPositions) const;
+ void initRecvIndicesForCommAfterFToCY(uint level, int indexOfProcessNeighbor, int direction,
+ std::vector<uint> &recvIndicesForCommAfterFtoCPositions) const;
+ void initRecvIndicesForCommAfterFToCZ(uint level, int indexOfProcessNeighbor, int direction,
+ std::vector<uint> &recvIndicesForCommAfterFtoCPositions) const;
//! \brief Initializes pointers for reduced communication after the interpolation from fine to coarse by copying
//! them from "normal" communication
@@ -82,10 +85,10 @@ protected:
//! \brief The send indices are reordered for the communication after the interpolation from fine to coarse
//! \details The indices of nodes which are part of the interpolation are moved to the front of vector with the send
- //! indices.
- //! \pre para->getParH(level)->intCF needs to be inititalized
+ //! indices.
+ //! \pre para->getParH(level)->intCF needs to be inititalized
//! \param sendIndices is the pointer to the vector with the send indices, which will be reordered in this function
- //! \param numberOfSendNodesAfterFtoC will be set in this method
+ //! \param numberOfSendNodesAfterFtoC will be set in this method
//! \param sendIndicesForCommAfterFtoCPositions stores each sendIndex's positions before reordering
void reorderSendIndicesForCommAfterFtoC(int *sendIndices, int &numberOfSendNodesAfterFtoC, int direction,
int level, std::vector<uint> &sendIndicesForCommAfterFtoCPositions) const;
@@ -105,9 +108,9 @@ protected:
std::vector<int> &sendIndicesAfterFtoC,
std::vector<uint> &sendIndicesForCommAfterFtoCPositions) const;
//! \brief Find all indices which are not part of the communication after the interpolation from fine to coarse
- void findIndicesNotInCommAfterFtoC(const uint &numberOfSendOrRecvIndices, int *sendOrReceiveIndices,
- std::vector<int> &sendOrReceiveIndicesAfterFtoC,
- std::vector<int> &sendOrIndicesOther) const;
+ static void findIndicesNotInCommAfterFtoC(const uint &numberOfSendOrRecvIndices, int *sendOrReceiveIndices,
+ std::vector<int> &sendOrReceiveIndicesAfterFtoC,
+ std::vector<int> &sendOrIndicesOther);
//! \brief --> see reorderRecvIndicesForCommAfterFtoC
void reorderRecvIndicesForCommAfterFtoCX(int direction, int level, int indexOfProcessNeighbor,
@@ -116,15 +119,16 @@ protected:
std::vector<uint> &sendIndicesForCommAfterFtoCPositions) const;
void reorderRecvIndicesForCommAfterFtoCZ(int direction, int level, int indexOfProcessNeighbor,
std::vector<uint> &sendIndicesForCommAfterFtoCPositions) const;
-
+
//! \brief Reorder the receive indices in the same way that the send indices were reordered.
//! \details When the send indices are reordered, the receive indices need to be reordered accordingly.
//! \pre sendIndicesForCommAfterFtoCPositions should not be empty
- //! \param recvIndices is the pointer to the vector with the receive indices, which will be reordered in this function
- //! \param numberOfRecvNodesAfterFtoC will be set in this function
- //! \param sendIndicesForCommAfterFtoCPositions stores each sendIndex's positions before reordering and is used to reorder the receive indices in the same way
- void reorderRecvIndicesForCommAfterFtoC(int *recvIndices, int &numberOfRecvNodesAfterFtoC, int direction,
- int level, std::vector<uint> &sendIndicesForCommAfterFtoCPositions) const;
+ //! \param recvIndices is the pointer to the vector with the receive indices, which will be reordered in this
+ //! function \param numberOfRecvNodesAfterFtoC will be set in this function \param
+ //! sendIndicesForCommAfterFtoCPositions stores each sendIndex's positions before reordering and is used to reorder
+ //! the receive indices in the same way
+ void reorderRecvIndicesForCommAfterFtoC(int *recvIndices, int &numberOfRecvNodesAfterFtoC, int direction, int level,
+ std::vector<uint> &sendIndicesForCommAfterFtoCPositions) const;
private:
std::shared_ptr<GridBuilder> builder;
@@ -133,6 +137,7 @@ private:
// used for tests
friend class IndexRearrangementForStreamsTest_reorderSendIndices;
+ friend class IndexRearrangementForStreamsTest_reorderRecvIndicesX;
friend class IndexRearrangementForStreamsTest_exchangeIndicesForCommAfterFtoCX;
friend class IndexRearrangementForStreamsTest_exchangeIndicesForCommAfterFtoCY;
friend class IndexRearrangementForStreamsTest_exchangeIndicesForCommAfterFtoCZ;
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp
index 3fe22394823e3c33d43f8fe8709d499e57ee66f9..a8bc58488e6ebad6b38ae894e1c9c194e64c43c8 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp
@@ -13,7 +13,8 @@
#include "gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h"
#include "gpu/GridGenerator/grid/GridImp.h"
#include "gpu/GridGenerator/utilities/communication.h"
-#include "gpu/VirtualFluids_GPU/Communication/Communicator.cpp"
+
+#include "Communication/CommunicationRoutineMocks.h"
namespace indexRearrangementTests
{
@@ -34,6 +35,7 @@ private:
LevelGridBuilderDouble() = default;
uint numberOfSendIndices;
+ uint numberOfRecvIndices;
public:
LevelGridBuilderDouble(SPtr<Grid> grid) : LevelGridBuilder(), grid(grid){};
@@ -49,6 +51,14 @@ public:
{
return numberOfSendIndices;
};
+ uint getNumberOfReceiveIndices(int direction, uint level) override
+ {
+ return numberOfRecvIndices;
+ };
+ void setNumberOfRecvIndices(uint numberOfRecvIndices)
+ {
+ this->numberOfRecvIndices = numberOfRecvIndices;
+ };
};
class GridImpDouble : public GridImp
@@ -139,8 +149,10 @@ private:
para->initProcessNeighborsAfterFtoCX(sendIndices.level);
testSubject = std::make_unique<IndexRearrangementForStreams>(
- IndexRearrangementForStreams(para, builder, vf::gpu::Communicator::getInstance()));
+ IndexRearrangementForStreams(para, builder, communicator));
};
+
+ vf::gpu::test::CommunicationRoutineTestDouble communicator;
};
TEST_F(IndexRearrangementForStreamsTest_reorderSendIndices, reorderSendIndicesForCommAfterFtoCX)
@@ -542,3 +554,146 @@ TEST_F(IndexRearrangementForStreamsTest_exchangeIndicesForCommAfterFtoCZ, recvIn
EXPECT_THAT(recvIndicesForCommAfterFtoCPositions.size(), testing::Eq(4));
EXPECT_THAT(recvIndicesForCommAfterFtoCPositions, testing::Eq(expected));
}
+
+//////////////////////////////////////////////////////////////////////////
+// Test reorderReceiveIndices
+//////////////////////////////////////////////////////////////////////////
+
+struct RecvIndicesForCommAfterFtoC {
+ // data to work on
+ std::vector<int> recvIndices = { 10, 11, 12, 13, 14, 15, 16 };
+ std::vector<uint> sendIndicesForCommAfterFtoCPositions = {};
+ const int level = 0;
+ const int direction = CommunicationDirections::MX;
+ const int numberOfProcessNeighbors = 1;
+ const int indexOfProcessNeighbor = 0;
+
+ // output data
+ int numberOfRecvNodesAfterFtoC;
+ // and reordered recvIndices
+};
+
+class IndexRearrangementForStreamsTest_reorderRecvIndicesX : public testing::Test
+{
+protected:
+ RecvIndicesForCommAfterFtoC ri;
+ SPtr<Parameter> para;
+ std::unique_ptr<IndexRearrangementForStreams> testSubject;
+
+ void setUpParaInX()
+ {
+ para->setNumberOfProcessNeighborsX(ri.numberOfProcessNeighbors, ri.level, "recv");
+ para->initProcessNeighborsAfterFtoCX(ri.level);
+ para->getParH(ri.level)->recvProcessNeighborX[ri.indexOfProcessNeighbor].index = ri.recvIndices.data();
+ }
+
+ void act()
+ {
+ testSubject->reorderRecvIndicesForCommAfterFtoC(ri.recvIndices.data(), ri.numberOfRecvNodesAfterFtoC,
+ ri.direction, ri.level,
+ ri.sendIndicesForCommAfterFtoCPositions);
+ };
+
+ void actWithX()
+ {
+ testSubject->reorderRecvIndicesForCommAfterFtoCX(ri.direction, ri.level, ri.indexOfProcessNeighbor,
+ ri.sendIndicesForCommAfterFtoCPositions);
+ };
+
+private:
+ void SetUp() override
+ {
+ SPtr<GridImpDouble> grid =
+ GridImpDouble::makeShared(nullptr, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, Distribution(), 1);
+ std::shared_ptr<LevelGridBuilderDouble> builder = std::make_shared<LevelGridBuilderDouble>(grid);
+ builder->setNumberOfRecvIndices((uint)ri.recvIndices.size());
+
+ para = testingVF::createParameterForLevel(ri.level);
+
+ testSubject = std::make_unique<IndexRearrangementForStreams>(
+ IndexRearrangementForStreams(para, builder, communicator));
+ };
+
+ vf::gpu::test::CommunicationRoutineTestDouble communicator;
+};
+
+TEST_F(IndexRearrangementForStreamsTest_reorderRecvIndicesX, noSendIndicesForCommunicationAfterScalingFineToCoarse_receiveIndicesAreUnchanged)
+{
+ ri.sendIndicesForCommAfterFtoCPositions = {};
+ auto numberOfRecvNodesAfterFtoC_expected = ri.sendIndicesForCommAfterFtoCPositions.size();
+ std::vector<int> recvIndices_expected = { 10, 11, 12, 13, 14, 15, 16 };
+
+ act();
+ EXPECT_THAT(ri.numberOfRecvNodesAfterFtoC, testing::Eq(numberOfRecvNodesAfterFtoC_expected));
+ EXPECT_THAT(ri.recvIndices, testing::Eq(recvIndices_expected));
+}
+
+TEST_F(IndexRearrangementForStreamsTest_reorderRecvIndicesX, someSendIndicesForCommunicationAfterScalingFineToCoarse_receiveIndicesAreReorderedCorrectly)
+{
+ ri.sendIndicesForCommAfterFtoCPositions = { 0, 2, 4, 6 };
+ auto numberOfRecvNodesAfterFtoC_expected = ri.sendIndicesForCommAfterFtoCPositions.size();
+ std::vector<int> recvIndices_expected = { 10, 12, 14, 16, 11, 13, 15 };
+
+ act();
+ EXPECT_THAT(ri.numberOfRecvNodesAfterFtoC, testing::Eq(numberOfRecvNodesAfterFtoC_expected));
+ EXPECT_THAT(ri.recvIndices, testing::Eq(recvIndices_expected));
+}
+
+TEST_F(IndexRearrangementForStreamsTest_reorderRecvIndicesX, allIndicesAreSendIndicesForCommunicationAfterScalingFineToCoarse_receiveIndicesAreReorderedCorrectly)
+{
+ ri.sendIndicesForCommAfterFtoCPositions = { 0, 1, 2, 3, 4, 5, 6 };
+ auto numberOfRecvNodesAfterFtoC_expected = ri.sendIndicesForCommAfterFtoCPositions.size();
+ std::vector<int> recvIndices_expected = { 10, 11, 12, 13, 14, 15, 16 };
+
+ act();
+ EXPECT_THAT(ri.numberOfRecvNodesAfterFtoC, testing::Eq(numberOfRecvNodesAfterFtoC_expected));
+ EXPECT_THAT(ri.recvIndices, testing::Eq(recvIndices_expected));
+}
+
+TEST_F(IndexRearrangementForStreamsTest_reorderRecvIndicesX, noSendIndicesForCommunicationAfterScalingFineToCoarseInX_receiveIndicesAreUnchanged)
+{
+ setUpParaInX();
+
+ ri.sendIndicesForCommAfterFtoCPositions = {};
+ auto numberOfRecvNodesAfterFtoC_expected = ri.sendIndicesForCommAfterFtoCPositions.size();
+ std::vector<int> recvIndices_expected = { 10, 11, 12, 13, 14, 15, 16 };
+
+ this->actWithX();
+
+ EXPECT_THAT(para->getParH(ri.level)->recvProcessNeighborsAfterFtoCX[ri.indexOfProcessNeighbor].numberOfNodes,
+ testing::Eq(numberOfRecvNodesAfterFtoC_expected));
+ EXPECT_TRUE(vectorsAreEqual(para->getParH(ri.level)->recvProcessNeighborX[ri.indexOfProcessNeighbor].index,
+ recvIndices_expected));
+}
+
+TEST_F(IndexRearrangementForStreamsTest_reorderRecvIndicesX, someSendIndicesForCommunicationAfterScalingFineToCoarseInX_receiveIndicesAreReorderedCorrectly)
+{
+ setUpParaInX();
+
+ ri.sendIndicesForCommAfterFtoCPositions = { 0, 2, 4, 6 };
+ auto numberOfRecvNodesAfterFtoC_expected = ri.sendIndicesForCommAfterFtoCPositions.size();
+ std::vector<int> recvIndices_expected = { 10, 12, 14, 16, 11, 13, 15 };
+
+ actWithX();
+
+ EXPECT_THAT(para->getParH(ri.level)->recvProcessNeighborsAfterFtoCX[ri.indexOfProcessNeighbor].numberOfNodes,
+ testing::Eq(numberOfRecvNodesAfterFtoC_expected));
+ EXPECT_TRUE(vectorsAreEqual(para->getParH(ri.level)->recvProcessNeighborX[ri.indexOfProcessNeighbor].index,
+ recvIndices_expected));
+}
+
+TEST_F(IndexRearrangementForStreamsTest_reorderRecvIndicesX, allIndicesAreSendIndicesForCommunicationAfterScalingFineToCoarseInX_receiveIndicesAreReorderedCorrectly)
+{
+ setUpParaInX();
+
+ ri.sendIndicesForCommAfterFtoCPositions = { 0, 1, 2, 3, 4, 5, 6 };
+ auto numberOfRecvNodesAfterFtoC_expected = ri.sendIndicesForCommAfterFtoCPositions.size();
+ std::vector<int> recvIndices_expected = { 10, 11, 12, 13, 14, 15, 16 };
+
+ actWithX();
+
+ EXPECT_THAT(para->getParH(ri.level)->recvProcessNeighborsAfterFtoCX[ri.indexOfProcessNeighbor].numberOfNodes,
+ testing::Eq(numberOfRecvNodesAfterFtoC_expected));
+ EXPECT_TRUE(vectorsAreEqual(para->getParH(ri.level)->recvProcessNeighborX[ri.indexOfProcessNeighbor].index,
+ recvIndices_expected));
+}
diff --git a/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactory.h b/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactory.h
index c6877cbfeffe5b32c0c2d336e46b02d68cd946a3..09f1a44166829f73c79cd839a7ecf75deae0e67e 100644
--- a/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactory.h
+++ b/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactory.h
@@ -161,15 +161,14 @@ public:
// void setOutflowBoundaryCondition(...); // TODO:
// https://git.rz.tu-bs.de/m.schoenherr/VirtualFluids_dev/-/issues/16
- [[nodiscard]] boundaryCondition getVelocityBoundaryConditionPost(bool isGeometryBC = false) const;
+ [[nodiscard]] virtual boundaryCondition getVelocityBoundaryConditionPost(bool isGeometryBC = false) const;
[[nodiscard]] boundaryCondition getNoSlipBoundaryConditionPost(bool isGeometryBC = false) const;
[[nodiscard]] boundaryCondition getSlipBoundaryConditionPost(bool isGeometryBC = false) const;
[[nodiscard]] boundaryCondition getPressureBoundaryConditionPre() const;
[[nodiscard]] boundaryCondition getGeometryBoundaryConditionPost() const;
- [[nodiscard]] precursorBoundaryConditionFunc getPrecursorBoundaryConditionPost() const;
-
[[nodiscard]] boundaryConditionWithParameter getStressBoundaryConditionPost() const;
+ [[nodiscard]] precursorBoundaryConditionFunc getPrecursorBoundaryConditionPost() const;
private:
VelocityBC velocityBoundaryCondition = VelocityBC::NotSpecified;
diff --git a/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactoryTest.cpp b/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactoryTest.cpp
index 14d01d6df3334d767d97e8db87b7e2a9964022e3..a01b6af7abfebcdf488a66fc0c0ba1c9d3c81987 100644
--- a/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactoryTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactoryTest.cpp
@@ -55,6 +55,8 @@ TEST(BoundaryConditionFactoryTest, defaultStressBC)
EXPECT_THROW(bc(nullptr, nullptr, 0), std::bad_function_call);
}
+// tests for boundary conditions which are set by the user (tests both set and get functions)
+
bcFunction getVelocityBcTarget(BoundaryConditionFactory &bcFactory)
{
auto bc = bcFactory.getVelocityBoundaryConditionPost();
@@ -63,8 +65,6 @@ bcFunction getVelocityBcTarget(BoundaryConditionFactory &bcFactory)
return bcTarget;
}
-// tests for boundary conditions whcih are set by the user (tests both set and get functions)
-
TEST(BoundaryConditionFactoryTest, velocityBC)
{
auto bcFactory = BoundaryConditionFactory();
diff --git a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
index 14e090ff3f02eaec87a9f709fc0e0ac8df711189..64943d19ff54bfaa174d0728a96c517f6605d565 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
+++ b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
@@ -1740,11 +1740,11 @@ void CudaMemoryManager::cudaCopyPrecursorBC(int lev)
}
void CudaMemoryManager::cudaCopyPrecursorData(int lev)
{
- auto prec = ¶meter->getParH(lev)->precursorBC;
- auto precStream = parameter->getStreamManager()->getStream(CudaStreamIndex::Precursor);
- size_t memSize = prec->numberOfPrecursorNodes*sizeof(real)*prec->numberOfQuantities;
- checkCudaErrors( cudaStreamSynchronize(precStream) );
- checkCudaErrors( cudaMemcpyAsync(parameter->getParD(lev)->precursorBC.next, prec->next, memSize, cudaMemcpyHostToDevice, precStream) );
+ auto precurser = ¶meter->getParH(lev)->precursorBC;
+ auto precurserStream = parameter->getStreamManager()->getStream(CudaStreamIndex::Precursor, precurser->streamIndex);
+ size_t memSize = precurser->numberOfPrecursorNodes*sizeof(real)*precurser->numberOfQuantities;
+ checkCudaErrors( cudaStreamSynchronize(precurserStream) );
+ checkCudaErrors( cudaMemcpyAsync(parameter->getParD(lev)->precursorBC.next, precurser->next, memSize, cudaMemcpyHostToDevice, precurserStream) );
}
@@ -3399,14 +3399,17 @@ void CudaMemoryManager::cudaAllocProbeIndices(Probe* probe, int level)
checkCudaErrors( cudaMalloc ((void**) &probe->getProbeStruct(level)->pointIndicesD, tmp) );
setMemsizeGPU(1.f*tmp, false);
}
+
void CudaMemoryManager::cudaCopyProbeIndicesHtoD(Probe* probe, int level)
{
checkCudaErrors( cudaMemcpy(probe->getProbeStruct(level)->pointIndicesD, probe->getProbeStruct(level)->pointIndicesH, sizeof(int)*probe->getProbeStruct(level)->nIndices, cudaMemcpyHostToDevice) );
}
+
void CudaMemoryManager::cudaCopyProbeIndicesDtoH(Probe* probe, int level)
{
checkCudaErrors( cudaMemcpy(probe->getProbeStruct(level)->pointIndicesH, probe->getProbeStruct(level)->pointIndicesD, sizeof(int)*probe->getProbeStruct(level)->nIndices, cudaMemcpyDeviceToHost) );
}
+
void CudaMemoryManager::cudaFreeProbeIndices(Probe* probe, int level)
{
checkCudaErrors( cudaFreeHost(probe->getProbeStruct(level)->pointIndicesH) );
@@ -3415,25 +3418,28 @@ void CudaMemoryManager::cudaFreeProbeIndices(Probe* probe, int level)
void CudaMemoryManager::cudaAllocProbeQuantityArray(Probe* probe, int level)
{
- size_t tmp = sizeof(real)*probe->getProbeStruct(level)->nArrays*probe->getProbeStruct(level)->nPoints;
+ auto probeStruct = probe->getProbeStruct(level);
+ size_t tmp = sizeof(real)*probeStruct->nArrays*probeStruct->nPoints*probeStruct->nTimesteps;
- checkCudaErrors( cudaMallocHost((void**) &probe->getProbeStruct(level)->quantitiesArrayH, tmp) );
+ checkCudaErrors( cudaMallocHost((void**) &probeStruct->quantitiesArrayH, tmp) );
if(probe->getHasDeviceQuantityArray())
{
- checkCudaErrors( cudaMalloc ((void**) &probe->getProbeStruct(level)->quantitiesArrayD, tmp) );
+ checkCudaErrors( cudaMalloc ((void**) &probeStruct->quantitiesArrayD, tmp) );
setMemsizeGPU(1.f*tmp, false);
}
}
void CudaMemoryManager::cudaCopyProbeQuantityArrayHtoD(Probe* probe, int level)
{
- checkCudaErrors( cudaMemcpy(probe->getProbeStruct(level)->quantitiesArrayD, probe->getProbeStruct(level)->quantitiesArrayH, probe->getProbeStruct(level)->nArrays*sizeof(real)*probe->getProbeStruct(level)->nPoints, cudaMemcpyHostToDevice) );
+ auto probeStruct = probe->getProbeStruct(level);
+ size_t tmp = sizeof(real)*probeStruct->nArrays*probeStruct->nPoints*probeStruct->nTimesteps;
+ checkCudaErrors( cudaMemcpy(probeStruct->quantitiesArrayD, probeStruct->quantitiesArrayH, tmp, cudaMemcpyHostToDevice) );
}
void CudaMemoryManager::cudaCopyProbeQuantityArrayDtoH(Probe* probe, int level)
{
auto probeStruct = probe->getProbeStruct(level);
-
- checkCudaErrors( cudaMemcpy(probeStruct->quantitiesArrayH, probeStruct->quantitiesArrayD, probeStruct->nArrays*sizeof(real)*probeStruct->nPoints, cudaMemcpyDeviceToHost) );
+ size_t tmp = sizeof(real)*probeStruct->nArrays*probeStruct->nPoints*probeStruct->nTimesteps;
+ checkCudaErrors( cudaMemcpy(probeStruct->quantitiesArrayH, probeStruct->quantitiesArrayD, tmp, cudaMemcpyDeviceToHost) );
}
void CudaMemoryManager::cudaFreeProbeQuantityArray(Probe* probe, int level)
diff --git a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.h b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.h
index e2f2e8658b6ef7a9453546454dd8e1f643574e17..1d01c227e780ec564b9eb1506f1a0183769d64b9 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.h
@@ -14,7 +14,15 @@
#include <helper_cuda.h>
#include <curand.h>
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#pragma clang diagnostic ignored "-Wunused-but-set-parameter"
+#endif
#include <curand_kernel.h>
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
class Parameter;
class PorousMedia;
diff --git a/src/gpu/VirtualFluids_GPU/GPU/GPU_Interface.h b/src/gpu/VirtualFluids_GPU/GPU/GPU_Interface.h
index 78e6bf8ecf0588eaf6e216916505ec0cbab6c215..b449bcca404b54469b52f7b383f0615632c4d06d 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/GPU_Interface.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/GPU_Interface.h
@@ -10,9 +10,19 @@
#include "LBM/LB.h"
+#include <cuda.h>
#include <cuda_runtime.h>
#include <curand.h>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#pragma clang diagnostic ignored "-Wunused-but-set-parameter"
+#endif
#include <curand_kernel.h>
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
struct LBMSimulationParameter;
class Parameter;
diff --git a/src/gpu/VirtualFluids_GPU/GPU/GridScaling/scaleCF_compressible.cu b/src/gpu/VirtualFluids_GPU/GPU/GridScaling/scaleCF_compressible.cu
index ec1c8207bdd38666f4222270be81b91960142e62..528bbfc7a9584b2c5dedb17098324cbeab9ee1f6 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/GridScaling/scaleCF_compressible.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/GridScaling/scaleCF_compressible.cu
@@ -36,862 +36,27 @@
#include "LBM/GPUHelperFunctions/ChimeraTransformation.h"
#include "LBM/GPUHelperFunctions/ScalingUtilities.h"
-using namespace vf::basics::constant;
-using namespace vf::lbm::dir;
-using namespace vf::gpu;
+#include <lbm/refinement/InterpolationCF.h>
+#include <lbm/refinement/Coefficients.h>
-//////////////////////////////////////////////////////////////////////////
-//! \brief Calculate the interpolated distributions on the fine destination nodes
-//! \details Used in scaling from coarse to fine
-//! The function is executed in the following steps:
-//!
-__device__ __inline__ void interpolateDistributions(
- const real& x, const real& y, const real& z,
- real& m_000,
- real& m_100, real& m_010, real& m_001,
- real& m_011, real& m_101, real& m_110, real& m_200, real& m_020, real& m_002,
- real& m_111, real& m_210, real& m_012, real& m_201, real& m_021, real& m_120, real& m_102,
- real& m_022, real& m_202, real& m_220, real& m_211, real& m_121, real& m_112,
- real& m_122, real& m_212, real& m_221,
- real& m_222,
- const real& a_000, const real& a_100, const real& a_010, const real& a_001, const real& a_200, const real& a_020, const real& a_002, const real& a_110, const real& a_101, const real& a_011, const real& a_111,
- const real& b_000, const real& b_100, const real& b_010, const real& b_001, const real& b_200, const real& b_020, const real& b_002, const real& b_110, const real& b_101, const real& b_011, const real& b_111,
- const real& c_000, const real& c_100, const real& c_010, const real& c_001, const real& c_200, const real& c_020, const real& c_002, const real& c_110, const real& c_101, const real& c_011, const real& c_111,
- const real& d_000, const real& d_100, const real& d_010, const real& d_001, const real& d_110, const real& d_101, const real& d_011, const real& d_111,
- const real& LaplaceRho, const real& eps_new, const real& omegaF,
- const real& kxxMyyAverage, const real& kxxMzzAverage, const real& kyzAverage, const real& kxzAverage, const real& kxyAverage
-)
-{
- real useNEQ = c1o1;//zero;//one; //.... one = on ..... zero = off
-
- //////////////////////////////////////////////////////////////////////////
- // - Reset all moments to zero
- //
- m_111 = c0o1;
- m_211 = c0o1;
- m_011 = c0o1;
- m_121 = c0o1;
- m_101 = c0o1;
- m_112 = c0o1;
- m_110 = c0o1;
- m_221 = c0o1;
- m_001 = c0o1;
- m_201 = c0o1;
- m_021 = c0o1;
- m_212 = c0o1;
- m_010 = c0o1;
- m_210 = c0o1;
- m_012 = c0o1;
- m_122 = c0o1;
- m_100 = c0o1;
- m_120 = c0o1;
- m_102 = c0o1;
- m_222 = c0o1;
- m_022 = c0o1;
- m_202 = c0o1;
- m_002 = c0o1;
- m_220 = c0o1;
- m_020 = c0o1;
- m_200 = c0o1;
- m_000 = c0o1;
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - Set macroscopic values on destination node (zeroth and first order moments)
- //!
- real press = d_000 + x * d_100 + y * d_010 + z * d_001 +
- x * y * d_110 + x * z * d_101 + y * z * d_011 + x * y * z * d_111 + c3o1 * x * x * LaplaceRho;
- real vvx = a_000 + x * a_100 + y * a_010 + z * a_001 +
- x * x * a_200 + y * y * a_020 + z * z * a_002 +
- x * y * a_110 + x * z * a_101 + y * z * a_011 + x * y * z * a_111;
- real vvy = b_000 + x * b_100 + y * b_010 + z * b_001 +
- x * x * b_200 + y * y * b_020 + z * z * b_002 +
- x * y * b_110 + x * z * b_101 + y * z * b_011 + x * y * z * b_111;
- real vvz = c_000 + x * c_100 + y * c_010 + z * c_001 +
- x * x * c_200 + y * y * c_020 + z * z * c_002 +
- x * y * c_110 + x * z * c_101 + y * z * c_011 + x * y * z * c_111;
-
- m_000 = press; // m_000 is press, if drho is interpolated directly
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - Set moments (second to sixth order) on destination node
- //!
- // linear combinations for second order moments
- real mxxPyyPzz = m_000;
-
- real mxxMyy = -c2o3 * (a_100 - b_010 + kxxMyyAverage + c2o1 * a_200 * x - b_110 * x + a_110 * y
- -c2o1 * b_020 * y + a_101 * z - b_011 * z - b_111 * x * z + a_111 * y * z) * eps_new/ omegaF * (c1o1 + press);
- real mxxMzz = -c2o3 * (a_100 - c_001 + kxxMzzAverage + c2o1 * a_200 * x - c_101 * x + a_110 * y
- -c_011 * y - c_111 * x * y + a_101 * z - c2o1 * c_002 * z + a_111 * y * z) * eps_new/ omegaF * (c1o1 + press);
-
- m_011 = -c1o3 * (b_001 + c_010 + kyzAverage + b_101 * x + c_110 * x + b_011 * y + c2o1 * c_020 * y
- + b_111 * x * y + c2o1 * b_002 * z + c_011 * z + c_111 * x * z) * eps_new / omegaF * (c1o1 + press);
- m_101 = -c1o3 * (a_001 + c_100 + kxzAverage + a_101 * x + c2o1 * c_200 * x + a_011 * y + c_110 * y
- + a_111 * x * y + c2o1 * a_002 * z + c_101 * z + c_111 * y * z) * eps_new / omegaF * (c1o1 + press);
- m_110 = -c1o3 * (a_010 + b_100 + kxyAverage + a_110 * x + c2o1 * b_200 * x + c2o1 * a_020 * y
- + b_110 * y + a_011 * z + b_101 * z + a_111 * x * z + b_111 * y * z) * eps_new / omegaF * (c1o1 + press);
-
- m_200 = c1o3 * ( mxxMyy + mxxMzz + mxxPyyPzz) * useNEQ;
- m_020 = c1o3 * (-c2o1 * mxxMyy + mxxMzz + mxxPyyPzz) * useNEQ;
- m_002 = c1o3 * ( mxxMyy - c2o1 * mxxMzz + mxxPyyPzz) * useNEQ;
-
- // linear combinations for third order moments
- m_111 = c0o1;
-
- real mxxyPyzz = c0o1;
- real mxxyMyzz = c0o1;
- real mxxzPyyz = c0o1;
- real mxxzMyyz = c0o1;
- real mxyyPxzz = c0o1;
- real mxyyMxzz = c0o1;
-
- m_210 = ( mxxyMyzz + mxxyPyzz) * c1o2;
- m_012 = (-mxxyMyzz + mxxyPyzz) * c1o2;
- m_201 = ( mxxzMyyz + mxxzPyyz) * c1o2;
- m_021 = (-mxxzMyyz + mxxzPyyz) * c1o2;
- m_120 = ( mxyyMxzz + mxyyPxzz) * c1o2;
- m_102 = (-mxyyMxzz + mxyyPxzz) * c1o2;
-
- // fourth order moments
- m_022 = m_000 * c1o9;
- m_202 = m_022;
- m_220 = m_022;
-
- // fifth order moments
-
- // sixth order moment
- m_222 = m_000 * c1o27;
-
- real vx_sq = vvx * vvx;
- real vy_sq = vvy * vvy;
- real vz_sq = vvz * vvz;
-
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Chimera transform from central moments to well conditioned distributions as defined in Appendix J in
- //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015),
- //! DOI:10.1016/j.camwa.2015.05.001 ]</b></a> see also Eq. (88)-(96) in <a
- //! href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040
- //! ]</b></a>
- //!
-
- ////////////////////////////////////////////////////////////////////////////////////
- // X - Dir
- backwardInverseChimeraWithK(m_000, m_100, m_200, vvx, vx_sq, c1o1, c1o1);
- backwardChimera( m_010, m_110, m_210, vvx, vx_sq);
- backwardInverseChimeraWithK(m_020, m_120, m_220, vvx, vx_sq, c3o1, c1o3);
- backwardChimera( m_001, m_101, m_201, vvx, vx_sq);
- backwardChimera( m_011, m_111, m_211, vvx, vx_sq);
- backwardChimera( m_021, m_121, m_221, vvx, vx_sq);
- backwardInverseChimeraWithK(m_002, m_102, m_202, vvx, vx_sq, c3o1, c1o3);
- backwardChimera( m_012, m_112, m_212, vvx, vx_sq);
- backwardInverseChimeraWithK(m_022, m_122, m_222, vvx, vx_sq, c9o1, c1o9);
-
- ////////////////////////////////////////////////////////////////////////////////////
- // Y - Dir
- backwardInverseChimeraWithK(m_000, m_010, m_020, vvy, vy_sq, c6o1, c1o6);
- backwardChimera( m_001, m_011, m_021, vvy, vy_sq);
- backwardInverseChimeraWithK(m_002, m_012, m_022, vvy, vy_sq, c18o1, c1o18);
- backwardInverseChimeraWithK(m_100, m_110, m_120, vvy, vy_sq, c3o2, c2o3);
- backwardChimera( m_101, m_111, m_121, vvy, vy_sq);
- backwardInverseChimeraWithK(m_102, m_112, m_122, vvy, vy_sq, c9o2, c2o9);
- backwardInverseChimeraWithK(m_200, m_210, m_220, vvy, vy_sq, c6o1, c1o6);
- backwardChimera( m_201, m_211, m_221, vvy, vy_sq);
- backwardInverseChimeraWithK(m_202, m_212, m_222, vvy, vy_sq, c18o1, c1o18);
- ////////////////////////////////////////////////////////////////////////////////////
- // Z - Dir
- backwardInverseChimeraWithK(m_000, m_001, m_002, vvz, vz_sq, c36o1, c1o36);
- backwardInverseChimeraWithK(m_010, m_011, m_012, vvz, vz_sq, c9o1, c1o9);
- backwardInverseChimeraWithK(m_020, m_021, m_022, vvz, vz_sq, c36o1, c1o36);
- backwardInverseChimeraWithK(m_100, m_101, m_102, vvz, vz_sq, c9o1, c1o9);
- backwardInverseChimeraWithK(m_110, m_111, m_112, vvz, vz_sq, c9o4, c4o9);
- backwardInverseChimeraWithK(m_120, m_121, m_122, vvz, vz_sq, c9o1, c1o9);
- backwardInverseChimeraWithK(m_200, m_201, m_202, vvz, vz_sq, c36o1, c1o36);
- backwardInverseChimeraWithK(m_210, m_211, m_212, vvz, vz_sq, c9o1, c1o9);
- backwardInverseChimeraWithK(m_220, m_221, m_222, vvz, vz_sq, c36o1, c1o36);
-}
-
-//////////////////////////////////////////////////////////////////////////
-//! \brief Interpolate from coarse to fine nodes
-//! \details This scaling function is designed for the Cumulant K17 Kernel chimera collision kernel.
-//!
-//! The function is executed in the following steps:
-//!
-// based on scaleCF_RhoSq_comp_27
-template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
- real* distributionsCoarse,
+template <bool hasTurbulentViscosity> __device__ void interpolate(
+ vf::lbm::Coefficients& coefficients,
+ const unsigned int nodeIndex,
real* distributionsFine,
- unsigned int* neighborXcoarse,
- unsigned int* neighborYcoarse,
- unsigned int* neighborZcoarse,
unsigned int* neighborXfine,
unsigned int* neighborYfine,
unsigned int* neighborZfine,
- unsigned long long numberOfLBnodesCoarse,
- unsigned long long numberOfLBnodesFine,
- bool isEvenTimestep,
- unsigned int* indicesCoarseMMM,
- unsigned int* indicesFineMMM,
- unsigned int numberOfInterfaceNodes,
- real omegaCoarse,
- real omegaFine,
- real* turbulentViscosityCoarse,
- real* turbulentViscosityFine,
- ICellNeigh neighborCoarseToFine)
+ unsigned long long numberOfLBnodesFine,
+ unsigned int* indicesFineMMM,
+ real omegaFine,
+ real* turbulentViscosityFine)
{
- ////////////////////////////////////////////////////////////////////////////////
- //! - Get the node index coordinates from threadId_100, blockId_100, blockDim and gridDim.
- //!
- const unsigned nodeIndex = getNodeIndex();
-
- //////////////////////////////////////////////////////////////////////////
- //! - Return for non-interface node
- if (nodeIndex >= numberOfInterfaceNodes)
- return;
-
- //////////////////////////////////////////////////////////////////////////
- //! - Read distributions: style of reading and writing the distributions from/to stored arrays dependent on
- //! timestep is based on the esoteric twist algorithm \ref <a
- //! href="https://doi.org/10.3390/computation5020019"><b>[ M. Geier et al. (2017),
- //! DOI:10.3390/computation5020019 ]</b></a>
- //!
- Distributions27 distFine, distCoarse;
- getPointersToDistributions(distFine, distributionsFine, numberOfLBnodesFine, true);
- getPointersToDistributions(distCoarse, distributionsCoarse, numberOfLBnodesCoarse, isEvenTimestep);
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - declare local variables for source nodes
- //!
- real eps_new = c1o2; // ratio of grid resolutions
- real omegaC = omegaCoarse;
- real omegaF = omegaFine;
-
- // zeroth and first order moments at the source nodes
- real drho_PPP, vx1_PPP, vx2_PPP, vx3_PPP;
- real drho_MPP, vx1_MPP, vx2_MPP, vx3_MPP;
- real drho_PMP, vx1_PMP, vx2_PMP, vx3_PMP;
- real drho_MMP, vx1_MMP, vx2_MMP, vx3_MMP;
- real drho_PPM, vx1_PPM, vx2_PPM, vx3_PPM;
- real drho_MPM, vx1_MPM, vx2_MPM, vx3_MPM;
- real drho_PMM, vx1_PMM, vx2_PMM, vx3_PMM;
- real drho_MMM, vx1_MMM, vx2_MMM, vx3_MMM;
-
- // second order moments at the source nodes
- real kxyFromfcNEQ_PPP, kyzFromfcNEQ_PPP, kxzFromfcNEQ_PPP, kxxMyyFromfcNEQ_PPP, kxxMzzFromfcNEQ_PPP;
- real kxyFromfcNEQ_MPP, kyzFromfcNEQ_MPP, kxzFromfcNEQ_MPP, kxxMyyFromfcNEQ_MPP, kxxMzzFromfcNEQ_MPP;
- real kxyFromfcNEQ_PMP, kyzFromfcNEQ_PMP, kxzFromfcNEQ_PMP, kxxMyyFromfcNEQ_PMP, kxxMzzFromfcNEQ_PMP;
- real kxyFromfcNEQ_MMP, kyzFromfcNEQ_MMP, kxzFromfcNEQ_MMP, kxxMyyFromfcNEQ_MMP, kxxMzzFromfcNEQ_MMP;
- real kxyFromfcNEQ_PPM, kyzFromfcNEQ_PPM, kxzFromfcNEQ_PPM, kxxMyyFromfcNEQ_PPM, kxxMzzFromfcNEQ_PPM;
- real kxyFromfcNEQ_MPM, kyzFromfcNEQ_MPM, kxzFromfcNEQ_MPM, kxxMyyFromfcNEQ_MPM, kxxMzzFromfcNEQ_MPM;
- real kxyFromfcNEQ_PMM, kyzFromfcNEQ_PMM, kxzFromfcNEQ_PMM, kxxMyyFromfcNEQ_PMM, kxxMzzFromfcNEQ_PMM;
- real kxyFromfcNEQ_MMM, kyzFromfcNEQ_MMM, kxzFromfcNEQ_MMM, kxxMyyFromfcNEQ_MMM, kxxMzzFromfcNEQ_MMM;
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - Calculate moments for each source node
- //!
- ////////////////////////////////////////////////////////////////////////////////
- // source node BSW = MMM
- ////////////////////////////////////////////////////////////////////////////////
- // index of the base node and its neighbors
- unsigned int k_base_000 = indicesCoarseMMM[nodeIndex];
- unsigned int k_base_M00 = neighborXcoarse [k_base_000];
- unsigned int k_base_0M0 = neighborYcoarse [k_base_000];
- unsigned int k_base_00M = neighborZcoarse [k_base_000];
- unsigned int k_base_MM0 = neighborYcoarse [k_base_M00];
- unsigned int k_base_M0M = neighborZcoarse [k_base_M00];
- unsigned int k_base_0MM = neighborZcoarse [k_base_0M0];
- unsigned int k_base_MMM = neighborZcoarse [k_base_MM0];
- ////////////////////////////////////////////////////////////////////////////////
- // Set neighbor indices
- unsigned int k_000 = k_base_000;
- unsigned int k_M00 = k_base_M00;
- unsigned int k_0M0 = k_base_0M0;
- unsigned int k_00M = k_base_00M;
- unsigned int k_MM0 = k_base_MM0;
- unsigned int k_M0M = k_base_M0M;
- unsigned int k_0MM = k_base_0MM;
- unsigned int k_MMM = k_base_MMM;
-
- if(hasTurbulentViscosity) omegaC = omegaCoarse / (c1o1 + c3o1*omegaCoarse*turbulentViscosityCoarse[k_000]);
-
- calculateMomentsOnSourceNodes( distCoarse, omegaC,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_MMM, vx1_MMM, vx2_MMM, vx3_MMM,
- kxyFromfcNEQ_MMM, kyzFromfcNEQ_MMM, kxzFromfcNEQ_MMM, kxxMyyFromfcNEQ_MMM, kxxMzzFromfcNEQ_MMM);
-
- //////////////////////////////////////////////////////////////////////////
- // source node TSW = MMP
- //////////////////////////////////////////////////////////////////////////
- // Set neighbor indices - has to be recalculated for the new source node
- k_000 = k_00M;
- k_M00 = k_M0M;
- k_0M0 = k_0MM;
- k_00M = neighborZcoarse[k_00M];
- k_MM0 = k_MMM;
- k_M0M = neighborZcoarse[k_M0M];
- k_0MM = neighborZcoarse[k_0MM];
- k_MMM = neighborZcoarse[k_MMM];
-
- if(hasTurbulentViscosity) omegaC = omegaCoarse / (c1o1 + c3o1*omegaCoarse*turbulentViscosityCoarse[k_000]);
-
- calculateMomentsOnSourceNodes( distCoarse, omegaC,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_MMP, vx1_MMP, vx2_MMP, vx3_MMP,
- kxyFromfcNEQ_MMP, kyzFromfcNEQ_MMP, kxzFromfcNEQ_MMP, kxxMyyFromfcNEQ_MMP, kxxMzzFromfcNEQ_MMP);
-
- //////////////////////////////////////////////////////////////////////////
- // source node TSE = PMP
- //////////////////////////////////////////////////////////////////////////
- // index
- k_000 = k_M00;
- k_M00 = neighborXcoarse[k_M00];
- k_0M0 = k_MM0;
- k_00M = k_M0M;
- k_MM0 = neighborXcoarse[k_MM0];
- k_M0M = neighborXcoarse[k_M0M];
- k_0MM = k_MMM;
- k_MMM = neighborXcoarse[k_MMM];
-
- if(hasTurbulentViscosity) omegaC = omegaCoarse / (c1o1 + c3o1*omegaCoarse*turbulentViscosityCoarse[k_000]);
-
- calculateMomentsOnSourceNodes( distCoarse, omegaC,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_PMP, vx1_PMP, vx2_PMP, vx3_PMP,
- kxyFromfcNEQ_PMP, kyzFromfcNEQ_PMP, kxzFromfcNEQ_PMP, kxxMyyFromfcNEQ_PMP, kxxMzzFromfcNEQ_PMP);
-
- //////////////////////////////////////////////////////////////////////////
- // source node BSE = PMM
- //////////////////////////////////////////////////////////////////////////
- // index
- k_00M = k_000;
- k_M0M = k_M00;
- k_0MM = k_0M0;
- k_MMM = k_MM0;
- k_000 = k_base_M00;
- k_M00 = neighborXcoarse[k_base_M00];
- k_0M0 = k_base_MM0;
- k_MM0 = neighborXcoarse[k_base_MM0];
-
- if(hasTurbulentViscosity) omegaC = omegaCoarse / (c1o1 + c3o1*omegaCoarse*turbulentViscosityCoarse[k_000]);
-
- calculateMomentsOnSourceNodes( distCoarse, omegaC,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_PMM, vx1_PMM, vx2_PMM, vx3_PMM,
- kxyFromfcNEQ_PMM, kyzFromfcNEQ_PMM, kxzFromfcNEQ_PMM, kxxMyyFromfcNEQ_PMM, kxxMzzFromfcNEQ_PMM);
-
- //////////////////////////////////////////////////////////////////////////
- // source node BNW = MPM
- //////////////////////////////////////////////////////////////////////////
- // index of the base node and its neighbors --> indices of all source nodes
- k_base_000 = k_base_0M0;
- k_base_M00 = k_base_MM0;
- k_base_0M0 = neighborYcoarse[k_base_0M0];
- k_base_00M = k_base_0MM;
- k_base_MM0 = neighborYcoarse[k_base_MM0];
- k_base_M0M = k_base_MMM;
- k_base_0MM = neighborYcoarse[k_base_0MM];
- k_base_MMM = neighborYcoarse[k_base_MMM];
- //////////////////////////////////////////////////////////////////////////
- // index
- k_000 = k_base_000;
- k_M00 = k_base_M00;
- k_0M0 = k_base_0M0;
- k_00M = k_base_00M;
- k_MM0 = k_base_MM0;
- k_M0M = k_base_M0M;
- k_0MM = k_base_0MM;
- k_MMM = k_base_MMM;
-
- if(hasTurbulentViscosity) omegaC = omegaCoarse / (c1o1 + c3o1*omegaCoarse*turbulentViscosityCoarse[k_000]);
-
- calculateMomentsOnSourceNodes( distCoarse, omegaC,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_MPM, vx1_MPM, vx2_MPM, vx3_MPM,
- kxyFromfcNEQ_MPM, kyzFromfcNEQ_MPM, kxzFromfcNEQ_MPM, kxxMyyFromfcNEQ_MPM, kxxMzzFromfcNEQ_MPM);
-
- //////////////////////////////////////////////////////////////////////////
- // source node TNW = MPP
- //////////////////////////////////////////////////////////////////////////
- // index
- k_000 = k_00M;
- k_M00 = k_M0M;
- k_0M0 = k_0MM;
- k_00M = neighborZcoarse[k_00M];
- k_MM0 = k_MMM;
- k_M0M = neighborZcoarse[k_M0M];
- k_0MM = neighborZcoarse[k_0MM];
- k_MMM = neighborZcoarse[k_MMM];
-
- if(hasTurbulentViscosity) omegaC = omegaCoarse / (c1o1 + c3o1*omegaCoarse*turbulentViscosityCoarse[k_000]);
-
- calculateMomentsOnSourceNodes( distCoarse, omegaC,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_MPP, vx1_MPP, vx2_MPP, vx3_MPP,
- kxyFromfcNEQ_MPP, kyzFromfcNEQ_MPP, kxzFromfcNEQ_MPP, kxxMyyFromfcNEQ_MPP, kxxMzzFromfcNEQ_MPP);
-
- //////////////////////////////////////////////////////////////////////////
- // source node TNE = PPP
- //////////////////////////////////////////////////////////////////////////
- // index
- // index
- k_000 = k_M00;
- k_M00 = neighborXcoarse[k_M00];
- k_0M0 = k_MM0;
- k_00M = k_M0M;
- k_MM0 = neighborXcoarse[k_MM0];
- k_M0M = neighborXcoarse[k_M0M];
- k_0MM = k_MMM;
- k_MMM = neighborXcoarse[k_MMM];
-
- if(hasTurbulentViscosity) omegaC = omegaCoarse / (c1o1 + c3o1*omegaCoarse*turbulentViscosityCoarse[k_000]);
-
- calculateMomentsOnSourceNodes( distCoarse, omegaC,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_PPP, vx1_PPP, vx2_PPP, vx3_PPP,
- kxyFromfcNEQ_PPP, kyzFromfcNEQ_PPP, kxzFromfcNEQ_PPP, kxxMyyFromfcNEQ_PPP, kxxMzzFromfcNEQ_PPP);
-
- //////////////////////////////////////////////////////////////////////////
- // source node BNE = PPM
- //////////////////////////////////////////////////////////////////////////
- // index
- k_00M = k_000;
- k_M0M = k_M00;
- k_0MM = k_0M0;
- k_MMM = k_MM0;
- k_000 = k_base_M00;
- k_M00 = neighborXcoarse[k_base_M00];
- k_0M0 = k_base_MM0;
- k_MM0 = neighborXcoarse[k_base_MM0];
-
- if(hasTurbulentViscosity) omegaC = omegaCoarse / (c1o1 + c3o1*omegaCoarse*turbulentViscosityCoarse[k_000]);
-
- calculateMomentsOnSourceNodes( distCoarse, omegaC,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_PPM, vx1_PPM, vx2_PPM, vx3_PPM,
- kxyFromfcNEQ_PPM, kyzFromfcNEQ_PPM, kxzFromfcNEQ_PPM, kxxMyyFromfcNEQ_PPM, kxxMzzFromfcNEQ_PPM);
-
- //////////////////////////////////////////////////////////////////////////
- //! - Calculate coefficients for polynomial interpolation
- //!
- // example: a_110: derivation in x and y direction
- real a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011, a_111;
- real b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011, b_111;
- real c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011, c_111;
- real d_000, d_100, d_010, d_001, d_110, d_101, d_011, d_111;
-
- // a_000 = (-kxxMyyFromfcNEQ_PPM - kxxMyyFromfcNEQ_PPP + kxxMyyFromfcNEQ_MPM + kxxMyyFromfcNEQ_MPP -
- // kxxMyyFromfcNEQ_PMM - kxxMyyFromfcNEQ_PMP + kxxMyyFromfcNEQ_MMM + kxxMyyFromfcNEQ_MMP -
- // kxxMzzFromfcNEQ_PPM - kxxMzzFromfcNEQ_PPP + kxxMzzFromfcNEQ_MPM + kxxMzzFromfcNEQ_MPP -
- // kxxMzzFromfcNEQ_PMM - kxxMzzFromfcNEQ_PMP + kxxMzzFromfcNEQ_MMM + kxxMzzFromfcNEQ_MMP -
- // c2o1 * kxyFromfcNEQ_PPM - c2o1 * kxyFromfcNEQ_PPP - c2o1 * kxyFromfcNEQ_MPM - c2o1 * kxyFromfcNEQ_MPP +
- // c2o1 * kxyFromfcNEQ_PMM + c2o1 * kxyFromfcNEQ_PMP + c2o1 * kxyFromfcNEQ_MMM + c2o1 * kxyFromfcNEQ_MMP +
- // c2o1 * kxzFromfcNEQ_PPM - c2o1 * kxzFromfcNEQ_PPP + c2o1 * kxzFromfcNEQ_MPM - c2o1 * kxzFromfcNEQ_MPP +
- // c2o1 * kxzFromfcNEQ_PMM - c2o1 * kxzFromfcNEQ_PMP + c2o1 * kxzFromfcNEQ_MMM - c2o1 * kxzFromfcNEQ_MMP +
- // c8o1 * vx1_PPM + c8o1 * vx1_PPP + c8o1 * vx1_MPM + c8o1 * vx1_MPP + c8o1 * vx1_PMM + c8o1 * vx1_PMP +
- // c8o1 * vx1_MMM + c8o1 * vx1_MMP + c2o1 * vx2_PPM + c2o1 * vx2_PPP - c2o1 * vx2_MPM - c2o1 * vx2_MPP -
- // c2o1 * vx2_PMM - c2o1 * vx2_PMP + c2o1 * vx2_MMM + c2o1 * vx2_MMP - c2o1 * vx3_PPM + c2o1 * vx3_PPP +
- // c2o1 * vx3_MPM - c2o1 * vx3_MPP - c2o1 * vx3_PMM + c2o1 * vx3_PMP + c2o1 * vx3_MMM - c2o1 * vx3_MMP) /
- // c64o1;
- a_000 =
- c1o64 * (c2o1 * (((kxyFromfcNEQ_MMM - kxyFromfcNEQ_PPP) + (kxyFromfcNEQ_MMP - kxyFromfcNEQ_PPM)) +
- ((kxyFromfcNEQ_PMM - kxyFromfcNEQ_MPP) + (kxyFromfcNEQ_PMP - kxyFromfcNEQ_MPM)) +
- ((kxzFromfcNEQ_MMM - kxzFromfcNEQ_PPP) + (kxzFromfcNEQ_PPM - kxzFromfcNEQ_MMP)) +
- ((kxzFromfcNEQ_PMM - kxzFromfcNEQ_MPP) + (kxzFromfcNEQ_MPM - kxzFromfcNEQ_PMP)) +
- ((vx2_PPP + vx2_MMM) + (vx2_PPM + vx2_MMP)) - ((vx2_MPP + vx2_PMM) + (vx2_MPM + vx2_PMP)) +
- ((vx3_PPP + vx3_MMM) - (vx3_PPM + vx3_MMP)) + ((vx3_PMP + vx3_MPM) - (vx3_MPP + vx3_PMM))) +
- c8o1 * (((vx1_PPP + vx1_MMM) + (vx1_PPM + vx1_MMP)) + ((vx1_MPP + vx1_PMM) + (vx1_PMP + vx1_MPM))) +
- ((kxxMyyFromfcNEQ_MMM - kxxMyyFromfcNEQ_PPP) + (kxxMyyFromfcNEQ_MMP - kxxMyyFromfcNEQ_PPM)) +
- ((kxxMyyFromfcNEQ_MPP - kxxMyyFromfcNEQ_PMM) + (kxxMyyFromfcNEQ_MPM - kxxMyyFromfcNEQ_PMP)) +
- ((kxxMzzFromfcNEQ_MMM - kxxMzzFromfcNEQ_PPP) + (kxxMzzFromfcNEQ_MMP - kxxMzzFromfcNEQ_PPM)) +
- ((kxxMzzFromfcNEQ_MPP - kxxMzzFromfcNEQ_PMM) + (kxxMzzFromfcNEQ_MPM - kxxMzzFromfcNEQ_PMP)));
-
- // b_000 = (c2o1 * kxxMyyFromfcNEQ_PPM + c2o1 * kxxMyyFromfcNEQ_PPP + c2o1 * kxxMyyFromfcNEQ_MPM +
- // c2o1 * kxxMyyFromfcNEQ_MPP - c2o1 * kxxMyyFromfcNEQ_PMM - c2o1 * kxxMyyFromfcNEQ_PMP -
- // c2o1 * kxxMyyFromfcNEQ_MMM - c2o1 * kxxMyyFromfcNEQ_MMP - kxxMzzFromfcNEQ_PPM - kxxMzzFromfcNEQ_PPP -
- // kxxMzzFromfcNEQ_MPM - kxxMzzFromfcNEQ_MPP + kxxMzzFromfcNEQ_PMM + kxxMzzFromfcNEQ_PMP +
- // kxxMzzFromfcNEQ_MMM + kxxMzzFromfcNEQ_MMP - c2o1 * kxyFromfcNEQ_PPM - c2o1 * kxyFromfcNEQ_PPP +
- // c2o1 * kxyFromfcNEQ_MPM + c2o1 * kxyFromfcNEQ_MPP - c2o1 * kxyFromfcNEQ_PMM - c2o1 * kxyFromfcNEQ_PMP +
- // c2o1 * kxyFromfcNEQ_MMM + c2o1 * kxyFromfcNEQ_MMP + c2o1 * kyzFromfcNEQ_PPM - c2o1 * kyzFromfcNEQ_PPP +
- // c2o1 * kyzFromfcNEQ_MPM - c2o1 * kyzFromfcNEQ_MPP + c2o1 * kyzFromfcNEQ_PMM - c2o1 * kyzFromfcNEQ_PMP +
- // c2o1 * kyzFromfcNEQ_MMM - c2o1 * kyzFromfcNEQ_MMP + c2o1 * vx1_PPM + c2o1 * vx1_PPP - c2o1 * vx1_MPM -
- // c2o1 * vx1_MPP - c2o1 * vx1_PMM - c2o1 * vx1_PMP + c2o1 * vx1_MMM + c2o1 * vx1_MMP + c8o1 * vx2_PPM +
- // c8o1 * vx2_PPP + c8o1 * vx2_MPM + c8o1 * vx2_MPP + c8o1 * vx2_PMM + c8o1 * vx2_PMP + c8o1 * vx2_MMM +
- // c8o1 * vx2_MMP - c2o1 * vx3_PPM + c2o1 * vx3_PPP - c2o1 * vx3_MPM + c2o1 * vx3_MPP + c2o1 * vx3_PMM -
- // c2o1 * vx3_PMP + c2o1 * vx3_MMM - c2o1 * vx3_MMP) /
- // c64o1;
- b_000 =
- c1o64 * (c2o1 * (((kxxMyyFromfcNEQ_PPP - kxxMyyFromfcNEQ_MMM) + (kxxMyyFromfcNEQ_PPM - kxxMyyFromfcNEQ_MMP)) +
- ((kxxMyyFromfcNEQ_MPP - kxxMyyFromfcNEQ_PMM) + (kxxMyyFromfcNEQ_MPM - kxxMyyFromfcNEQ_PMP)) +
- ((kxyFromfcNEQ_MMM - kxyFromfcNEQ_PPP) + (kxyFromfcNEQ_MMP - kxyFromfcNEQ_PPM)) +
- ((kxyFromfcNEQ_MPP - kxyFromfcNEQ_PMM) + (kxyFromfcNEQ_MPM - kxyFromfcNEQ_PMP)) +
- ((kyzFromfcNEQ_MMM - kyzFromfcNEQ_PPP) + (kyzFromfcNEQ_PPM - kyzFromfcNEQ_MMP)) +
- ((kyzFromfcNEQ_PMM - kyzFromfcNEQ_MPP) + (kyzFromfcNEQ_MPM - kyzFromfcNEQ_PMP)) +
- ((vx1_PPP + vx1_MMM) + (vx1_PPM + vx1_MMP)) - ((vx1_MPM + vx1_MPP) + (vx1_PMM + vx1_PMP)) +
- ((vx3_PPP + vx3_MMM) - (vx3_PPM + vx3_MMP)) + ((vx3_MPP + vx3_PMM) - (vx3_MPM + vx3_PMP))) +
- c8o1 * (((vx2_PPP + vx2_MMM) + (vx2_PPM + vx2_MMP)) + ((vx2_MPP + vx2_PMM) + (vx2_MPM + vx2_PMP))) +
- ((kxxMzzFromfcNEQ_MMM - kxxMzzFromfcNEQ_PPP) + (kxxMzzFromfcNEQ_MMP - kxxMzzFromfcNEQ_PPM)) +
- ((kxxMzzFromfcNEQ_PMM - kxxMzzFromfcNEQ_MPP) + (kxxMzzFromfcNEQ_PMP - kxxMzzFromfcNEQ_MPM)));
-
- // c_000 = (kxxMyyFromfcNEQ_PPM - kxxMyyFromfcNEQ_PPP + kxxMyyFromfcNEQ_MPM - kxxMyyFromfcNEQ_MPP +
- // kxxMyyFromfcNEQ_PMM - kxxMyyFromfcNEQ_PMP + kxxMyyFromfcNEQ_MMM - kxxMyyFromfcNEQ_MMP -
- // c2o1 * kxxMzzFromfcNEQ_PPM + c2o1 * kxxMzzFromfcNEQ_PPP - c2o1 * kxxMzzFromfcNEQ_MPM +
- // c2o1 * kxxMzzFromfcNEQ_MPP - c2o1 * kxxMzzFromfcNEQ_PMM + c2o1 * kxxMzzFromfcNEQ_PMP -
- // c2o1 * kxxMzzFromfcNEQ_MMM + c2o1 * kxxMzzFromfcNEQ_MMP - c2o1 * kxzFromfcNEQ_PPM -
- // c2o1 * kxzFromfcNEQ_PPP + c2o1 * kxzFromfcNEQ_MPM + c2o1 * kxzFromfcNEQ_MPP - c2o1 * kxzFromfcNEQ_PMM -
- // c2o1 * kxzFromfcNEQ_PMP + c2o1 * kxzFromfcNEQ_MMM + c2o1 * kxzFromfcNEQ_MMP - c2o1 * kyzFromfcNEQ_PPM -
- // c2o1 * kyzFromfcNEQ_PPP - c2o1 * kyzFromfcNEQ_MPM - c2o1 * kyzFromfcNEQ_MPP + c2o1 * kyzFromfcNEQ_PMM +
- // c2o1 * kyzFromfcNEQ_PMP + c2o1 * kyzFromfcNEQ_MMM + c2o1 * kyzFromfcNEQ_MMP - c2o1 * vx1_PPM +
- // c2o1 * vx1_PPP + c2o1 * vx1_MPM - c2o1 * vx1_MPP - c2o1 * vx1_PMM + c2o1 * vx1_PMP + c2o1 * vx1_MMM -
- // c2o1 * vx1_MMP - c2o1 * vx2_PPM + c2o1 * vx2_PPP - c2o1 * vx2_MPM + c2o1 * vx2_MPP + c2o1 * vx2_PMM -
- // c2o1 * vx2_PMP + c2o1 * vx2_MMM - c2o1 * vx2_MMP + c8o1 * vx3_PPM + c8o1 * vx3_PPP + c8o1 * vx3_MPM +
- // c8o1 * vx3_MPP + c8o1 * vx3_PMM + c8o1 * vx3_PMP + c8o1 * vx3_MMM + c8o1 * vx3_MMP) /
- // c64o1;
- c_000 =
- c1o64 * (c2o1 * (((kxxMzzFromfcNEQ_PPP - kxxMzzFromfcNEQ_MMM) + (kxxMzzFromfcNEQ_MMP - kxxMzzFromfcNEQ_PPM)) +
- ((kxxMzzFromfcNEQ_MPP - kxxMzzFromfcNEQ_PMM) + (kxxMzzFromfcNEQ_PMP - kxxMzzFromfcNEQ_MPM)) +
- ((kxzFromfcNEQ_MMM - kxzFromfcNEQ_PPP) + (kxzFromfcNEQ_MMP - kxzFromfcNEQ_PPM)) +
- ((kxzFromfcNEQ_MPP - kxzFromfcNEQ_PMM) + (kxzFromfcNEQ_MPM - kxzFromfcNEQ_PMP)) +
- ((kyzFromfcNEQ_MMM - kyzFromfcNEQ_PPP) + (kyzFromfcNEQ_MMP - kyzFromfcNEQ_PPM)) +
- ((kyzFromfcNEQ_PMM - kyzFromfcNEQ_MPP) + (kyzFromfcNEQ_PMP - kyzFromfcNEQ_MPM)) +
- ((vx1_PPP + vx1_MMM) - (vx1_MMP + vx1_PPM)) + ((vx1_MPM + vx1_PMP) - (vx1_MPP + vx1_PMM)) +
- ((vx2_PPP + vx2_MMM) - (vx2_MMP + vx2_PPM)) + ((vx2_MPP + vx2_PMM) - (vx2_MPM + vx2_PMP))) +
- c8o1 * (((vx3_PPP + vx3_MMM) + (vx3_PPM + vx3_MMP)) + ((vx3_PMM + vx3_MPP) + (vx3_PMP + vx3_MPM))) +
- ((kxxMyyFromfcNEQ_MMM - kxxMyyFromfcNEQ_PPP) + (kxxMyyFromfcNEQ_PPM - kxxMyyFromfcNEQ_MMP)) +
- ((kxxMyyFromfcNEQ_PMM - kxxMyyFromfcNEQ_MPP) + (kxxMyyFromfcNEQ_MPM - kxxMyyFromfcNEQ_PMP)));
-
- // a_100 = (vx1_PPM + vx1_PPP - vx1_MPM - vx1_MPP + vx1_PMM + vx1_PMP - vx1_MMM - vx1_MMP) / c4o1;
- a_100 = c1o4 * (((vx1_PPP - vx1_MMM) + (vx1_PPM - vx1_MMP)) + ((vx1_PMM - vx1_MPP) + (vx1_PMP - vx1_MPM)));
-
- // b_100 = (vx2_PPM + vx2_PPP - vx2_MPM - vx2_MPP + vx2_PMM + vx2_PMP - vx2_MMM - vx2_MMP) / c4o1;
- b_100 = c1o4 * (((vx2_PPP - vx2_MMM) + (vx2_PPM - vx2_MMP)) + ((vx2_PMM - vx2_MPP) + (vx2_PMP - vx2_MPM)));
-
- // c_100 = (vx3_PPM + vx3_PPP - vx3_MPM - vx3_MPP + vx3_PMM + vx3_PMP - vx3_MMM - vx3_MMP) / c4o1;
- c_100 = c1o4 * (((vx3_PPP - vx3_MMM) + (vx3_PPM - vx3_MMP)) + ((vx3_PMM - vx3_MPP) + (vx3_PMP - vx3_MPM)));
-
- // a_200 = (kxxMyyFromfcNEQ_PPM + kxxMyyFromfcNEQ_PPP - kxxMyyFromfcNEQ_MPM - kxxMyyFromfcNEQ_MPP +
- // kxxMyyFromfcNEQ_PMM + kxxMyyFromfcNEQ_PMP - kxxMyyFromfcNEQ_MMM - kxxMyyFromfcNEQ_MMP +
- // kxxMzzFromfcNEQ_PPM + kxxMzzFromfcNEQ_PPP - kxxMzzFromfcNEQ_MPM - kxxMzzFromfcNEQ_MPP +
- // kxxMzzFromfcNEQ_PMM + kxxMzzFromfcNEQ_PMP - kxxMzzFromfcNEQ_MMM - kxxMzzFromfcNEQ_MMP + c2o1 * vx2_PPM +
- // c2o1 * vx2_PPP - c2o1 * vx2_MPM - c2o1 * vx2_MPP - c2o1 * vx2_PMM - c2o1 * vx2_PMP + c2o1 * vx2_MMM +
- // c2o1 * vx2_MMP - c2o1 * vx3_PPM + c2o1 * vx3_PPP + c2o1 * vx3_MPM - c2o1 * vx3_MPP - c2o1 * vx3_PMM +
- // c2o1 * vx3_PMP + c2o1 * vx3_MMM - c2o1 * vx3_MMP) /
- // c16o1;
- a_200 =
- c1o16 * (c2o1 * (((vx2_PPP + vx2_MMM) + (vx2_PPM - vx2_MPP)) + ((vx2_MMP - vx2_PMM) - (vx2_MPM + vx2_PMP)) +
- ((vx3_PPP + vx3_MMM) - (vx3_PPM + vx3_MPP)) + ((vx3_MPM + vx3_PMP) - (vx3_MMP + vx3_PMM))) +
- ((kxxMyyFromfcNEQ_PPP - kxxMyyFromfcNEQ_MMM) + (kxxMyyFromfcNEQ_PPM - kxxMyyFromfcNEQ_MMP)) +
- ((kxxMyyFromfcNEQ_PMM - kxxMyyFromfcNEQ_MPP) + (kxxMyyFromfcNEQ_PMP - kxxMyyFromfcNEQ_MPM)) +
- ((kxxMzzFromfcNEQ_PPP - kxxMzzFromfcNEQ_MMM) + (kxxMzzFromfcNEQ_PPM - kxxMzzFromfcNEQ_MMP)) +
- ((kxxMzzFromfcNEQ_PMM - kxxMzzFromfcNEQ_MPP) + (kxxMzzFromfcNEQ_PMP - kxxMzzFromfcNEQ_MPM)));
-
- // b_200 = (kxyFromfcNEQ_PPM + kxyFromfcNEQ_PPP - kxyFromfcNEQ_MPM - kxyFromfcNEQ_MPP + kxyFromfcNEQ_PMM +
- // kxyFromfcNEQ_PMP - kxyFromfcNEQ_MMM - kxyFromfcNEQ_MMP - c2o1 * vx1_PPM - c2o1 * vx1_PPP +
- // c2o1 * vx1_MPM + c2o1 * vx1_MPP + c2o1 * vx1_PMM + c2o1 * vx1_PMP - c2o1 * vx1_MMM - c2o1 * vx1_MMP) /
- // c8o1;
- b_200 =
- c1o8 * (c2o1 * (-((vx1_PPP + vx1_MMM) + (vx1_PPM + vx1_MMP)) + ((vx1_MPP + vx1_PMM) + (vx1_MPM + vx1_PMP))) +
- ((kxyFromfcNEQ_PPP - kxyFromfcNEQ_MMM) + (kxyFromfcNEQ_PPM - kxyFromfcNEQ_MMP)) +
- ((kxyFromfcNEQ_PMM - kxyFromfcNEQ_MPP) + (kxyFromfcNEQ_PMP - kxyFromfcNEQ_MPM)));
-
- // c_200 = (kxzFromfcNEQ_PPM + kxzFromfcNEQ_PPP - kxzFromfcNEQ_MPM - kxzFromfcNEQ_MPP + kxzFromfcNEQ_PMM +
- // kxzFromfcNEQ_PMP - kxzFromfcNEQ_MMM - kxzFromfcNEQ_MMP + c2o1 * vx1_PPM - c2o1 * vx1_PPP - c2o1 *
- // vx1_MPM + c2o1 * vx1_MPP + c2o1 * vx1_PMM - c2o1 * vx1_PMP - c2o1 * vx1_MMM + c2o1 * vx1_MMP) /
- // c8o1;
- c_200 = c1o8 * (c2o1 * (((vx1_PPM + vx1_MMP) - (vx1_PPP + vx1_MMM)) + ((vx1_MPP + vx1_PMM) - (vx1_MPM + vx1_PMP))) +
- ((kxzFromfcNEQ_PPP - kxzFromfcNEQ_MMM) + (kxzFromfcNEQ_PPM - kxzFromfcNEQ_MMP)) +
- ((kxzFromfcNEQ_PMM - kxzFromfcNEQ_MPP) + (kxzFromfcNEQ_PMP - kxzFromfcNEQ_MPM)));
-
- // a_010 = (vx1_PPM + vx1_PPP + vx1_MPM + vx1_MPP - vx1_PMM - vx1_PMP - vx1_MMM - vx1_MMP) / c4o1;
- a_010 = c1o4 * (((vx1_PPP - vx1_MMM) + (vx1_PPM - vx1_MMP)) + ((vx1_MPP - vx1_PMM) + (vx1_MPM - vx1_PMP)));
-
- // b_010 = (vx2_PPM + vx2_PPP + vx2_MPM + vx2_MPP - vx2_PMM - vx2_PMP - vx2_MMM - vx2_MMP) / c4o1;
- b_010 = c1o4 * (((vx2_PPP - vx2_MMM) + (vx2_PPM - vx2_MMP)) + ((vx2_MPP - vx2_PMM) + (vx2_MPM - vx2_PMP)));
-
- // c_010 = (vx3_PPM + vx3_PPP + vx3_MPM + vx3_MPP - vx3_PMM - vx3_PMP - vx3_MMM - vx3_MMP) / c4o1;
- c_010 = c1o4 * (((vx3_PPP - vx3_MMM) + (vx3_PPM - vx3_MMP)) + ((vx3_MPP - vx3_PMM) + (vx3_MPM - vx3_PMP)));
-
- // a_020 = (kxyFromfcNEQ_PPM + kxyFromfcNEQ_PPP + kxyFromfcNEQ_MPM + kxyFromfcNEQ_MPP - kxyFromfcNEQ_PMM -
- // kxyFromfcNEQ_PMP - kxyFromfcNEQ_MMM - kxyFromfcNEQ_MMP - c2o1 * vx2_PPM - c2o1 * vx2_PPP +
- // c2o1 * vx2_MPM + c2o1 * vx2_MPP + c2o1 * vx2_PMM + c2o1 * vx2_PMP - c2o1 * vx2_MMM - c2o1 * vx2_MMP) /
- // c8o1;
- a_020 =
- c1o8 * (c2o1 * (-((vx2_PPP + vx2_MMM) + (vx2_MMP + vx2_PPM)) + ((vx2_MPP + vx2_PMM) + (vx2_MPM + vx2_PMP))) +
- ((kxyFromfcNEQ_PPP - kxyFromfcNEQ_MMM) + (kxyFromfcNEQ_PPM - kxyFromfcNEQ_MMP)) +
- ((kxyFromfcNEQ_MPP - kxyFromfcNEQ_PMM) + (kxyFromfcNEQ_MPM - kxyFromfcNEQ_PMP)));
-
- // b_020 = (-c2o1 * kxxMyyFromfcNEQ_PPM - c2o1 * kxxMyyFromfcNEQ_PPP - c2o1 * kxxMyyFromfcNEQ_MPM -
- // c2o1 * kxxMyyFromfcNEQ_MPP + c2o1 * kxxMyyFromfcNEQ_PMM + c2o1 * kxxMyyFromfcNEQ_PMP +
- // c2o1 * kxxMyyFromfcNEQ_MMM + c2o1 * kxxMyyFromfcNEQ_MMP + kxxMzzFromfcNEQ_PPM + kxxMzzFromfcNEQ_PPP +
- // kxxMzzFromfcNEQ_MPM + kxxMzzFromfcNEQ_MPP - kxxMzzFromfcNEQ_PMM - kxxMzzFromfcNEQ_PMP -
- // kxxMzzFromfcNEQ_MMM - kxxMzzFromfcNEQ_MMP + c2o1 * vx1_PPM + c2o1 * vx1_PPP - c2o1 * vx1_MPM -
- // c2o1 * vx1_MPP - c2o1 * vx1_PMM - c2o1 * vx1_PMP + c2o1 * vx1_MMM + c2o1 * vx1_MMP - c2o1 * vx3_PPM +
- // c2o1 * vx3_PPP - c2o1 * vx3_MPM + c2o1 * vx3_MPP + c2o1 * vx3_PMM - c2o1 * vx3_PMP + c2o1 * vx3_MMM -
- // c2o1 * vx3_MMP) /
- // c16o1;
- b_020 =
- c1o16 * (c2o1 * (((kxxMyyFromfcNEQ_MMM - kxxMyyFromfcNEQ_PPP) + (kxxMyyFromfcNEQ_MMP - kxxMyyFromfcNEQ_PPM)) +
- ((kxxMyyFromfcNEQ_PMM - kxxMyyFromfcNEQ_MPP) + (kxxMyyFromfcNEQ_PMP - kxxMyyFromfcNEQ_MPM)) +
- ((vx1_PPP + vx1_MMM) + (vx1_PPM + vx1_MMP)) - ((vx1_MPP + vx1_PMM) + (vx1_PMP + vx1_MPM)) +
- ((vx3_PPP + vx3_MMM) - (vx3_PPM + vx3_MMP)) + ((vx3_MPP + vx3_PMM) - (vx3_MPM + vx3_PMP))) +
- ((kxxMzzFromfcNEQ_PPP - kxxMzzFromfcNEQ_MMM) + (kxxMzzFromfcNEQ_PPM - kxxMzzFromfcNEQ_MMP)) +
- ((kxxMzzFromfcNEQ_MPP - kxxMzzFromfcNEQ_PMM) + (kxxMzzFromfcNEQ_MPM - kxxMzzFromfcNEQ_PMP)));
-
- // c_020 = (kyzFromfcNEQ_PPM + kyzFromfcNEQ_PPP + kyzFromfcNEQ_MPM + kyzFromfcNEQ_MPP - kyzFromfcNEQ_PMM -
- // kyzFromfcNEQ_PMP - kyzFromfcNEQ_MMM - kyzFromfcNEQ_MMP + c2o1 * vx2_PPM - c2o1 * vx2_PPP + c2o1 *
- // vx2_MPM - c2o1 * vx2_MPP - c2o1 * vx2_PMM + c2o1 * vx2_PMP - c2o1 * vx2_MMM + c2o1 * vx2_MMP) /
- // c8o1;
- c_020 = c1o8 * (c2o1 * (((vx2_MMP + vx2_PPM) - (vx2_PPP + vx2_MMM)) + ((vx2_PMP + vx2_MPM) - (vx2_MPP + vx2_PMM))) +
- ((kyzFromfcNEQ_PPP - kyzFromfcNEQ_MMM) + (kyzFromfcNEQ_PPM - kyzFromfcNEQ_MMP)) +
- ((kyzFromfcNEQ_MPP - kyzFromfcNEQ_PMM) + (kyzFromfcNEQ_MPM - kyzFromfcNEQ_PMP)));
-
- // a_001 = (-vx1_PPM + vx1_PPP - vx1_MPM + vx1_MPP - vx1_PMM + vx1_PMP - vx1_MMM + vx1_MMP) / c4o1;
- a_001 = c1o4 * (((vx1_PPP - vx1_MMM) + (vx1_MMP - vx1_PPM)) + ((vx1_MPP - vx1_PMM) + (vx1_PMP - vx1_MPM)));
-
- // b_001 = (-vx2_PPM + vx2_PPP - vx2_MPM + vx2_MPP - vx2_PMM + vx2_PMP - vx2_MMM + vx2_MMP) / c4o1;
- b_001 = c1o4 * (((vx2_PPP - vx2_MMM) + (vx2_MMP - vx2_PPM)) + ((vx2_MPP - vx2_PMM) + (vx2_PMP - vx2_MPM)));
-
- // c_001 = (-vx3_PPM + vx3_PPP - vx3_MPM + vx3_MPP - vx3_PMM + vx3_PMP - vx3_MMM + vx3_MMP) / c4o1;
- c_001 = c1o4 * (((vx3_PPP - vx3_MMM) + (vx3_MMP - vx3_PPM)) + ((vx3_MPP - vx3_PMM) + (vx3_PMP - vx3_MPM)));
-
- // a_002 = (-kxzFromfcNEQ_PPM + kxzFromfcNEQ_PPP - kxzFromfcNEQ_MPM + kxzFromfcNEQ_MPP - kxzFromfcNEQ_PMM +
- // kxzFromfcNEQ_PMP - kxzFromfcNEQ_MMM + kxzFromfcNEQ_MMP + c2o1 * vx3_PPM - c2o1 * vx3_PPP -
- // c2o1 * vx3_MPM + c2o1 * vx3_MPP + c2o1 * vx3_PMM - c2o1 * vx3_PMP - c2o1 * vx3_MMM + c2o1 * vx3_MMP) /
- // c8o1;
- a_002 = c1o8 * (c2o1 * (((vx3_PPM + vx3_MMP) - (vx3_PPP + vx3_MMM)) + ((vx3_MPP + vx3_PMM) - (vx3_PMP + vx3_MPM))) +
- ((kxzFromfcNEQ_PPP - kxzFromfcNEQ_MMM) + (kxzFromfcNEQ_MMP - kxzFromfcNEQ_PPM)) +
- ((kxzFromfcNEQ_PMP - kxzFromfcNEQ_MPM) + (kxzFromfcNEQ_MPP - kxzFromfcNEQ_PMM)));
-
- // b_002 = (-kyzFromfcNEQ_PPM + kyzFromfcNEQ_PPP - kyzFromfcNEQ_MPM + kyzFromfcNEQ_MPP - kyzFromfcNEQ_PMM +
- // kyzFromfcNEQ_PMP - kyzFromfcNEQ_MMM + kyzFromfcNEQ_MMP + c2o1 * vx3_PPM - c2o1 * vx3_PPP + c2o1 *
- // vx3_MPM - c2o1 * vx3_MPP - c2o1 * vx3_PMM + c2o1 * vx3_PMP - c2o1 * vx3_MMM + c2o1 * vx3_MMP) /
- // c8o1;
- b_002 = c1o8 * (c2o1 * (((vx3_PPM + vx3_MMP) - (vx3_PPP + vx3_MMM)) + ((vx3_MPM + vx3_PMP) - (vx3_PMM + vx3_MPP))) +
- ((kyzFromfcNEQ_PPP - kyzFromfcNEQ_MMM) + (kyzFromfcNEQ_MMP - kyzFromfcNEQ_PPM)) +
- ((kyzFromfcNEQ_PMP - kyzFromfcNEQ_MPM) + (kyzFromfcNEQ_MPP - kyzFromfcNEQ_PMM)));
-
- // c_002 = (-kxxMyyFromfcNEQ_PPM + kxxMyyFromfcNEQ_PPP - kxxMyyFromfcNEQ_MPM + kxxMyyFromfcNEQ_MPP -
- // kxxMyyFromfcNEQ_PMM + kxxMyyFromfcNEQ_PMP - kxxMyyFromfcNEQ_MMM + kxxMyyFromfcNEQ_MMP +
- // c2o1 * kxxMzzFromfcNEQ_PPM - c2o1 * kxxMzzFromfcNEQ_PPP + c2o1 * kxxMzzFromfcNEQ_MPM -
- // c2o1 * kxxMzzFromfcNEQ_MPP + c2o1 * kxxMzzFromfcNEQ_PMM - c2o1 * kxxMzzFromfcNEQ_PMP +
- // c2o1 * kxxMzzFromfcNEQ_MMM - c2o1 * kxxMzzFromfcNEQ_MMP - c2o1 * vx1_PPM + c2o1 * vx1_PPP +
- // c2o1 * vx1_MPM - c2o1 * vx1_MPP - c2o1 * vx1_PMM + c2o1 * vx1_PMP + c2o1 * vx1_MMM - c2o1 * vx1_MMP -
- // c2o1 * vx2_PPM + c2o1 * vx2_PPP - c2o1 * vx2_MPM + c2o1 * vx2_MPP + c2o1 * vx2_PMM - c2o1 * vx2_PMP +
- // c2o1 * vx2_MMM - c2o1 * vx2_MMP) /
- // c16o1;
- c_002 =
- c1o16 * (c2o1 * (((kxxMzzFromfcNEQ_MMM - kxxMzzFromfcNEQ_PPP) + (kxxMzzFromfcNEQ_PPM - kxxMzzFromfcNEQ_MMP)) +
- ((kxxMzzFromfcNEQ_MPM - kxxMzzFromfcNEQ_PMP) + (kxxMzzFromfcNEQ_PMM - kxxMzzFromfcNEQ_MPP)) +
- ((vx1_PPP + vx1_MMM) - (vx1_MMP + vx1_PPM)) + ((vx1_MPM + vx1_PMP) - (vx1_PMM + vx1_MPP)) +
- ((vx2_PPP + vx2_MMM) - (vx2_MMP + vx2_PPM)) + ((vx2_PMM + vx2_MPP) - (vx2_MPM + vx2_PMP))) +
- ((kxxMyyFromfcNEQ_PPP - kxxMyyFromfcNEQ_MMM) + (kxxMyyFromfcNEQ_MMP - kxxMyyFromfcNEQ_PPM)) +
- ((kxxMyyFromfcNEQ_PMP - kxxMyyFromfcNEQ_MPM) + (kxxMyyFromfcNEQ_MPP - kxxMyyFromfcNEQ_PMM)));
-
- // a_110 = (vx1_PPM + vx1_PPP - vx1_MPM - vx1_MPP - vx1_PMM - vx1_PMP + vx1_MMM + vx1_MMP) / c2o1;
- // b_110 = (vx2_PPM + vx2_PPP - vx2_MPM - vx2_MPP - vx2_PMM - vx2_PMP + vx2_MMM + vx2_MMP) / c2o1;
- // c_110 = (vx3_PPM + vx3_PPP - vx3_MPM - vx3_MPP - vx3_PMM - vx3_PMP + vx3_MMM + vx3_MMP) / c2o1;
- a_110 = c1o2 * (((vx1_PPP + vx1_MMM) + (vx1_MMP + vx1_PPM)) - ((vx1_MPM + vx1_PMP) + (vx1_PMM + vx1_MPP)));
- b_110 = c1o2 * (((vx2_PPP + vx2_MMM) + (vx2_MMP + vx2_PPM)) - ((vx2_MPM + vx2_PMP) + (vx2_PMM + vx2_MPP)));
- c_110 = c1o2 * (((vx3_PPP + vx3_MMM) + (vx3_MMP + vx3_PPM)) - ((vx3_MPM + vx3_PMP) + (vx3_PMM + vx3_MPP)));
-
- // a_101 = (-vx1_PPM + vx1_PPP + vx1_MPM - vx1_MPP - vx1_PMM + vx1_PMP + vx1_MMM - vx1_MMP) / c2o1;
- // b_101 = (-vx2_PPM + vx2_PPP + vx2_MPM - vx2_MPP - vx2_PMM + vx2_PMP + vx2_MMM - vx2_MMP) / c2o1;
- // c_101 = (-vx3_PPM + vx3_PPP + vx3_MPM - vx3_MPP - vx3_PMM + vx3_PMP + vx3_MMM - vx3_MMP) / c2o1;
- a_101 = c1o2 * (((vx1_PPP + vx1_MMM) - (vx1_MMP + vx1_PPM)) + ((vx1_MPM + vx1_PMP) - (vx1_PMM + vx1_MPP)));
- b_101 = c1o2 * (((vx2_PPP + vx2_MMM) - (vx2_MMP + vx2_PPM)) + ((vx2_MPM + vx2_PMP) - (vx2_PMM + vx2_MPP)));
- c_101 = c1o2 * (((vx3_PPP + vx3_MMM) - (vx3_MMP + vx3_PPM)) + ((vx3_MPM + vx3_PMP) - (vx3_PMM + vx3_MPP)));
-
- // a_011 = (-vx1_PPM + vx1_PPP - vx1_MPM + vx1_MPP + vx1_PMM - vx1_PMP + vx1_MMM - vx1_MMP) / c2o1;
- // b_011 = (-vx2_PPM + vx2_PPP - vx2_MPM + vx2_MPP + vx2_PMM - vx2_PMP + vx2_MMM - vx2_MMP) / c2o1;
- // c_011 = (-vx3_PPM + vx3_PPP - vx3_MPM + vx3_MPP + vx3_PMM - vx3_PMP + vx3_MMM - vx3_MMP) / c2o1;
- a_011 = c1o2 * (((vx1_PPP + vx1_MMM) - (vx1_MMP + vx1_PPM)) + ((vx1_PMM + vx1_MPP) - (vx1_MPM + vx1_PMP)));
- b_011 = c1o2 * (((vx2_PPP + vx2_MMM) - (vx2_MMP + vx2_PPM)) + ((vx2_PMM + vx2_MPP) - (vx2_MPM + vx2_PMP)));
- c_011 = c1o2 * (((vx3_PPP + vx3_MMM) - (vx3_MMP + vx3_PPM)) + ((vx3_PMM + vx3_MPP) - (vx3_MPM + vx3_PMP)));
-
- // a_111 = -vx1_PPM + vx1_PPP + vx1_MPM - vx1_MPP + vx1_PMM - vx1_PMP - vx1_MMM + vx1_MMP;
- // b_111 = -vx2_PPM + vx2_PPP + vx2_MPM - vx2_MPP + vx2_PMM - vx2_PMP - vx2_MMM + vx2_MMP;
- // c_111 = -vx3_PPM + vx3_PPP + vx3_MPM - vx3_MPP + vx3_PMM - vx3_PMP - vx3_MMM + vx3_MMP;
- a_111 = ((vx1_PPP - vx1_MMM) + (vx1_MMP - vx1_PPM)) + ((vx1_MPM - vx1_PMP) + (vx1_PMM - vx1_MPP));
- b_111 = ((vx2_PPP - vx2_MMM) + (vx2_MMP - vx2_PPM)) + ((vx2_MPM - vx2_PMP) + (vx2_PMM - vx2_MPP));
- c_111 = ((vx3_PPP - vx3_MMM) + (vx3_MMP - vx3_PPM)) + ((vx3_MPM - vx3_PMP) + (vx3_PMM - vx3_MPP));
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- real kxyAverage = c0o1;
- real kyzAverage = c0o1;
- real kxzAverage = c0o1;
- real kxxMyyAverage = c0o1;
- real kxxMzzAverage = c0o1;
-
- // real kxyAverage = (kxyFromfcNEQ_MMM+
- // kxyFromfcNEQ_MMP+
- // kxyFromfcNEQ_PMP+
- // kxyFromfcNEQ_PMM+
- // kxyFromfcNEQ_MPM+
- // kxyFromfcNEQ_MPP+
- // kxyFromfcNEQ_PPP+
- // kxyFromfcNEQ_PPM) * c1o8 - (a_010 + b_100);
- // real kyzAverage = (kyzFromfcNEQ_MMM+
- // kyzFromfcNEQ_MMP+
- // kyzFromfcNEQ_PMP+
- // kyzFromfcNEQ_PMM+
- // kyzFromfcNEQ_MPM+
- // kyzFromfcNEQ_MPP+
- // kyzFromfcNEQ_PPP+
- // kyzFromfcNEQ_PPM) * c1o8 - (b_001 + c_010);
- // real kxzAverage = (kxzFromfcNEQ_MMM+
- // kxzFromfcNEQ_MMP+
- // kxzFromfcNEQ_PMP+
- // kxzFromfcNEQ_PMM+
- // kxzFromfcNEQ_MPM+
- // kxzFromfcNEQ_MPP+
- // kxzFromfcNEQ_PPP+
- // kxzFromfcNEQ_PPM) * c1o8 - (a_001 + c_100);
- // real kxxMyyAverage = (kxxMyyFromfcNEQ_MMM+
- // kxxMyyFromfcNEQ_MMP+
- // kxxMyyFromfcNEQ_PMP+
- // kxxMyyFromfcNEQ_PMM+
- // kxxMyyFromfcNEQ_MPM+
- // kxxMyyFromfcNEQ_MPP+
- // kxxMyyFromfcNEQ_PPP+
- // kxxMyyFromfcNEQ_PPM) * c1o8 - (a_100 - b_010);
- // real kxxMzzAverage = (kxxMzzFromfcNEQ_MMM+
- // kxxMzzFromfcNEQ_MMP+
- // kxxMzzFromfcNEQ_PMP+
- // kxxMzzFromfcNEQ_PMM+
- // kxxMzzFromfcNEQ_MPM+
- // kxxMzzFromfcNEQ_MPP+
- // kxxMzzFromfcNEQ_PPP+
- // kxxMzzFromfcNEQ_PPM) * c1o8 - (a_100 - c_001);
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - Set the relative position of the offset cell {-1, 0, 1}
- //!
- real xoff = neighborCoarseToFine.x[nodeIndex];
- real yoff = neighborCoarseToFine.y[nodeIndex];
- real zoff = neighborCoarseToFine.z[nodeIndex];
-
- real xoff_sq = xoff * xoff;
- real yoff_sq = yoff * yoff;
- real zoff_sq = zoff * zoff;
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- //drho
- real LaplaceRho =
- ((xoff != c0o1) || (yoff != c0o1) || (zoff != c0o1))
- ? c0o1
- : -c3o1 * (a_100 * a_100 + b_010 * b_010 + c_001 * c_001) - c6o1 * (b_100 * a_010 + c_100 * a_001 + c_010 * b_001);
- // d_000 = ( drho_PPM + drho_PPP + drho_MPM + drho_MPP + drho_PMM + drho_PMP + drho_MMM + drho_MMP) * c1o8;
- d_000 = c1o8 * (((drho_PPP + drho_MMM) + (drho_PPM + drho_MMP)) + ((drho_PMM + drho_MPP) + (drho_PMP + drho_MPM)));
-
- // d_100 = ( drho_PPM + drho_PPP - drho_MPM - drho_MPP + drho_PMM + drho_PMP - drho_MMM - drho_MMP) * c1o4;
- d_100 = c1o4 * (((drho_PPP - drho_MMM) + (drho_PPM - drho_MMP)) + ((drho_PMM - drho_MPP) + (drho_PMP - drho_MPM)));
-
- // d_010 = ( drho_PPM + drho_PPP + drho_MPM + drho_MPP - drho_PMM - drho_PMP - drho_MMM - drho_MMP) * c1o4;
- d_010 = c1o4 * (((drho_PPP - drho_MMM) + (drho_PPM - drho_MMP)) + ((drho_MPP - drho_PMM) + (drho_MPM - drho_PMP)));
+ Distributions27 distFine;
+ vf::gpu::getPointersToDistributions(distFine, distributionsFine, numberOfLBnodesFine, true);
- // d_001 = (-drho_PPM + drho_PPP - drho_MPM + drho_MPP - drho_PMM + drho_PMP - drho_MMM + drho_MMP) * c1o4;
- d_001 = c1o4 * (((drho_PPP - drho_MMM) + (drho_MMP - drho_PPM)) + ((drho_MPP - drho_PMM) + (drho_PMP - drho_MPM)));
-
- // d_110 = ( drho_PPM + drho_PPP - drho_MPM - drho_MPP - drho_PMM - drho_PMP + drho_MMM + drho_MMP) * c1o2;
- d_110 = c1o2 * (((drho_PPP + drho_MMM) + (drho_PPM + drho_MMP)) - ((drho_PMM + drho_MPP) + (drho_PMP + drho_MPM)));
-
- // d_101 = (-drho_PPM + drho_PPP + drho_MPM - drho_MPP - drho_PMM + drho_PMP + drho_MMM - drho_MMP) * c1o2;
- d_101 = c1o2 * (((drho_PPP + drho_MMM) - (drho_PPM + drho_MMP)) + ((drho_PMP + drho_MPM) - (drho_PMM + drho_MPP)));
-
- // d_011 = (-drho_PPM + drho_PPP - drho_MPM + drho_MPP + drho_PMM - drho_PMP + drho_MMM - drho_MMP) * c1o2;
- d_011 = c1o2 * (((drho_PPP + drho_MMM) - (drho_PPM + drho_MMP)) + ((drho_PMM + drho_MPP) - (drho_PMP + drho_MPM)));
-
- // d_111 = -drho_PPM + drho_PPP + drho_MPM - drho_MPP + drho_PMM - drho_PMP - drho_MMM + drho_MMP;
- d_111 = (((drho_PPP - drho_MMM) + (drho_MMP - drho_PPM)) + ((drho_PMM - drho_MPP) + (drho_MPM - drho_PMP)));
-
- //////////////////////////////////////////////////////////////////////////
- //! - Extrapolation for refinement in to the wall (polynomial coefficients)
- //!
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- //
- // X------X
- // | | x---x
- // | ---+-+-> | ----> offset-vector
- // | | x---x
- // X------X
- //
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- a_000 = a_000 + xoff * a_100 + yoff * a_010 + zoff * a_001 + xoff_sq * a_200 + yoff_sq * a_020 + zoff_sq * a_002 +
- xoff * yoff * a_110 + xoff * zoff * a_101 + yoff * zoff * a_011;
- a_100 = a_100 + c2o1 * xoff * a_200 + yoff * a_110 + zoff * a_101;
- a_010 = a_010 + c2o1 * yoff * a_020 + xoff * a_110 + zoff * a_011;
- a_001 = a_001 + c2o1 * zoff * a_002 + xoff * a_101 + yoff * a_011;
- b_000 = b_000 + xoff * b_100 + yoff * b_010 + zoff * b_001 + xoff_sq * b_200 + yoff_sq * b_020 + zoff_sq * b_002 +
- xoff * yoff * b_110 + xoff * zoff * b_101 + yoff * zoff * b_011;
- b_100 = b_100 + c2o1 * xoff * b_200 + yoff * b_110 + zoff * b_101;
- b_010 = b_010 + c2o1 * yoff * b_020 + xoff * b_110 + zoff * b_011;
- b_001 = b_001 + c2o1 * zoff * b_002 + xoff * b_101 + yoff * b_011;
- c_000 = c_000 + xoff * c_100 + yoff * c_010 + zoff * c_001 + xoff_sq * c_200 + yoff_sq * c_020 + zoff_sq * c_002 +
- xoff * yoff * c_110 + xoff * zoff * c_101 + yoff * zoff * c_011;
- c_100 = c_100 + c2o1 * xoff * c_200 + yoff * c_110 + zoff * c_101;
- c_010 = c_010 + c2o1 * yoff * c_020 + xoff * c_110 + zoff * c_011;
- c_001 = c_001 + c2o1 * zoff * c_002 + xoff * c_101 + yoff * c_011;
- d_000 = d_000 + xoff * d_100 + yoff * d_010 + zoff * d_001 +
- xoff * yoff * d_110 + xoff * zoff * d_101 + yoff * zoff * d_011;
- d_100 = d_100 + yoff * d_110 + zoff * d_101;
- d_010 = d_010 + xoff * d_110 + zoff * d_011;
- d_001 = d_001 + xoff * d_101 + yoff * d_011;
-
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Set all moments to zero
- //!
- real m_111 = c0o1;
- real m_211 = c0o1;
- real m_011 = c0o1;
- real m_121 = c0o1;
- real m_101 = c0o1;
- real m_112 = c0o1;
- real m_110 = c0o1;
- real m_221 = c0o1;
- real m_001 = c0o1;
- real m_201 = c0o1;
- real m_021 = c0o1;
- real m_212 = c0o1;
- real m_010 = c0o1;
- real m_210 = c0o1;
- real m_012 = c0o1;
- real m_122 = c0o1;
- real m_100 = c0o1;
- real m_120 = c0o1;
- real m_102 = c0o1;
- real m_222 = c0o1;
- real m_022 = c0o1;
- real m_202 = c0o1;
- real m_002 = c0o1;
- real m_220 = c0o1;
- real m_020 = c0o1;
- real m_200 = c0o1;
- real m_000 = c0o1;
-
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Define aliases to use the same variable for the distributions (f's):
- //!
- real& f_000 = m_111;
- real& f_P00 = m_211;
- real& f_M00 = m_011;
- real& f_0P0 = m_121;
- real& f_0M0 = m_101;
- real& f_00P = m_112;
- real& f_00M = m_110;
- real& f_PP0 = m_221;
- real& f_MM0 = m_001;
- real& f_PM0 = m_201;
- real& f_MP0 = m_021;
- real& f_P0P = m_212;
- real& f_M0M = m_010;
- real& f_P0M = m_210;
- real& f_M0P = m_012;
- real& f_0PP = m_122;
- real& f_0MM = m_100;
- real& f_0PM = m_120;
- real& f_0MP = m_102;
- real& f_PPP = m_222;
- real& f_MPP = m_022;
- real& f_PMP = m_202;
- real& f_MMP = m_002;
- real& f_PPM = m_220;
- real& f_MPM = m_020;
- real& f_PMM = m_200;
- real& f_MMM = m_000;
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Position BSW = MMM: -0.25, -0.25, -0.25
//
@@ -901,81 +66,37 @@ template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
real z = -c1o4;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// index of the base node and its neighbors
- k_base_000 = indicesFineMMM[nodeIndex];
- k_base_M00 = neighborXfine [k_base_000];
- k_base_0M0 = neighborYfine [k_base_000];
- k_base_00M = neighborZfine [k_base_000];
- k_base_MM0 = neighborYfine [k_base_M00];
- k_base_M0M = neighborZfine [k_base_M00];
- k_base_0MM = neighborZfine [k_base_0M0];
- k_base_MMM = neighborZfine [k_base_MM0];
+ unsigned int k_base_000 = indicesFineMMM[nodeIndex];
+ unsigned int k_base_M00 = neighborXfine [k_base_000];
+ unsigned int k_base_0M0 = neighborYfine [k_base_000];
+ unsigned int k_base_00M = neighborZfine [k_base_000];
+ unsigned int k_base_MM0 = neighborYfine [k_base_M00];
+ unsigned int k_base_M0M = neighborZfine [k_base_M00];
+ unsigned int k_base_0MM = neighborZfine [k_base_0M0];
+ unsigned int k_base_MMM = neighborZfine [k_base_MM0];
//////////////////////////////////////////////////////////////////////////
// Set neighbor indices
- k_000 = k_base_000;
- k_M00 = k_base_M00;
- k_0M0 = k_base_0M0;
- k_00M = k_base_00M;
- k_MM0 = k_base_MM0;
- k_M0M = k_base_M0M;
- k_0MM = k_base_0MM;
- k_MMM = k_base_MMM;
+ vf::gpu::ListIndices indices;
+ indices.k_000 = k_base_000;
+ indices.k_M00 = k_base_M00;
+ indices.k_0M0 = k_base_0M0;
+ indices.k_00M = k_base_00M;
+ indices.k_MM0 = k_base_MM0;
+ indices.k_M0M = k_base_M0M;
+ indices.k_0MM = k_base_0MM;
+ indices.k_MMM = k_base_MMM;
////////////////////////////////////////////////////////////////////////////////
//! - Set moments (zeroth to sixth order) on destination node
//!
+ real omegaF = omegaFine;
+ omegaF = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaFine, turbulentViscosityFine[indices.k_000]) : omegaFine;
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- interpolateDistributions(
- x, y, z,
- m_000,
- m_100, m_010, m_001,
- m_011, m_101, m_110, m_200, m_020, m_002,
- m_111, m_210, m_012, m_201, m_021, m_120, m_102,
- m_022, m_202, m_220, m_211, m_121, m_112,
- m_122, m_212, m_221,
- m_222,
- a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011, a_111,
- b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011, b_111,
- c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011, c_111,
- d_000, d_100, d_010, d_001, d_110, d_101, d_011, d_111,
- LaplaceRho, eps_new, omegaF,
- kxxMyyAverage, kxxMzzAverage, kyzAverage, kxzAverage, kxyAverage
- );
+ const real epsilon_new = c1o2; // ratio of grid resolutions
+ real f[27];
+ vf::lbm::interpolateCF(f, omegaF, epsilon_new, coefficients, x, y, z);
+
+ write(distFine, indices, f);
- //////////////////////////////////////////////////////////////////////////
- //! - Write distributions: style of reading and writing the distributions from/to
- //! stored arrays dependent on timestep is based on the esoteric twist algorithm
- //! <a href="https://doi.org/10.3390/computation5020019"><b>[ M. Geier et al. (2017),
- //! DOI:10.3390/computation5020019 ]</b></a>
- //!
- (distFine.f[DIR_000])[k_000] = f_000;
- (distFine.f[DIR_P00])[k_000] = f_P00;
- (distFine.f[DIR_M00])[k_M00] = f_M00;
- (distFine.f[DIR_0P0])[k_000] = f_0P0;
- (distFine.f[DIR_0M0])[k_0M0] = f_0M0;
- (distFine.f[DIR_00P])[k_000] = f_00P;
- (distFine.f[DIR_00M])[k_00M] = f_00M;
- (distFine.f[DIR_PP0])[k_000] = f_PP0;
- (distFine.f[DIR_MM0])[k_MM0] = f_MM0;
- (distFine.f[DIR_PM0])[k_0M0] = f_PM0;
- (distFine.f[DIR_MP0])[k_M00] = f_MP0;
- (distFine.f[DIR_P0P])[k_000] = f_P0P;
- (distFine.f[DIR_M0M])[k_M0M] = f_M0M;
- (distFine.f[DIR_P0M])[k_00M] = f_P0M;
- (distFine.f[DIR_M0P])[k_M00] = f_M0P;
- (distFine.f[DIR_0PP])[k_000] = f_0PP;
- (distFine.f[DIR_0MM])[k_0MM] = f_0MM;
- (distFine.f[DIR_0PM])[k_00M] = f_0PM;
- (distFine.f[DIR_0MP])[k_0M0] = f_0MP;
- (distFine.f[DIR_PPP])[k_000] = f_PPP;
- (distFine.f[DIR_MPP])[k_M00] = f_MPP;
- (distFine.f[DIR_PMP])[k_0M0] = f_PMP;
- (distFine.f[DIR_MMP])[k_MM0] = f_MMP;
- (distFine.f[DIR_PPM])[k_00M] = f_PPM;
- (distFine.f[DIR_MPM])[k_M0M] = f_MPM;
- (distFine.f[DIR_PMM])[k_0MM] = f_PMM;
- (distFine.f[DIR_MMM])[k_MMM] = f_MMM;
- //////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -987,66 +108,23 @@ template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
z = c1o4;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Set neighbor indices
- k_000 = k_00M;
- k_M00 = k_M0M;
- k_0M0 = k_0MM;
- k_00M = neighborZfine[k_00M];
- k_MM0 = k_MMM;
- k_M0M = neighborZfine[k_M0M];
- k_0MM = neighborZfine[k_0MM];
- k_MMM = neighborZfine[k_MMM];
+ indices.k_000 = indices.k_00M;
+ indices.k_M00 = indices.k_M0M;
+ indices.k_0M0 = indices.k_0MM;
+ indices.k_00M = neighborZfine[indices.k_00M];
+ indices.k_MM0 = indices.k_MMM;
+ indices.k_M0M = neighborZfine[indices.k_M0M];
+ indices.k_0MM = neighborZfine[indices.k_0MM];
+ indices.k_MMM = neighborZfine[indices.k_MMM];
////////////////////////////////////////////////////////////////////////////////
// Set moments (zeroth to sixth orders) on destination node
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- interpolateDistributions(
- x, y, z,
- m_000,
- m_100, m_010, m_001,
- m_011, m_101, m_110, m_200, m_020, m_002,
- m_111, m_210, m_012, m_201, m_021, m_120, m_102,
- m_022, m_202, m_220, m_211, m_121, m_112,
- m_122, m_212, m_221,
- m_222,
- a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011, a_111,
- b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011, b_111,
- c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011, c_111,
- d_000, d_100, d_010, d_001, d_110, d_101, d_011, d_111,
- LaplaceRho, eps_new, omegaF,
- kxxMyyAverage, kxxMzzAverage, kyzAverage, kxzAverage, kxyAverage
- );
+ omegaF = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaFine, turbulentViscosityFine[indices.k_000]) : omegaFine;
- //////////////////////////////////////////////////////////////////////////
- // Write distributions
- (distFine.f[DIR_000])[k_000] = f_000;
- (distFine.f[DIR_P00])[k_000] = f_P00;
- (distFine.f[DIR_M00])[k_M00] = f_M00;
- (distFine.f[DIR_0P0])[k_000] = f_0P0;
- (distFine.f[DIR_0M0])[k_0M0] = f_0M0;
- (distFine.f[DIR_00P])[k_000] = f_00P;
- (distFine.f[DIR_00M])[k_00M] = f_00M;
- (distFine.f[DIR_PP0])[k_000] = f_PP0;
- (distFine.f[DIR_MM0])[k_MM0] = f_MM0;
- (distFine.f[DIR_PM0])[k_0M0] = f_PM0;
- (distFine.f[DIR_MP0])[k_M00] = f_MP0;
- (distFine.f[DIR_P0P])[k_000] = f_P0P;
- (distFine.f[DIR_M0M])[k_M0M] = f_M0M;
- (distFine.f[DIR_P0M])[k_00M] = f_P0M;
- (distFine.f[DIR_M0P])[k_M00] = f_M0P;
- (distFine.f[DIR_0PP])[k_000] = f_0PP;
- (distFine.f[DIR_0MM])[k_0MM] = f_0MM;
- (distFine.f[DIR_0PM])[k_00M] = f_0PM;
- (distFine.f[DIR_0MP])[k_0M0] = f_0MP;
- (distFine.f[DIR_PPP])[k_000] = f_PPP;
- (distFine.f[DIR_MPP])[k_M00] = f_MPP;
- (distFine.f[DIR_PMP])[k_0M0] = f_PMP;
- (distFine.f[DIR_MMP])[k_MM0] = f_MMP;
- (distFine.f[DIR_PPM])[k_00M] = f_PPM;
- (distFine.f[DIR_MPM])[k_M0M] = f_MPM;
- (distFine.f[DIR_PMM])[k_0MM] = f_PMM;
- (distFine.f[DIR_MMM])[k_MMM] = f_MMM;
+ vf::lbm::interpolateCF(f, omegaF, epsilon_new, coefficients, x, y, z);
+
+ write(distFine, indices, f);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -1058,66 +136,23 @@ template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
z = c1o4;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Set neighbor indices
- k_000 = k_M00;
- k_M00 = neighborXfine[k_M00];
- k_0M0 = k_MM0;
- k_00M = k_M0M;
- k_MM0 = neighborXfine[k_MM0];
- k_M0M = neighborXfine[k_M0M];
- k_0MM = k_MMM;
- k_MMM = neighborXfine[k_MMM];
+ indices.k_000 = indices.k_M00;
+ indices.k_M00 = neighborXfine[indices.k_M00];
+ indices.k_0M0 = indices.k_MM0;
+ indices.k_00M = indices.k_M0M;
+ indices.k_MM0 = neighborXfine[indices.k_MM0];
+ indices.k_M0M = neighborXfine[indices.k_M0M];
+ indices.k_0MM = indices.k_MMM;
+ indices.k_MMM = neighborXfine[indices.k_MMM];
////////////////////////////////////////////////////////////////////////////////
// Set moments (zeroth to sixth orders) on destination node
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- interpolateDistributions(
- x, y, z,
- m_000,
- m_100, m_010, m_001,
- m_011, m_101, m_110, m_200, m_020, m_002,
- m_111, m_210, m_012, m_201, m_021, m_120, m_102,
- m_022, m_202, m_220, m_211, m_121, m_112,
- m_122, m_212, m_221,
- m_222,
- a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011, a_111,
- b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011, b_111,
- c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011, c_111,
- d_000, d_100, d_010, d_001, d_110, d_101, d_011, d_111,
- LaplaceRho, eps_new, omegaF,
- kxxMyyAverage, kxxMzzAverage, kyzAverage, kxzAverage, kxyAverage
- );
+ omegaF = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaFine, turbulentViscosityFine[indices.k_000]) : omegaFine;
- //////////////////////////////////////////////////////////////////////////
- // Write distributions
- (distFine.f[DIR_000])[k_000] = f_000;
- (distFine.f[DIR_P00])[k_000] = f_P00;
- (distFine.f[DIR_M00])[k_M00] = f_M00;
- (distFine.f[DIR_0P0])[k_000] = f_0P0;
- (distFine.f[DIR_0M0])[k_0M0] = f_0M0;
- (distFine.f[DIR_00P])[k_000] = f_00P;
- (distFine.f[DIR_00M])[k_00M] = f_00M;
- (distFine.f[DIR_PP0])[k_000] = f_PP0;
- (distFine.f[DIR_MM0])[k_MM0] = f_MM0;
- (distFine.f[DIR_PM0])[k_0M0] = f_PM0;
- (distFine.f[DIR_MP0])[k_M00] = f_MP0;
- (distFine.f[DIR_P0P])[k_000] = f_P0P;
- (distFine.f[DIR_M0M])[k_M0M] = f_M0M;
- (distFine.f[DIR_P0M])[k_00M] = f_P0M;
- (distFine.f[DIR_M0P])[k_M00] = f_M0P;
- (distFine.f[DIR_0PP])[k_000] = f_0PP;
- (distFine.f[DIR_0MM])[k_0MM] = f_0MM;
- (distFine.f[DIR_0PM])[k_00M] = f_0PM;
- (distFine.f[DIR_0MP])[k_0M0] = f_0MP;
- (distFine.f[DIR_PPP])[k_000] = f_PPP;
- (distFine.f[DIR_MPP])[k_M00] = f_MPP;
- (distFine.f[DIR_PMP])[k_0M0] = f_PMP;
- (distFine.f[DIR_MMP])[k_MM0] = f_MMP;
- (distFine.f[DIR_PPM])[k_00M] = f_PPM;
- (distFine.f[DIR_MPM])[k_M0M] = f_MPM;
- (distFine.f[DIR_PMM])[k_0MM] = f_PMM;
- (distFine.f[DIR_MMM])[k_MMM] = f_MMM;
+ vf::lbm::interpolateCF(f, omegaF, epsilon_new, coefficients, x, y, z);
+
+ write(distFine, indices, f);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -1129,67 +164,23 @@ template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
z = -c1o4;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Set neighbor indices
- k_00M = k_000;
- k_M0M = k_M00;
- k_0MM = k_0M0;
- k_MMM = k_MM0;
- k_000 = k_base_M00;
- k_M00 = neighborXfine[k_base_M00];
- k_0M0 = k_base_MM0;
- k_MM0 = neighborXfine[k_base_MM0];
+ indices.k_00M = indices.k_000;
+ indices.k_M0M = indices.k_M00;
+ indices.k_0MM = indices.k_0M0;
+ indices.k_MMM = indices.k_MM0;
+ indices.k_000 = k_base_M00;
+ indices.k_M00 = neighborXfine[k_base_M00];
+ indices.k_0M0 = k_base_MM0;
+ indices.k_MM0 = neighborXfine[k_base_MM0];
////////////////////////////////////////////////////////////////////////////////
// Set moments (zeroth to sixth orders) on destination node
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- interpolateDistributions(
- x, y, z,
- m_000,
- m_100, m_010, m_001,
- m_011, m_101, m_110, m_200, m_020, m_002,
- m_111, m_210, m_012, m_201, m_021, m_120, m_102,
- m_022, m_202, m_220, m_211, m_121, m_112,
- m_122, m_212, m_221,
- m_222,
- a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011, a_111,
- b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011, b_111,
- c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011, c_111,
- d_000, d_100, d_010, d_001, d_110, d_101, d_011, d_111,
- LaplaceRho, eps_new, omegaF,
- kxxMyyAverage, kxxMzzAverage, kyzAverage, kxzAverage, kxyAverage
- );
+ omegaF = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaFine, turbulentViscosityFine[indices.k_000]) : omegaFine;
- //////////////////////////////////////////////////////////////////////////
- // Write distributions
- (distFine.f[DIR_000])[k_000] = f_000;
- (distFine.f[DIR_P00])[k_000] = f_P00;
- (distFine.f[DIR_M00])[k_M00] = f_M00;
- (distFine.f[DIR_0P0])[k_000] = f_0P0;
- (distFine.f[DIR_0M0])[k_0M0] = f_0M0;
- (distFine.f[DIR_00P])[k_000] = f_00P;
- (distFine.f[DIR_00M])[k_00M] = f_00M;
- (distFine.f[DIR_PP0])[k_000] = f_PP0;
- (distFine.f[DIR_MM0])[k_MM0] = f_MM0;
- (distFine.f[DIR_PM0])[k_0M0] = f_PM0;
- (distFine.f[DIR_MP0])[k_M00] = f_MP0;
- (distFine.f[DIR_P0P])[k_000] = f_P0P;
- (distFine.f[DIR_M0M])[k_M0M] = f_M0M;
- (distFine.f[DIR_P0M])[k_00M] = f_P0M;
- (distFine.f[DIR_M0P])[k_M00] = f_M0P;
- (distFine.f[DIR_0PP])[k_000] = f_0PP;
- (distFine.f[DIR_0MM])[k_0MM] = f_0MM;
- (distFine.f[DIR_0PM])[k_00M] = f_0PM;
- (distFine.f[DIR_0MP])[k_0M0] = f_0MP;
- (distFine.f[DIR_PPP])[k_000] = f_PPP;
- (distFine.f[DIR_MPP])[k_M00] = f_MPP;
- (distFine.f[DIR_PMP])[k_0M0] = f_PMP;
- (distFine.f[DIR_MMP])[k_MM0] = f_MMP;
- (distFine.f[DIR_PPM])[k_00M] = f_PPM;
- (distFine.f[DIR_MPM])[k_M0M] = f_MPM;
- (distFine.f[DIR_PMM])[k_0MM] = f_PMM;
- (distFine.f[DIR_MMM])[k_MMM] = f_MMM;
+ vf::lbm::interpolateCF(f, omegaF, epsilon_new, coefficients, x, y, z);
+ write(distFine, indices, f);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Position BNW = MPM: -0.25, 0.25, -0.25
@@ -1212,67 +203,23 @@ template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
//////////////////////////////////////////////////////////////////////////
// Set neighbor indices
- k_000 = k_base_000;
- k_M00 = k_base_M00;
- k_0M0 = k_base_0M0;
- k_00M = k_base_00M;
- k_MM0 = k_base_MM0;
- k_M0M = k_base_M0M;
- k_0MM = k_base_0MM;
- k_MMM = k_base_MMM;
+ indices.k_000 = k_base_000;
+ indices.k_M00 = k_base_M00;
+ indices.k_0M0 = k_base_0M0;
+ indices.k_00M = k_base_00M;
+ indices.k_MM0 = k_base_MM0;
+ indices.k_M0M = k_base_M0M;
+ indices.k_0MM = k_base_0MM;
+ indices.k_MMM = k_base_MMM;
////////////////////////////////////////////////////////////////////////////////
// Set moments (zeroth to sixth orders) on destination node
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- interpolateDistributions(
- x, y, z,
- m_000,
- m_100, m_010, m_001,
- m_011, m_101, m_110, m_200, m_020, m_002,
- m_111, m_210, m_012, m_201, m_021, m_120, m_102,
- m_022, m_202, m_220, m_211, m_121, m_112,
- m_122, m_212, m_221,
- m_222,
- a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011, a_111,
- b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011, b_111,
- c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011, c_111,
- d_000, d_100, d_010, d_001, d_110, d_101, d_011, d_111,
- LaplaceRho, eps_new, omegaF,
- kxxMyyAverage, kxxMzzAverage, kyzAverage, kxzAverage, kxyAverage
- );
+ omegaF = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaFine, turbulentViscosityFine[indices.k_000]) : omegaFine;
- //////////////////////////////////////////////////////////////////////////
- // Write distributions
- (distFine.f[DIR_000])[k_000] = f_000;
- (distFine.f[DIR_P00])[k_000] = f_P00;
- (distFine.f[DIR_M00])[k_M00] = f_M00;
- (distFine.f[DIR_0P0])[k_000] = f_0P0;
- (distFine.f[DIR_0M0])[k_0M0] = f_0M0;
- (distFine.f[DIR_00P])[k_000] = f_00P;
- (distFine.f[DIR_00M])[k_00M] = f_00M;
- (distFine.f[DIR_PP0])[k_000] = f_PP0;
- (distFine.f[DIR_MM0])[k_MM0] = f_MM0;
- (distFine.f[DIR_PM0])[k_0M0] = f_PM0;
- (distFine.f[DIR_MP0])[k_M00] = f_MP0;
- (distFine.f[DIR_P0P])[k_000] = f_P0P;
- (distFine.f[DIR_M0M])[k_M0M] = f_M0M;
- (distFine.f[DIR_P0M])[k_00M] = f_P0M;
- (distFine.f[DIR_M0P])[k_M00] = f_M0P;
- (distFine.f[DIR_0PP])[k_000] = f_0PP;
- (distFine.f[DIR_0MM])[k_0MM] = f_0MM;
- (distFine.f[DIR_0PM])[k_00M] = f_0PM;
- (distFine.f[DIR_0MP])[k_0M0] = f_0MP;
- (distFine.f[DIR_PPP])[k_000] = f_PPP;
- (distFine.f[DIR_MPP])[k_M00] = f_MPP;
- (distFine.f[DIR_PMP])[k_0M0] = f_PMP;
- (distFine.f[DIR_MMP])[k_MM0] = f_MMP;
- (distFine.f[DIR_PPM])[k_00M] = f_PPM;
- (distFine.f[DIR_MPM])[k_M0M] = f_MPM;
- (distFine.f[DIR_PMM])[k_0MM] = f_PMM;
- (distFine.f[DIR_MMM])[k_MMM] = f_MMM;
+ vf::lbm::interpolateCF(f, omegaF, epsilon_new, coefficients, x, y, z);
+ write(distFine, indices, f);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Position TNW = MPP: -0.25, 0.25, 0.25
@@ -1283,67 +230,20 @@ template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
z = c1o4;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Set neighbor indices
- k_000 = k_00M;
- k_M00 = k_M0M;
- k_0M0 = k_0MM;
- k_00M = neighborZfine[k_00M];
- k_MM0 = k_MMM;
- k_M0M = neighborZfine[k_M0M];
- k_0MM = neighborZfine[k_0MM];
- k_MMM = neighborZfine[k_MMM];
+ indices.k_000 = indices.k_00M;
+ indices.k_M00 = indices.k_M0M;
+ indices.k_0M0 = indices.k_0MM;
+ indices.k_00M = neighborZfine[indices.k_00M];
+ indices.k_MM0 = indices.k_MMM;
+ indices.k_M0M = neighborZfine[indices.k_M0M];
+ indices.k_0MM = neighborZfine[indices.k_0MM];
+ indices.k_MMM = neighborZfine[indices.k_MMM];
- ////////////////////////////////////////////////////////////////////////////////
- // Set moments (zeroth to sixth orders) on destination node
+ omegaF = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaFine, turbulentViscosityFine[indices.k_000]) : omegaFine;
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- interpolateDistributions(
- x, y, z,
- m_000,
- m_100, m_010, m_001,
- m_011, m_101, m_110, m_200, m_020, m_002,
- m_111, m_210, m_012, m_201, m_021, m_120, m_102,
- m_022, m_202, m_220, m_211, m_121, m_112,
- m_122, m_212, m_221,
- m_222,
- a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011, a_111,
- b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011, b_111,
- c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011, c_111,
- d_000, d_100, d_010, d_001, d_110, d_101, d_011, d_111,
- LaplaceRho, eps_new, omegaF,
- kxxMyyAverage, kxxMzzAverage, kyzAverage, kxzAverage, kxyAverage
- );
-
- //////////////////////////////////////////////////////////////////////////
- // Write distributions
- (distFine.f[DIR_000])[k_000] = f_000;
- (distFine.f[DIR_P00])[k_000] = f_P00;
- (distFine.f[DIR_M00])[k_M00] = f_M00;
- (distFine.f[DIR_0P0])[k_000] = f_0P0;
- (distFine.f[DIR_0M0])[k_0M0] = f_0M0;
- (distFine.f[DIR_00P])[k_000] = f_00P;
- (distFine.f[DIR_00M])[k_00M] = f_00M;
- (distFine.f[DIR_PP0])[k_000] = f_PP0;
- (distFine.f[DIR_MM0])[k_MM0] = f_MM0;
- (distFine.f[DIR_PM0])[k_0M0] = f_PM0;
- (distFine.f[DIR_MP0])[k_M00] = f_MP0;
- (distFine.f[DIR_P0P])[k_000] = f_P0P;
- (distFine.f[DIR_M0M])[k_M0M] = f_M0M;
- (distFine.f[DIR_P0M])[k_00M] = f_P0M;
- (distFine.f[DIR_M0P])[k_M00] = f_M0P;
- (distFine.f[DIR_0PP])[k_000] = f_0PP;
- (distFine.f[DIR_0MM])[k_0MM] = f_0MM;
- (distFine.f[DIR_0PM])[k_00M] = f_0PM;
- (distFine.f[DIR_0MP])[k_0M0] = f_0MP;
- (distFine.f[DIR_PPP])[k_000] = f_PPP;
- (distFine.f[DIR_MPP])[k_M00] = f_MPP;
- (distFine.f[DIR_PMP])[k_0M0] = f_PMP;
- (distFine.f[DIR_MMP])[k_MM0] = f_MMP;
- (distFine.f[DIR_PPM])[k_00M] = f_PPM;
- (distFine.f[DIR_MPM])[k_M0M] = f_MPM;
- (distFine.f[DIR_PMM])[k_0MM] = f_PMM;
- (distFine.f[DIR_MMM])[k_MMM] = f_MMM;
+ vf::lbm::interpolateCF(f, omegaF, epsilon_new, coefficients, x, y, z);
+ write(distFine, indices, f);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Position TNE = PPP: 0.25, 0.25, 0.25
@@ -1354,67 +254,20 @@ template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
z = c1o4;
////////////////////////////////////////////////////////////////////////////////////
// Set neighbor indices
- k_000 = k_M00;
- k_M00 = neighborXfine[k_M00];
- k_0M0 = k_MM0;
- k_00M = k_M0M;
- k_MM0 = neighborXfine[k_MM0];
- k_M0M = neighborXfine[k_M0M];
- k_0MM = k_MMM;
- k_MMM = neighborXfine[k_MMM];
+ indices.k_000 = indices.k_M00;
+ indices.k_M00 = neighborXfine[indices.k_M00];
+ indices.k_0M0 = indices.k_MM0;
+ indices.k_00M = indices.k_M0M;
+ indices.k_MM0 = neighborXfine[indices.k_MM0];
+ indices.k_M0M = neighborXfine[indices.k_M0M];
+ indices.k_0MM = indices.k_MMM;
+ indices.k_MMM = neighborXfine[indices.k_MMM];
- ////////////////////////////////////////////////////////////////////////////////
- // Set moments (zeroth to sixth orders) on destination node
+ omegaF = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaFine, turbulentViscosityFine[indices.k_000]) : omegaFine;
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- interpolateDistributions(
- x, y, z,
- m_000,
- m_100, m_010, m_001,
- m_011, m_101, m_110, m_200, m_020, m_002,
- m_111, m_210, m_012, m_201, m_021, m_120, m_102,
- m_022, m_202, m_220, m_211, m_121, m_112,
- m_122, m_212, m_221,
- m_222,
- a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011, a_111,
- b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011, b_111,
- c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011, c_111,
- d_000, d_100, d_010, d_001, d_110, d_101, d_011, d_111,
- LaplaceRho, eps_new, omegaF,
- kxxMyyAverage, kxxMzzAverage, kyzAverage, kxzAverage, kxyAverage
- );
-
- //////////////////////////////////////////////////////////////////////////
- // Write distributions
- (distFine.f[DIR_000])[k_000] = f_000;
- (distFine.f[DIR_P00])[k_000] = f_P00;
- (distFine.f[DIR_M00])[k_M00] = f_M00;
- (distFine.f[DIR_0P0])[k_000] = f_0P0;
- (distFine.f[DIR_0M0])[k_0M0] = f_0M0;
- (distFine.f[DIR_00P])[k_000] = f_00P;
- (distFine.f[DIR_00M])[k_00M] = f_00M;
- (distFine.f[DIR_PP0])[k_000] = f_PP0;
- (distFine.f[DIR_MM0])[k_MM0] = f_MM0;
- (distFine.f[DIR_PM0])[k_0M0] = f_PM0;
- (distFine.f[DIR_MP0])[k_M00] = f_MP0;
- (distFine.f[DIR_P0P])[k_000] = f_P0P;
- (distFine.f[DIR_M0M])[k_M0M] = f_M0M;
- (distFine.f[DIR_P0M])[k_00M] = f_P0M;
- (distFine.f[DIR_M0P])[k_M00] = f_M0P;
- (distFine.f[DIR_0PP])[k_000] = f_0PP;
- (distFine.f[DIR_0MM])[k_0MM] = f_0MM;
- (distFine.f[DIR_0PM])[k_00M] = f_0PM;
- (distFine.f[DIR_0MP])[k_0M0] = f_0MP;
- (distFine.f[DIR_PPP])[k_000] = f_PPP;
- (distFine.f[DIR_MPP])[k_M00] = f_MPP;
- (distFine.f[DIR_PMP])[k_0M0] = f_PMP;
- (distFine.f[DIR_MMP])[k_MM0] = f_MMP;
- (distFine.f[DIR_PPM])[k_00M] = f_PPM;
- (distFine.f[DIR_MPM])[k_M0M] = f_MPM;
- (distFine.f[DIR_PMM])[k_0MM] = f_PMM;
- (distFine.f[DIR_MMM])[k_MMM] = f_MMM;
+ vf::lbm::interpolateCF(f, omegaF, epsilon_new, coefficients, x, y, z);
+ write(distFine, indices, f);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
//Position BNE = PPM: 0.25, 0.25, -0.25
@@ -1425,66 +278,252 @@ template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
z = -c1o4;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Set neighbor indices
- k_00M = k_000;
- k_M0M = k_M00;
- k_0MM = k_0M0;
- k_MMM = k_MM0;
- k_000 = k_base_M00;
- k_M00 = neighborXfine[k_base_M00];
- k_0M0 = k_base_MM0;
- k_MM0 = neighborXfine[k_base_MM0];
+ indices.k_00M = indices.k_000;
+ indices.k_M0M = indices.k_M00;
+ indices.k_0MM = indices.k_0M0;
+ indices.k_MMM = indices.k_MM0;
+ indices.k_000 = k_base_M00;
+ indices.k_M00 = neighborXfine[k_base_M00];
+ indices.k_0M0 = k_base_MM0;
+ indices.k_MM0 = neighborXfine[k_base_MM0];
+
+ omegaF = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaFine, turbulentViscosityFine[indices.k_000]) : omegaFine;
+
+ vf::lbm::interpolateCF(f, omegaF, epsilon_new, coefficients, x, y, z);
+
+ write(distFine, indices, f);
+}
+
+//////////////////////////////////////////////////////////////////////////
+//! \brief Interpolate from coarse to fine nodes
+//! \details This scaling function is designed for the Cumulant K17 Kernel chimera collision kernel.
+//!
+//! The function is executed in the following steps:
+//!
+// based on scaleCF_RhoSq_comp_27
+template<bool hasTurbulentViscosity> __global__ void scaleCF_compressible(
+ real* distributionsCoarse,
+ real* distributionsFine,
+ unsigned int* neighborXcoarse,
+ unsigned int* neighborYcoarse,
+ unsigned int* neighborZcoarse,
+ unsigned int* neighborXfine,
+ unsigned int* neighborYfine,
+ unsigned int* neighborZfine,
+ unsigned long long numberOfLBnodesCoarse,
+ unsigned long long numberOfLBnodesFine,
+ bool isEvenTimestep,
+ unsigned int* indicesCoarseMMM,
+ unsigned int* indicesFineMMM,
+ unsigned int numberOfInterfaceNodes,
+ real omegaCoarse,
+ real omegaFine,
+ real* turbulentViscosityCoarse,
+ real* turbulentViscosityFine,
+ ICellNeigh neighborCoarseToFine)
+{
+ const unsigned nodeIndex = vf::gpu::getNodeIndex();
+
+ if (nodeIndex >= numberOfInterfaceNodes)
+ return;
+
+ // 1.calculate moments
+ vf::lbm::MomentsOnSourceNodeSet momentsSet;
+ // - ###########################################
+ // TODO: The following part starting from here
+ // should be exchanged by function call of calculate_moment_set<hasTurbulentViscosity>()
+ // However, this leads to a very small deviation in the results (~10e-6).
+ real omegaC = omegaCoarse;
+ Distributions27 distCoarse;
+ vf::gpu::getPointersToDistributions(distCoarse, distributionsCoarse, numberOfLBnodesCoarse, isEvenTimestep);
+
+ vf::gpu::ListIndices indices;
////////////////////////////////////////////////////////////////////////////////
- // Set moments (zeroth to sixth orders) on destination node
+ //! - Calculate moments for each source node
+ //!
+ ////////////////////////////////////////////////////////////////////////////////
+ // source node BSW = MMM
+ ////////////////////////////////////////////////////////////////////////////////
+ // index of the base node and its neighbors
+ unsigned int k_base_000 = indicesCoarseMMM[nodeIndex];
+ unsigned int k_base_M00 = neighborXcoarse [k_base_000];
+ unsigned int k_base_0M0 = neighborYcoarse [k_base_000];
+ unsigned int k_base_00M = neighborZcoarse [k_base_000];
+ unsigned int k_base_MM0 = neighborYcoarse [k_base_M00];
+ unsigned int k_base_M0M = neighborZcoarse [k_base_M00];
+ unsigned int k_base_0MM = neighborZcoarse [k_base_0M0];
+ unsigned int k_base_MMM = neighborZcoarse [k_base_MM0];
+ ////////////////////////////////////////////////////////////////////////////////
+ // Set neighbor indices
+ indices.k_000 = k_base_000;
+ indices.k_M00 = k_base_M00;
+ indices.k_0M0 = k_base_0M0;
+ indices.k_00M = k_base_00M;
+ indices.k_MM0 = k_base_MM0;
+ indices.k_M0M = k_base_M0M;
+ indices.k_0MM = k_base_0MM;
+ indices.k_MMM = k_base_MMM;
+
+ omegaC = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaCoarse, turbulentViscosityCoarse[indices.k_000]) : omegaCoarse;
+
+ real f_coarse[27];
+
+ read(f_coarse, distCoarse, indices);
+ momentsSet.calculateMMM(f_coarse, omegaC);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node TSW = MMP
+ //////////////////////////////////////////////////////////////////////////
+ // Set neighbor indices - has to be recalculated for the new source node
+ indices.k_000 = indices.k_00M;
+ indices.k_M00 = indices.k_M0M;
+ indices.k_0M0 = indices.k_0MM;
+ indices.k_00M = neighborZcoarse[indices.k_00M];
+ indices.k_MM0 = indices.k_MMM;
+ indices.k_M0M = neighborZcoarse[indices.k_M0M];
+ indices.k_0MM = neighborZcoarse[indices.k_0MM];
+ indices.k_MMM = neighborZcoarse[indices.k_MMM];
+
+ omegaC = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaCoarse, turbulentViscosityCoarse[indices.k_000]) : omegaCoarse;
+
+ read(f_coarse, distCoarse, indices);
+ momentsSet.calculateMMP(f_coarse, omegaC);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node TSE = PMP
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_000 = indices.k_M00;
+ indices.k_M00 = neighborXcoarse[indices.k_M00];
+ indices.k_0M0 = indices.k_MM0;
+ indices.k_00M = indices.k_M0M;
+ indices.k_MM0 = neighborXcoarse[indices.k_MM0];
+ indices.k_M0M = neighborXcoarse[indices.k_M0M];
+ indices.k_0MM = indices.k_MMM;
+ indices.k_MMM = neighborXcoarse[indices.k_MMM];
+
+ omegaC = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaCoarse, turbulentViscosityCoarse[indices.k_000]) : omegaCoarse;
+
+ read(f_coarse, distCoarse, indices);
+ momentsSet.calculatePMP(f_coarse, omegaC);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node BSE = PMM
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_00M = indices.k_000;
+ indices.k_M0M = indices.k_M00;
+ indices.k_0MM = indices.k_0M0;
+ indices.k_MMM = indices.k_MM0;
+ indices.k_000 = k_base_M00;
+ indices.k_M00 = neighborXcoarse[k_base_M00];
+ indices.k_0M0 = k_base_MM0;
+ indices.k_MM0 = neighborXcoarse[k_base_MM0];
+
+ omegaC = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaCoarse, turbulentViscosityCoarse[indices.k_000]) : omegaCoarse;
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- interpolateDistributions(
- x, y, z,
- m_000,
- m_100, m_010, m_001,
- m_011, m_101, m_110, m_200, m_020, m_002,
- m_111, m_210, m_012, m_201, m_021, m_120, m_102,
- m_022, m_202, m_220, m_211, m_121, m_112,
- m_122, m_212, m_221,
- m_222,
- a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011, a_111,
- b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011, b_111,
- c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011, c_111,
- d_000, d_100, d_010, d_001, d_110, d_101, d_011, d_111,
- LaplaceRho, eps_new, omegaF,
- kxxMyyAverage, kxxMzzAverage, kyzAverage, kxzAverage, kxyAverage
- );
+ read(f_coarse, distCoarse, indices);
+ momentsSet.calculatePMM(f_coarse, omegaC);
//////////////////////////////////////////////////////////////////////////
- // Write distributions
- (distFine.f[DIR_000])[k_000] = f_000;
- (distFine.f[DIR_P00])[k_000] = f_P00;
- (distFine.f[DIR_M00])[k_M00] = f_M00;
- (distFine.f[DIR_0P0])[k_000] = f_0P0;
- (distFine.f[DIR_0M0])[k_0M0] = f_0M0;
- (distFine.f[DIR_00P])[k_000] = f_00P;
- (distFine.f[DIR_00M])[k_00M] = f_00M;
- (distFine.f[DIR_PP0])[k_000] = f_PP0;
- (distFine.f[DIR_MM0])[k_MM0] = f_MM0;
- (distFine.f[DIR_PM0])[k_0M0] = f_PM0;
- (distFine.f[DIR_MP0])[k_M00] = f_MP0;
- (distFine.f[DIR_P0P])[k_000] = f_P0P;
- (distFine.f[DIR_M0M])[k_M0M] = f_M0M;
- (distFine.f[DIR_P0M])[k_00M] = f_P0M;
- (distFine.f[DIR_M0P])[k_M00] = f_M0P;
- (distFine.f[DIR_0PP])[k_000] = f_0PP;
- (distFine.f[DIR_0MM])[k_0MM] = f_0MM;
- (distFine.f[DIR_0PM])[k_00M] = f_0PM;
- (distFine.f[DIR_0MP])[k_0M0] = f_0MP;
- (distFine.f[DIR_PPP])[k_000] = f_PPP;
- (distFine.f[DIR_MPP])[k_M00] = f_MPP;
- (distFine.f[DIR_PMP])[k_0M0] = f_PMP;
- (distFine.f[DIR_MMP])[k_MM0] = f_MMP;
- (distFine.f[DIR_PPM])[k_00M] = f_PPM;
- (distFine.f[DIR_MPM])[k_M0M] = f_MPM;
- (distFine.f[DIR_PMM])[k_0MM] = f_PMM;
- (distFine.f[DIR_MMM])[k_MMM] = f_MMM;
+ // source node BNW = MPM
+ //////////////////////////////////////////////////////////////////////////
+ // index of the base node and its neighbors --> indices of all source nodes
+ k_base_000 = k_base_0M0;
+ k_base_M00 = k_base_MM0;
+ k_base_0M0 = neighborYcoarse[k_base_0M0];
+ k_base_00M = k_base_0MM;
+ k_base_MM0 = neighborYcoarse[k_base_MM0];
+ k_base_M0M = k_base_MMM;
+ k_base_0MM = neighborYcoarse[k_base_0MM];
+ k_base_MMM = neighborYcoarse[k_base_MMM];
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_000 = k_base_000;
+ indices.k_M00 = k_base_M00;
+ indices.k_0M0 = k_base_0M0;
+ indices.k_00M = k_base_00M;
+ indices.k_MM0 = k_base_MM0;
+ indices.k_M0M = k_base_M0M;
+ indices.k_0MM = k_base_0MM;
+ indices.k_MMM = k_base_MMM;
+
+ omegaC = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaCoarse, turbulentViscosityCoarse[indices.k_000]) : omegaCoarse;
+
+ read(f_coarse, distCoarse, indices);
+ momentsSet.calculateMPM(f_coarse, omegaC);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node TNW = MPP
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_000 = indices.k_00M;
+ indices.k_M00 = indices.k_M0M;
+ indices.k_0M0 = indices.k_0MM;
+ indices.k_00M = neighborZcoarse[indices.k_00M];
+ indices.k_MM0 = indices.k_MMM;
+ indices.k_M0M = neighborZcoarse[indices.k_M0M];
+ indices.k_0MM = neighborZcoarse[indices.k_0MM];
+ indices.k_MMM = neighborZcoarse[indices.k_MMM];
+
+ omegaC = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaCoarse, turbulentViscosityCoarse[indices.k_000]) : omegaCoarse;
+
+ read(f_coarse, distCoarse, indices);
+ momentsSet.calculateMPP(f_coarse, omegaC);
+ //////////////////////////////////////////////////////////////////////////
+ // source node TNE = PPP
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_000 = indices.k_M00;
+ indices.k_M00 = neighborXcoarse[indices.k_M00];
+ indices.k_0M0 = indices.k_MM0;
+ indices.k_00M = indices.k_M0M;
+ indices.k_MM0 = neighborXcoarse[indices.k_MM0];
+ indices.k_M0M = neighborXcoarse[indices.k_M0M];
+ indices.k_0MM = indices.k_MMM;
+ indices.k_MMM = neighborXcoarse[indices.k_MMM];
+
+ omegaC = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaCoarse, turbulentViscosityCoarse[indices.k_000]) : omegaCoarse;
+
+ read(f_coarse, distCoarse, indices);
+ momentsSet.calculatePPP(f_coarse, omegaC);
+ //////////////////////////////////////////////////////////////////////////
+ // source node BNE = PPM
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_00M = indices.k_000;
+ indices.k_M0M = indices.k_M00;
+ indices.k_0MM = indices.k_0M0;
+ indices.k_MMM = indices.k_MM0;
+ indices.k_000 = k_base_M00;
+ indices.k_M00 = neighborXcoarse[k_base_M00];
+ indices.k_0M0 = k_base_MM0;
+ indices.k_MM0 = neighborXcoarse[k_base_MM0];
+
+ omegaC = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaCoarse, turbulentViscosityCoarse[indices.k_000]) : omegaCoarse;
+
+ read(f_coarse, distCoarse, indices);
+ momentsSet.calculatePPM(f_coarse, omegaC);
+ // should be extractel until this line
+ // - ###################################################################
+
+ // 2.calculate coefficients
+ vf::lbm::Coefficients coefficients;
+ momentsSet.calculateCoefficients(coefficients, neighborCoarseToFine.x[nodeIndex], neighborCoarseToFine.y[nodeIndex], neighborCoarseToFine.z[nodeIndex]);
+
+ // 3. interpolate coarse to fine
+ interpolate<hasTurbulentViscosity>(
+ coefficients,
+ nodeIndex,
+ distributionsFine,
+ neighborXfine,
+ neighborYfine,
+ neighborZfine,
+ numberOfLBnodesFine,
+ indicesFineMMM,
+ omegaFine,
+ turbulentViscosityFine);
}
template __global__ void scaleCF_compressible<true>( real* distributionsCoarse, real* distributionsFine, unsigned int* neighborXcoarse, unsigned int* neighborYcoarse, unsigned int* neighborZcoarse, unsigned int* neighborXfine, unsigned int* neighborYfine, unsigned int* neighborZfine, unsigned long long numberOfLBnodesCoarse, unsigned long long numberOfLBnodesFine, bool isEvenTimestep, unsigned int* indicesCoarseMMM, unsigned int* indicesFineMMM, unsigned int numberOfInterfaceNodes, real omegaCoarse, real omegaFine, real* turbulentViscosityCoarse, real* turbulentViscosityFine, ICellNeigh offsetCF);
diff --git a/src/gpu/VirtualFluids_GPU/GPU/GridScaling/scaleFC_compressible.cu b/src/gpu/VirtualFluids_GPU/GPU/GridScaling/scaleFC_compressible.cu
index 5776ba476e3537360b32ee85f32514324946ff75..3276db0595329b4c948779d0b27857170d125f78 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/GridScaling/scaleFC_compressible.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/GridScaling/scaleFC_compressible.cu
@@ -35,16 +35,44 @@
#include "LBM/GPUHelperFunctions/KernelUtilities.h"
#include "LBM/GPUHelperFunctions/ScalingUtilities.h"
-using namespace vf::basics::constant;
-using namespace vf::lbm::dir;
-using namespace vf::gpu;
+#include <lbm/KernelParameter.h>
+#include <lbm/refinement/InterpolationFC.h>
+#include <lbm/refinement/Coefficients.h>
+
+
+template <bool hasTurbulentViscosity> __device__ void interpolate(
+ vf::lbm::Coefficients& coefficients,
+ const unsigned int nodeIndex,
+ real* distributionsCoarse,
+ unsigned int* neighborXcoarse,
+ unsigned int* neighborYcoarse,
+ unsigned int* neighborZcoarse,
+ unsigned long long numberOfLBnodesCoarse,
+ unsigned int* indicesCoarse000,
+ real omegaCoarse,
+ real* turbulentViscosityCoarse,
+ bool isEvenTimestep
+)
+{
+ // Position Coarse 0., 0., 0.
+ Distributions27 distCoarse;
+ vf::gpu::getPointersToDistributions(distCoarse, distributionsCoarse, numberOfLBnodesCoarse, isEvenTimestep);
+
+ vf::gpu::ListIndices indices(indicesCoarse000[nodeIndex], neighborXcoarse, neighborYcoarse, neighborZcoarse);
+
+ const real epsilonNew = c2o1; // ratio of grid resolutions
+ const real omegaCoarseNew = hasTurbulentViscosity ? vf::gpu::calculateOmega(omegaCoarse, turbulentViscosityCoarse[indices.k_000]) : omegaCoarse;
+ real fCoarse[27];
+ vf::lbm::interpolateFC(fCoarse, epsilonNew, omegaCoarseNew, coefficients);
+
+ vf::gpu::write(distCoarse, indices, fCoarse);
+}
+
+
//////////////////////////////////////////////////////////////////////////
//! \brief Interpolate from fine to coarse
//! \details This scaling function is designed for the Cumulant K17 Kernel chimera collision kernel
-//! The function is executed in the following steps:
-//!
-
// based on scaleFC_RhoSq_comp_27
template<bool hasTurbulentViscosity> __global__ void scaleFC_compressible(
real *distributionsCoarse,
@@ -61,653 +89,41 @@ template<bool hasTurbulentViscosity> __global__ void scaleFC_compressible(
unsigned int *indicesCoarse000,
unsigned int *indicesFineMMM,
unsigned int numberOfInterfaceNodes,
- real omegaCoarse,
- real omegaFine,
+ const real omega_coarse,
+ const real omegaFine,
real* turbulentViscosityCoarse,
real* turbulentViscosityFine,
ICellNeigh neighborFineToCoarse)
{
- ////////////////////////////////////////////////////////////////////////////////
- //! - Get the node index coordinates from threadIdx, blockIdx, blockDim and gridDim.
- //!
- const unsigned nodeIndex = getNodeIndex();
+ const unsigned nodeIndex = vf::gpu::getNodeIndex();
- //////////////////////////////////////////////////////////////////////////
- //! - Return for non-interface node
if (nodeIndex >= numberOfInterfaceNodes)
return;
- //////////////////////////////////////////////////////////////////////////
- //! - Read distributions: style of reading and writing the distributions from/to stored arrays dependent on
- //! timestep is based on the esoteric twist algorithm \ref <a
- //! href="https://doi.org/10.3390/computation5020019"><b>[ M. Geier et al. (2017),
- //! DOI:10.3390/computation5020019 ]</b></a>
- //!
- Distributions27 distFine, distCoarse;
- getPointersToDistributions(distFine, distributionsFine, numberOfLBnodesFine, true);
- getPointersToDistributions(distCoarse, distributionsCoarse, numberOfLBnodesCoarse, isEvenTimestep);
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - declare local variables for source nodes
- //!
- real eps_new = c2o1; // ratio of grid resolutions
- real omegaF = omegaFine;
- real omegaC = omegaCoarse;
-
- // zeroth and first order moments at the source nodes
- real drho_PPP, vx1_PPP, vx2_PPP, vx3_PPP;
- real drho_MPP, vx1_MPP, vx2_MPP, vx3_MPP;
- real drho_PMP, vx1_PMP, vx2_PMP, vx3_PMP;
- real drho_MMP, vx1_MMP, vx2_MMP, vx3_MMP;
- real drho_PPM, vx1_PPM, vx2_PPM, vx3_PPM;
- real drho_MPM, vx1_MPM, vx2_MPM, vx3_MPM;
- real drho_PMM, vx1_PMM, vx2_PMM, vx3_PMM;
- real drho_MMM, vx1_MMM, vx2_MMM, vx3_MMM;
-
- // second order moments at the source nodes
- real kxyFromfcNEQ_PPP, kyzFromfcNEQ_PPP, kxzFromfcNEQ_PPP, kxxMyyFromfcNEQ_PPP, kxxMzzFromfcNEQ_PPP;
- real kxyFromfcNEQ_MPP, kyzFromfcNEQ_MPP, kxzFromfcNEQ_MPP, kxxMyyFromfcNEQ_MPP, kxxMzzFromfcNEQ_MPP;
- real kxyFromfcNEQ_PMP, kyzFromfcNEQ_PMP, kxzFromfcNEQ_PMP, kxxMyyFromfcNEQ_PMP, kxxMzzFromfcNEQ_PMP;
- real kxyFromfcNEQ_MMP, kyzFromfcNEQ_MMP, kxzFromfcNEQ_MMP, kxxMyyFromfcNEQ_MMP, kxxMzzFromfcNEQ_MMP;
- real kxyFromfcNEQ_PPM, kyzFromfcNEQ_PPM, kxzFromfcNEQ_PPM, kxxMyyFromfcNEQ_PPM, kxxMzzFromfcNEQ_PPM;
- real kxyFromfcNEQ_MPM, kyzFromfcNEQ_MPM, kxzFromfcNEQ_MPM, kxxMyyFromfcNEQ_MPM, kxxMzzFromfcNEQ_MPM;
- real kxyFromfcNEQ_PMM, kyzFromfcNEQ_PMM, kxzFromfcNEQ_PMM, kxxMyyFromfcNEQ_PMM, kxxMzzFromfcNEQ_PMM;
- real kxyFromfcNEQ_MMM, kyzFromfcNEQ_MMM, kxzFromfcNEQ_MMM, kxxMyyFromfcNEQ_MMM, kxxMzzFromfcNEQ_MMM;
-
- //////////////////////////////////////////////////////////////////////////
- //! - Calculate moments for each source node
- //!
- //////////////////////////////////////////////////////////////////////////
- // source node BSW = MMM
- //////////////////////////////////////////////////////////////////////////
- // index of the base node and its neighbors
- unsigned int k_base_000 = indicesFineMMM[nodeIndex];
- unsigned int k_base_M00 = neighborXfine [k_base_000];
- unsigned int k_base_0M0 = neighborYfine [k_base_000];
- unsigned int k_base_00M = neighborZfine [k_base_000];
- unsigned int k_base_MM0 = neighborYfine [k_base_M00];
- unsigned int k_base_M0M = neighborZfine [k_base_M00];
- unsigned int k_base_0MM = neighborZfine [k_base_0M0];
- unsigned int k_base_MMM = neighborZfine [k_base_MM0];
- //////////////////////////////////////////////////////////////////////////
- // Set neighbor indices
- unsigned int k_000 = k_base_000;
- unsigned int k_M00 = k_base_M00;
- unsigned int k_0M0 = k_base_0M0;
- unsigned int k_00M = k_base_00M;
- unsigned int k_MM0 = k_base_MM0;
- unsigned int k_M0M = k_base_M0M;
- unsigned int k_0MM = k_base_0MM;
- unsigned int k_MMM = k_base_MMM;
-
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- calculateMomentsOnSourceNodes( distFine, omegaF,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_MMM, vx1_MMM, vx2_MMM, vx3_MMM,
- kxyFromfcNEQ_MMM, kyzFromfcNEQ_MMM, kxzFromfcNEQ_MMM, kxxMyyFromfcNEQ_MMM, kxxMzzFromfcNEQ_MMM);
-
- //////////////////////////////////////////////////////////////////////////
- // source node TSW = MMP
- //////////////////////////////////////////////////////////////////////////
- // Set neighbor indices - has to be recalculated for the new source node
- k_000 = k_00M;
- k_M00 = k_M0M;
- k_0M0 = k_0MM;
- k_00M = neighborZfine[k_00M];
- k_MM0 = k_MMM;
- k_M0M = neighborZfine[k_M0M];
- k_0MM = neighborZfine[k_0MM];
- k_MMM = neighborZfine[k_MMM];
-
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- calculateMomentsOnSourceNodes( distFine, omegaF,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_MMP, vx1_MMP, vx2_MMP, vx3_MMP,
- kxyFromfcNEQ_MMP, kyzFromfcNEQ_MMP, kxzFromfcNEQ_MMP, kxxMyyFromfcNEQ_MMP, kxxMzzFromfcNEQ_MMP);
-
- //////////////////////////////////////////////////////////////////////////
- // source node TSE = PMP
- //////////////////////////////////////////////////////////////////////////
- // index
- k_000 = k_M00;
- k_M00 = neighborXfine[k_M00];
- k_0M0 = k_MM0;
- k_00M = k_M0M;
- k_MM0 = neighborXfine[k_MM0];
- k_M0M = neighborXfine[k_M0M];
- k_0MM = k_MMM;
- k_MMM = neighborXfine[k_MMM];
-
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- calculateMomentsOnSourceNodes( distFine, omegaF,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_PMP, vx1_PMP, vx2_PMP, vx3_PMP,
- kxyFromfcNEQ_PMP, kyzFromfcNEQ_PMP, kxzFromfcNEQ_PMP, kxxMyyFromfcNEQ_PMP, kxxMzzFromfcNEQ_PMP);
-
- //////////////////////////////////////////////////////////////////////////
- // source node BSE = PMM
- //////////////////////////////////////////////////////////////////////////
- // index
- k_00M = k_000;
- k_M0M = k_M00;
- k_0MM = k_0M0;
- k_MMM = k_MM0;
- k_000 = k_base_M00;
- k_M00 = neighborXfine[k_base_M00];
- k_0M0 = k_base_MM0;
- k_MM0 = neighborXfine[k_base_MM0];
-
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- calculateMomentsOnSourceNodes( distFine, omegaF,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_PMM, vx1_PMM, vx2_PMM, vx3_PMM,
- kxyFromfcNEQ_PMM, kyzFromfcNEQ_PMM, kxzFromfcNEQ_PMM, kxxMyyFromfcNEQ_PMM, kxxMzzFromfcNEQ_PMM);
-
- //////////////////////////////////////////////////////////////////////////
- // source node BNW = MPM
- //////////////////////////////////////////////////////////////////////////
- // index of the base node and its neighbors --> indices of all source nodes
- k_base_000 = k_base_0M0;
- k_base_M00 = k_base_MM0;
- k_base_0M0 = neighborYfine[k_base_0M0];
- k_base_00M = k_base_0MM;
- k_base_MM0 = neighborYfine[k_base_MM0];
- k_base_M0M = k_base_MMM;
- k_base_0MM = neighborYfine[k_base_0MM];
- k_base_MMM = neighborYfine[k_base_MMM];
- //////////////////////////////////////////////////////////////////////////
- // index
- k_000 = k_base_000;
- k_M00 = k_base_M00;
- k_0M0 = k_base_0M0;
- k_00M = k_base_00M;
- k_MM0 = k_base_MM0;
- k_M0M = k_base_M0M;
- k_0MM = k_base_0MM;
- k_MMM = k_base_MMM;
-
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- calculateMomentsOnSourceNodes( distFine, omegaF,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_MPM, vx1_MPM, vx2_MPM, vx3_MPM,
- kxyFromfcNEQ_MPM, kyzFromfcNEQ_MPM, kxzFromfcNEQ_MPM, kxxMyyFromfcNEQ_MPM, kxxMzzFromfcNEQ_MPM);
-
- //////////////////////////////////////////////////////////////////////////
- // source node TNW = MPP
- //////////////////////////////////////////////////////////////////////////
- // index
- k_000 = k_00M;
- k_M00 = k_M0M;
- k_0M0 = k_0MM;
- k_00M = neighborZfine[k_00M];
- k_MM0 = k_MMM;
- k_M0M = neighborZfine[k_M0M];
- k_0MM = neighborZfine[k_0MM];
- k_MMM = neighborZfine[k_MMM];
-
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- calculateMomentsOnSourceNodes( distFine, omegaF,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_MPP, vx1_MPP, vx2_MPP, vx3_MPP,
- kxyFromfcNEQ_MPP, kyzFromfcNEQ_MPP, kxzFromfcNEQ_MPP, kxxMyyFromfcNEQ_MPP, kxxMzzFromfcNEQ_MPP);
-
- //////////////////////////////////////////////////////////////////////////
- // source node TNE = PPP
- //////////////////////////////////////////////////////////////////////////
- // index
- k_000 = k_M00;
- k_M00 = neighborXfine[k_M00];
- k_0M0 = k_MM0;
- k_00M = k_M0M;
- k_MM0 = neighborXfine[k_MM0];
- k_M0M = neighborXfine[k_M0M];
- k_0MM = k_MMM;
- k_MMM = neighborXfine[k_MMM];
-
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- calculateMomentsOnSourceNodes( distFine, omegaF,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_PPP, vx1_PPP, vx2_PPP, vx3_PPP,
- kxyFromfcNEQ_PPP, kyzFromfcNEQ_PPP, kxzFromfcNEQ_PPP, kxxMyyFromfcNEQ_PPP, kxxMzzFromfcNEQ_PPP);
-
- //////////////////////////////////////////////////////////////////////////
- // source node BNE = PPM
- //////////////////////////////////////////////////////////////////////////
- // index
- k_00M = k_000;
- k_M0M = k_M00;
- k_0MM = k_0M0;
- k_MMM = k_MM0;
- k_000 = k_base_M00;
- k_M00 = neighborXfine[k_base_M00];
- k_0M0 = k_base_MM0;
- k_MM0 = neighborXfine[k_base_MM0];
-
- if(hasTurbulentViscosity) omegaF = omegaFine/ (c1o1 + c3o1*omegaFine*turbulentViscosityFine[k_000]);
-
- calculateMomentsOnSourceNodes( distFine, omegaF,
- k_000, k_M00, k_0M0, k_00M, k_MM0, k_M0M, k_0MM, k_MMM, drho_PPM, vx1_PPM, vx2_PPM, vx3_PPM,
- kxyFromfcNEQ_PPM, kyzFromfcNEQ_PPM, kxzFromfcNEQ_PPM, kxxMyyFromfcNEQ_PPM, kxxMzzFromfcNEQ_PPM);
-
- //////////////////////////////////////////////////////////////////////////
- //! - Calculate coefficients for polynomial interpolation
- //!
- // example: a_110: derivation in x and y direction
- real a_000, a_100, a_010, a_001, a_200, a_020, a_002, a_110, a_101, a_011;
- real b_000, b_100, b_010, b_001, b_200, b_020, b_002, b_110, b_101, b_011;
- real c_000, c_100, c_010, c_001, c_200, c_020, c_002, c_110, c_101, c_011;
- real d_000, d_100, d_010, d_001, d_110, d_101, d_011;
-
- a_000 = c1o64 * (
- c2o1 * (
- ((kxyFromfcNEQ_MMM - kxyFromfcNEQ_PPP) + (kxyFromfcNEQ_MMP - kxyFromfcNEQ_PPM)) + ((kxyFromfcNEQ_PMM - kxyFromfcNEQ_MPP) + (kxyFromfcNEQ_PMP - kxyFromfcNEQ_MPM)) +
- ((kxzFromfcNEQ_MMM - kxzFromfcNEQ_PPP) + (kxzFromfcNEQ_PPM - kxzFromfcNEQ_MMP)) + ((kxzFromfcNEQ_PMM - kxzFromfcNEQ_MPP) + (kxzFromfcNEQ_MPM - kxzFromfcNEQ_PMP)) +
- ((vx2_PPP + vx2_MMM) + (vx2_PPM + vx2_MMP)) - ((vx2_MPP + vx2_PMM) + (vx2_MPM + vx2_PMP)) +
- ((vx3_PPP + vx3_MMM) - (vx3_PPM + vx3_MMP)) + ((vx3_PMP + vx3_MPM) - (vx3_MPP + vx3_PMM))) +
- c8o1 * (((vx1_PPP + vx1_MMM) + (vx1_PPM + vx1_MMP)) + ((vx1_MPP + vx1_PMM) + (vx1_PMP + vx1_MPM))) +
- ((kxxMyyFromfcNEQ_MMM - kxxMyyFromfcNEQ_PPP) + (kxxMyyFromfcNEQ_MMP - kxxMyyFromfcNEQ_PPM)) +
- ((kxxMyyFromfcNEQ_MPP - kxxMyyFromfcNEQ_PMM) + (kxxMyyFromfcNEQ_MPM - kxxMyyFromfcNEQ_PMP)) +
- ((kxxMzzFromfcNEQ_MMM - kxxMzzFromfcNEQ_PPP) + (kxxMzzFromfcNEQ_MMP - kxxMzzFromfcNEQ_PPM)) +
- ((kxxMzzFromfcNEQ_MPP - kxxMzzFromfcNEQ_PMM) + (kxxMzzFromfcNEQ_MPM - kxxMzzFromfcNEQ_PMP)));
- b_000 = c1o64 * (
- c2o1 * (
- ((kxxMyyFromfcNEQ_PPP - kxxMyyFromfcNEQ_MMM) + (kxxMyyFromfcNEQ_PPM - kxxMyyFromfcNEQ_MMP)) +
- ((kxxMyyFromfcNEQ_MPP - kxxMyyFromfcNEQ_PMM) + (kxxMyyFromfcNEQ_MPM - kxxMyyFromfcNEQ_PMP)) +
- ((kxyFromfcNEQ_MMM - kxyFromfcNEQ_PPP) + (kxyFromfcNEQ_MMP - kxyFromfcNEQ_PPM)) +
- ((kxyFromfcNEQ_MPP - kxyFromfcNEQ_PMM) + (kxyFromfcNEQ_MPM - kxyFromfcNEQ_PMP)) +
- ((kyzFromfcNEQ_MMM - kyzFromfcNEQ_PPP) + (kyzFromfcNEQ_PPM - kyzFromfcNEQ_MMP)) +
- ((kyzFromfcNEQ_PMM - kyzFromfcNEQ_MPP) + (kyzFromfcNEQ_MPM - kyzFromfcNEQ_PMP)) +
- ((vx1_PPP + vx1_MMM) + (vx1_PPM + vx1_MMP)) - ((vx1_MPM + vx1_MPP) + (vx1_PMM + vx1_PMP)) +
- ((vx3_PPP + vx3_MMM) - (vx3_PPM + vx3_MMP)) + ((vx3_MPP + vx3_PMM) - (vx3_MPM + vx3_PMP))) +
- c8o1 * (((vx2_PPP + vx2_MMM) + (vx2_PPM + vx2_MMP)) + ((vx2_MPP + vx2_PMM) + (vx2_MPM + vx2_PMP))) +
- ((kxxMzzFromfcNEQ_MMM - kxxMzzFromfcNEQ_PPP) + (kxxMzzFromfcNEQ_MMP - kxxMzzFromfcNEQ_PPM)) +
- ((kxxMzzFromfcNEQ_PMM - kxxMzzFromfcNEQ_MPP) + (kxxMzzFromfcNEQ_PMP - kxxMzzFromfcNEQ_MPM)));
- c_000 = c1o64 * (
- c2o1 * (
- ((kxxMzzFromfcNEQ_PPP - kxxMzzFromfcNEQ_MMM) + (kxxMzzFromfcNEQ_MMP - kxxMzzFromfcNEQ_PPM)) +
- ((kxxMzzFromfcNEQ_MPP - kxxMzzFromfcNEQ_PMM) + (kxxMzzFromfcNEQ_PMP - kxxMzzFromfcNEQ_MPM)) +
- ((kxzFromfcNEQ_MMM - kxzFromfcNEQ_PPP) + (kxzFromfcNEQ_MMP - kxzFromfcNEQ_PPM)) +
- ((kxzFromfcNEQ_MPP - kxzFromfcNEQ_PMM) + (kxzFromfcNEQ_MPM - kxzFromfcNEQ_PMP)) +
- ((kyzFromfcNEQ_MMM - kyzFromfcNEQ_PPP) + (kyzFromfcNEQ_MMP - kyzFromfcNEQ_PPM)) +
- ((kyzFromfcNEQ_PMM - kyzFromfcNEQ_MPP) + (kyzFromfcNEQ_PMP - kyzFromfcNEQ_MPM)) +
- ((vx1_PPP + vx1_MMM) - (vx1_MMP + vx1_PPM)) + ((vx1_MPM + vx1_PMP) - (vx1_MPP + vx1_PMM)) +
- ((vx2_PPP + vx2_MMM) - (vx2_MMP + vx2_PPM)) + ((vx2_MPP + vx2_PMM) - (vx2_MPM + vx2_PMP))) +
- c8o1 * (((vx3_PPP + vx3_MMM) + (vx3_PPM + vx3_MMP)) + ((vx3_PMM + vx3_MPP) + (vx3_PMP + vx3_MPM))) +
- ((kxxMyyFromfcNEQ_MMM - kxxMyyFromfcNEQ_PPP) + (kxxMyyFromfcNEQ_PPM - kxxMyyFromfcNEQ_MMP)) +
- ((kxxMyyFromfcNEQ_PMM - kxxMyyFromfcNEQ_MPP) + (kxxMyyFromfcNEQ_MPM - kxxMyyFromfcNEQ_PMP)));
-
- a_100 = c1o4 * (((vx1_PPP - vx1_MMM) + (vx1_PPM - vx1_MMP)) + ((vx1_PMM - vx1_MPP) + (vx1_PMP - vx1_MPM)));
- b_100 = c1o4 * (((vx2_PPP - vx2_MMM) + (vx2_PPM - vx2_MMP)) + ((vx2_PMM - vx2_MPP) + (vx2_PMP - vx2_MPM)));
- c_100 = c1o4 * (((vx3_PPP - vx3_MMM) + (vx3_PPM - vx3_MMP)) + ((vx3_PMM - vx3_MPP) + (vx3_PMP - vx3_MPM)));
-
- a_200 = c1o16 * (
- c2o1 * (
- ((vx2_PPP + vx2_MMM) + (vx2_PPM - vx2_MPP)) + ((vx2_MMP - vx2_PMM) - (vx2_MPM + vx2_PMP)) +
- ((vx3_PPP + vx3_MMM) - (vx3_PPM + vx3_MPP)) + ((vx3_MPM + vx3_PMP) - (vx3_MMP + vx3_PMM))) +
- ((kxxMyyFromfcNEQ_PPP - kxxMyyFromfcNEQ_MMM) + (kxxMyyFromfcNEQ_PPM - kxxMyyFromfcNEQ_MMP)) +
- ((kxxMyyFromfcNEQ_PMM - kxxMyyFromfcNEQ_MPP) + (kxxMyyFromfcNEQ_PMP - kxxMyyFromfcNEQ_MPM)) +
- ((kxxMzzFromfcNEQ_PPP - kxxMzzFromfcNEQ_MMM) + (kxxMzzFromfcNEQ_PPM - kxxMzzFromfcNEQ_MMP)) +
- ((kxxMzzFromfcNEQ_PMM - kxxMzzFromfcNEQ_MPP) + (kxxMzzFromfcNEQ_PMP - kxxMzzFromfcNEQ_MPM)));
- b_200 = c1o8 * (
- c2o1 * (
- -((vx1_PPP + vx1_MMM) + (vx1_PPM + vx1_MMP)) + ((vx1_MPP + vx1_PMM) + (vx1_MPM + vx1_PMP))) +
- ((kxyFromfcNEQ_PPP - kxyFromfcNEQ_MMM) + (kxyFromfcNEQ_PPM - kxyFromfcNEQ_MMP)) +
- ((kxyFromfcNEQ_PMM - kxyFromfcNEQ_MPP) + (kxyFromfcNEQ_PMP - kxyFromfcNEQ_MPM)));
- c_200 = c1o8 * (
- c2o1 * (
- ((vx1_PPM + vx1_MMP) - (vx1_PPP + vx1_MMM)) + ((vx1_MPP + vx1_PMM) - (vx1_MPM + vx1_PMP))) +
- ((kxzFromfcNEQ_PPP - kxzFromfcNEQ_MMM) + (kxzFromfcNEQ_PPM - kxzFromfcNEQ_MMP)) +
- ((kxzFromfcNEQ_PMM - kxzFromfcNEQ_MPP) + (kxzFromfcNEQ_PMP - kxzFromfcNEQ_MPM)));
-
- a_010 = c1o4 * (((vx1_PPP - vx1_MMM) + (vx1_PPM - vx1_MMP)) + ((vx1_MPP - vx1_PMM) + (vx1_MPM - vx1_PMP)));
- b_010 = c1o4 * (((vx2_PPP - vx2_MMM) + (vx2_PPM - vx2_MMP)) + ((vx2_MPP - vx2_PMM) + (vx2_MPM - vx2_PMP)));
- c_010 = c1o4 * (((vx3_PPP - vx3_MMM) + (vx3_PPM - vx3_MMP)) + ((vx3_MPP - vx3_PMM) + (vx3_MPM - vx3_PMP)));
-
- a_020 = c1o8 * (
- c2o1 * (-((vx2_PPP + vx2_MMM) + (vx2_MMP + vx2_PPM)) + ((vx2_MPP + vx2_PMM) + (vx2_MPM + vx2_PMP))) +
- ((kxyFromfcNEQ_PPP - kxyFromfcNEQ_MMM) + (kxyFromfcNEQ_PPM - kxyFromfcNEQ_MMP)) +
- ((kxyFromfcNEQ_MPP - kxyFromfcNEQ_PMM) + (kxyFromfcNEQ_MPM - kxyFromfcNEQ_PMP)));
- b_020 = c1o16 * (
- c2o1 * (
- ((kxxMyyFromfcNEQ_MMM - kxxMyyFromfcNEQ_PPP) + (kxxMyyFromfcNEQ_MMP - kxxMyyFromfcNEQ_PPM)) +
- ((kxxMyyFromfcNEQ_PMM - kxxMyyFromfcNEQ_MPP) + (kxxMyyFromfcNEQ_PMP - kxxMyyFromfcNEQ_MPM)) +
- ((vx1_PPP + vx1_MMM) + (vx1_PPM + vx1_MMP)) - ((vx1_MPP + vx1_PMM) + (vx1_PMP + vx1_MPM)) +
- ((vx3_PPP + vx3_MMM) - (vx3_PPM + vx3_MMP)) + ((vx3_MPP + vx3_PMM) - (vx3_MPM + vx3_PMP))) +
- ((kxxMzzFromfcNEQ_PPP - kxxMzzFromfcNEQ_MMM) + (kxxMzzFromfcNEQ_PPM - kxxMzzFromfcNEQ_MMP)) +
- ((kxxMzzFromfcNEQ_MPP - kxxMzzFromfcNEQ_PMM) + (kxxMzzFromfcNEQ_MPM - kxxMzzFromfcNEQ_PMP)));
- c_020 = c1o8 * (
- c2o1 * (((vx2_MMP + vx2_PPM) - (vx2_PPP + vx2_MMM)) + ((vx2_PMP + vx2_MPM) - (vx2_MPP + vx2_PMM))) +
- ((kyzFromfcNEQ_PPP - kyzFromfcNEQ_MMM) + (kyzFromfcNEQ_PPM - kyzFromfcNEQ_MMP)) +
- ((kyzFromfcNEQ_MPP - kyzFromfcNEQ_PMM) + (kyzFromfcNEQ_MPM - kyzFromfcNEQ_PMP)));
-
- a_001 = c1o4 * (((vx1_PPP - vx1_MMM) + (vx1_MMP - vx1_PPM)) + ((vx1_MPP - vx1_PMM) + (vx1_PMP - vx1_MPM)));
- b_001 = c1o4 * (((vx2_PPP - vx2_MMM) + (vx2_MMP - vx2_PPM)) + ((vx2_MPP - vx2_PMM) + (vx2_PMP - vx2_MPM)));
- c_001 = c1o4 * (((vx3_PPP - vx3_MMM) + (vx3_MMP - vx3_PPM)) + ((vx3_MPP - vx3_PMM) + (vx3_PMP - vx3_MPM)));
-
- a_002 = c1o8 * (
- c2o1 * (((vx3_PPM + vx3_MMP) - (vx3_PPP + vx3_MMM)) + ((vx3_MPP + vx3_PMM) - (vx3_PMP + vx3_MPM))) +
- ((kxzFromfcNEQ_PPP - kxzFromfcNEQ_MMM) + (kxzFromfcNEQ_MMP - kxzFromfcNEQ_PPM)) +
- ((kxzFromfcNEQ_PMP - kxzFromfcNEQ_MPM) + (kxzFromfcNEQ_MPP - kxzFromfcNEQ_PMM)));
- b_002 = c1o8 * (
- c2o1 * (((vx3_PPM + vx3_MMP) - (vx3_PPP + vx3_MMM)) + ((vx3_MPM + vx3_PMP) - (vx3_PMM + vx3_MPP))) +
- ((kyzFromfcNEQ_PPP - kyzFromfcNEQ_MMM) + (kyzFromfcNEQ_MMP - kyzFromfcNEQ_PPM)) +
- ((kyzFromfcNEQ_PMP - kyzFromfcNEQ_MPM) + (kyzFromfcNEQ_MPP - kyzFromfcNEQ_PMM)));
- c_002 = c1o16 * (
- c2o1 * (
- ((kxxMzzFromfcNEQ_MMM - kxxMzzFromfcNEQ_PPP) + (kxxMzzFromfcNEQ_PPM - kxxMzzFromfcNEQ_MMP)) +
- ((kxxMzzFromfcNEQ_MPM - kxxMzzFromfcNEQ_PMP) + (kxxMzzFromfcNEQ_PMM - kxxMzzFromfcNEQ_MPP)) +
- ((vx1_PPP + vx1_MMM) - (vx1_MMP + vx1_PPM)) + ((vx1_MPM + vx1_PMP) - (vx1_PMM + vx1_MPP)) +
- ((vx2_PPP + vx2_MMM) - (vx2_MMP + vx2_PPM)) + ((vx2_PMM + vx2_MPP) - (vx2_MPM + vx2_PMP))) +
- ((kxxMyyFromfcNEQ_PPP - kxxMyyFromfcNEQ_MMM) + (kxxMyyFromfcNEQ_MMP - kxxMyyFromfcNEQ_PPM)) +
- ((kxxMyyFromfcNEQ_PMP - kxxMyyFromfcNEQ_MPM) + (kxxMyyFromfcNEQ_MPP - kxxMyyFromfcNEQ_PMM)));
-
- a_110 = c1o2 * (((vx1_PPP + vx1_MMM) + (vx1_MMP + vx1_PPM)) - ((vx1_MPM + vx1_PMP) + (vx1_PMM + vx1_MPP)));
- b_110 = c1o2 * (((vx2_PPP + vx2_MMM) + (vx2_MMP + vx2_PPM)) - ((vx2_MPM + vx2_PMP) + (vx2_PMM + vx2_MPP)));
- c_110 = c1o2 * (((vx3_PPP + vx3_MMM) + (vx3_MMP + vx3_PPM)) - ((vx3_MPM + vx3_PMP) + (vx3_PMM + vx3_MPP)));
-
- a_101 = c1o2 * (((vx1_PPP + vx1_MMM) - (vx1_MMP + vx1_PPM)) + ((vx1_MPM + vx1_PMP) - (vx1_PMM + vx1_MPP)));
- b_101 = c1o2 * (((vx2_PPP + vx2_MMM) - (vx2_MMP + vx2_PPM)) + ((vx2_MPM + vx2_PMP) - (vx2_PMM + vx2_MPP)));
- c_101 = c1o2 * (((vx3_PPP + vx3_MMM) - (vx3_MMP + vx3_PPM)) + ((vx3_MPM + vx3_PMP) - (vx3_PMM + vx3_MPP)));
-
- a_011 = c1o2 * (((vx1_PPP + vx1_MMM) - (vx1_MMP + vx1_PPM)) + ((vx1_PMM + vx1_MPP) - (vx1_MPM + vx1_PMP)));
- b_011 = c1o2 * (((vx2_PPP + vx2_MMM) - (vx2_MMP + vx2_PPM)) + ((vx2_PMM + vx2_MPP) - (vx2_MPM + vx2_PMP)));
- c_011 = c1o2 * (((vx3_PPP + vx3_MMM) - (vx3_MMP + vx3_PPM)) + ((vx3_PMM + vx3_MPP) - (vx3_MPM + vx3_PMP)));
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- real kxyAverage = c0o1;
- real kyzAverage = c0o1;
- real kxzAverage = c0o1;
- real kxxMyyAverage = c0o1;
- real kxxMzzAverage = c0o1;
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - Set the relative position of the offset cell {-1, 0, 1}
- //!
- real xoff = neighborFineToCoarse.x[nodeIndex];
- real yoff = neighborFineToCoarse.y[nodeIndex];
- real zoff = neighborFineToCoarse.z[nodeIndex];
-
- real xoff_sq = xoff * xoff;
- real yoff_sq = yoff * yoff;
- real zoff_sq = zoff * zoff;
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- //!- Calculate coefficients for the polynomial interpolation of the pressure
- //!
- real LaplaceRho =
- ((xoff != c0o1) || (yoff != c0o1) || (zoff != c0o1))
- ? c0o1 : -c3o1 * (a_100 * a_100 + b_010 * b_010 + c_001 * c_001) - c6o1 * (b_100 * a_010 + c_100 * a_001 + c_010 * b_001);
- d_000 = c1o8 * ((((drho_PPP + drho_MMM) + (drho_PPM + drho_MMP)) + ((drho_PMM + drho_MPP) + (drho_PMP + drho_MPM))) - c2o1 * LaplaceRho);
- d_100 = c1o4 * (((drho_PPP - drho_MMM) + (drho_PPM - drho_MMP)) + ((drho_PMM - drho_MPP) + (drho_PMP - drho_MPM)));
- d_010 = c1o4 * (((drho_PPP - drho_MMM) + (drho_PPM - drho_MMP)) + ((drho_MPP - drho_PMM) + (drho_MPM - drho_PMP)));
- d_001 = c1o4 * (((drho_PPP - drho_MMM) + (drho_MMP - drho_PPM)) + ((drho_MPP - drho_PMM) + (drho_PMP - drho_MPM)));
- d_110 = c1o2 * (((drho_PPP + drho_MMM) + (drho_PPM + drho_MMP)) - ((drho_PMM + drho_MPP) + (drho_PMP + drho_MPM)));
- d_101 = c1o2 * (((drho_PPP + drho_MMM) - (drho_PPM + drho_MMP)) + ((drho_PMP + drho_MPM) - (drho_PMM + drho_MPP)));
- d_011 = c1o2 * (((drho_PPP + drho_MMM) - (drho_PPM + drho_MMP)) + ((drho_PMM + drho_MPP) - (drho_PMP + drho_MPM)));
-
-
- //////////////////////////////////////////////////////////////////////////
- //! - Extrapolation for refinement in to the wall (polynomial coefficients)
- //!
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- //
- // x------x
- // | |
- // | ---+--->X
- // | | \
- // x------x \
- // offset-vector
- //
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- a_000 = a_000 + xoff * a_100 + yoff * a_010 + zoff * a_001 + xoff_sq * a_200 + yoff_sq * a_020 + zoff_sq * a_002 +
- xoff * yoff * a_110 + xoff * zoff * a_101 + yoff * zoff * a_011;
- a_100 = a_100 + c2o1 * xoff * a_200 + yoff * a_110 + zoff * a_101;
- a_010 = a_010 + c2o1 * yoff * a_020 + xoff * a_110 + zoff * a_011;
- a_001 = a_001 + c2o1 * zoff * a_002 + xoff * a_101 + yoff * a_011;
- b_000 = b_000 + xoff * b_100 + yoff * b_010 + zoff * b_001 + xoff_sq * b_200 + yoff_sq * b_020 + zoff_sq * b_002 +
- xoff * yoff * b_110 + xoff * zoff * b_101 + yoff * zoff * b_011;
- b_100 = b_100 + c2o1 * xoff * b_200 + yoff * b_110 + zoff * b_101;
- b_010 = b_010 + c2o1 * yoff * b_020 + xoff * b_110 + zoff * b_011;
- b_001 = b_001 + c2o1 * zoff * b_002 + xoff * b_101 + yoff * b_011;
- c_000 = c_000 + xoff * c_100 + yoff * c_010 + zoff * c_001 + xoff_sq * c_200 + yoff_sq * c_020 + zoff_sq * c_002 +
- xoff * yoff * c_110 + xoff * zoff * c_101 + yoff * zoff * c_011;
- c_100 = c_100 + c2o1 * xoff * c_200 + yoff * c_110 + zoff * c_101;
- c_010 = c_010 + c2o1 * yoff * c_020 + xoff * c_110 + zoff * c_011;
- c_001 = c_001 + c2o1 * zoff * c_002 + xoff * c_101 + yoff * c_011;
- d_000 = d_000 + xoff * d_100 + yoff * d_010 + zoff * d_001 +
- xoff * yoff * d_110 + xoff * zoff * d_101 + yoff * zoff * d_011;
-
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Set all moments to zero
- //!
- real m_111 = c0o1;
- real m_211 = c0o1;
- real m_011 = c0o1;
- real m_121 = c0o1;
- real m_101 = c0o1;
- real m_112 = c0o1;
- real m_110 = c0o1;
- real m_221 = c0o1;
- real m_001 = c0o1;
- real m_201 = c0o1;
- real m_021 = c0o1;
- real m_212 = c0o1;
- real m_010 = c0o1;
- real m_210 = c0o1;
- real m_012 = c0o1;
- real m_122 = c0o1;
- real m_100 = c0o1;
- real m_120 = c0o1;
- real m_102 = c0o1;
- real m_222 = c0o1;
- real m_022 = c0o1;
- real m_202 = c0o1;
- real m_002 = c0o1;
- real m_220 = c0o1;
- real m_020 = c0o1;
- real m_200 = c0o1;
- real m_000 = c0o1;
-
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Define aliases to use the same variable for the distributions (f's):
- //!
- real& f_000 = m_111;
- real& f_P00 = m_211;
- real& f_M00 = m_011;
- real& f_0P0 = m_121;
- real& f_0M0 = m_101;
- real& f_00P = m_112;
- real& f_00M = m_110;
- real& f_PP0 = m_221;
- real& f_MM0 = m_001;
- real& f_PM0 = m_201;
- real& f_MP0 = m_021;
- real& f_P0P = m_212;
- real& f_M0M = m_010;
- real& f_P0M = m_210;
- real& f_M0P = m_012;
- real& f_0PP = m_122;
- real& f_0MM = m_100;
- real& f_0PM = m_120;
- real& f_0MP = m_102;
- real& f_PPP = m_222;
- real& f_MPP = m_022;
- real& f_PMP = m_202;
- real& f_MMP = m_002;
- real& f_PPM = m_220;
- real& f_MPM = m_020;
- real& f_PMM = m_200;
- real& f_MMM = m_000;
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - Declare local variables for destination nodes
- //!
- real vvx, vvy, vvz, vx_sq, vy_sq, vz_sq;
- real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz;
- real useNEQ = c1o1; // zero; //one; //.... one = on ..... zero = off
- real press;
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- //
- // Position Coarse 0., 0., 0.
- //
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // x = 0.;
- // y = 0.;
- // z = 0.;
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // index of the destination node and its neighbors
- k_000 = indicesCoarse000[nodeIndex];
- k_M00 = neighborXcoarse [k_000];
- k_0M0 = neighborYcoarse [k_000];
- k_00M = neighborZcoarse [k_000];
- k_MM0 = neighborYcoarse [k_M00];
- k_M0M = neighborZcoarse [k_M00];
- k_0MM = neighborZcoarse [k_0M0];
- k_MMM = neighborZcoarse [k_MM0];
- ////////////////////////////////////////////////////////////////////////////////////
-
- if(hasTurbulentViscosity) omegaC = omegaCoarse / (c1o1 + c3o1*omegaCoarse*turbulentViscosityCoarse[k_000]);
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - Set macroscopic values on destination node (zeroth and first order moments)
- //!
- press = d_000;
- vvx = a_000;
- vvy = b_000;
- vvz = c_000;
-
- m_000 = press; // m_000 is press, if drho is interpolated directly
-
- vx_sq = vvx * vvx;
- vy_sq = vvy * vvy;
- vz_sq = vvz * vvz;
-
- ////////////////////////////////////////////////////////////////////////////////
- //! - Set moments (second to sixth order) on destination node
- //!
- // linear combinations for second order moments
- mxxPyyPzz = m_000;
-
- mxxMyy = -c2o3 * ((a_100 - b_010) + kxxMyyAverage) * eps_new / omegaC * (c1o1 + press);
- mxxMzz = -c2o3 * ((a_100 - c_001) + kxxMzzAverage) * eps_new / omegaC * (c1o1 + press);
-
- m_011 = -c1o3 * ((b_001 + c_010) + kyzAverage) * eps_new / omegaC * (c1o1 + press);
- m_101 = -c1o3 * ((a_001 + c_100) + kxzAverage) * eps_new / omegaC * (c1o1 + press);
- m_110 = -c1o3 * ((a_010 + b_100) + kxyAverage) * eps_new / omegaC * (c1o1 + press);
-
- m_200 = c1o3 * ( mxxMyy + mxxMzz + mxxPyyPzz) * useNEQ;
- m_020 = c1o3 * (-c2o1 * mxxMyy + mxxMzz + mxxPyyPzz) * useNEQ;
- m_002 = c1o3 * ( mxxMyy - c2o1 * mxxMzz + mxxPyyPzz) * useNEQ;
-
- // linear combinations for third order moments
- m_111 = c0o1;
-
- mxxyPyzz = c0o1;
- mxxyMyzz = c0o1;
- mxxzPyyz = c0o1;
- mxxzMyyz = c0o1;
- mxyyPxzz = c0o1;
- mxyyMxzz = c0o1;
-
- m_210 = ( mxxyMyzz + mxxyPyzz) * c1o2;
- m_012 = (-mxxyMyzz + mxxyPyzz) * c1o2;
- m_201 = ( mxxzMyyz + mxxzPyyz) * c1o2;
- m_021 = (-mxxzMyyz + mxxzPyyz) * c1o2;
- m_120 = ( mxyyMxzz + mxyyPxzz) * c1o2;
- m_102 = (-mxyyMxzz + mxyyPxzz) * c1o2;
-
- // fourth order moments
- m_022 = m_000 * c1o9;
- m_202 = m_022;
- m_220 = m_022;
-
- // fifth order moments
-
- // sixth order moments
- m_222 = m_000 * c1o27;
-
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Chimera transform from central moments to well conditioned distributions as defined in Appendix J in
- //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015),
- //! DOI:10.1016/j.camwa.2015.05.001 ]</b></a> see also Eq. (88)-(96) in <a
- //! href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040
- //! ]</b></a>
- //!
- ////////////////////////////////////////////////////////////////////////////////////
- // X - Dir
- backwardInverseChimeraWithK(m_000, m_100, m_200, vvx, vx_sq, c1o1, c1o1);
- backwardChimera( m_010, m_110, m_210, vvx, vx_sq);
- backwardInverseChimeraWithK(m_020, m_120, m_220, vvx, vx_sq, c3o1, c1o3);
- backwardChimera( m_001, m_101, m_201, vvx, vx_sq);
- backwardChimera( m_011, m_111, m_211, vvx, vx_sq);
- backwardChimera( m_021, m_121, m_221, vvx, vx_sq);
- backwardInverseChimeraWithK(m_002, m_102, m_202, vvx, vx_sq, c3o1, c1o3);
- backwardChimera( m_012, m_112, m_212, vvx, vx_sq);
- backwardInverseChimeraWithK(m_022, m_122, m_222, vvx, vx_sq, c9o1, c1o9);
-
- ////////////////////////////////////////////////////////////////////////////////////
- // Y - Dir
- backwardInverseChimeraWithK(m_000, m_010, m_020, vvy, vy_sq, c6o1, c1o6);
- backwardChimera( m_001, m_011, m_021, vvy, vy_sq);
- backwardInverseChimeraWithK(m_002, m_012, m_022, vvy, vy_sq, c18o1, c1o18);
- backwardInverseChimeraWithK(m_100, m_110, m_120, vvy, vy_sq, c3o2, c2o3);
- backwardChimera( m_101, m_111, m_121, vvy, vy_sq);
- backwardInverseChimeraWithK(m_102, m_112, m_122, vvy, vy_sq, c9o2, c2o9);
- backwardInverseChimeraWithK(m_200, m_210, m_220, vvy, vy_sq, c6o1, c1o6);
- backwardChimera( m_201, m_211, m_221, vvy, vy_sq);
- backwardInverseChimeraWithK(m_202, m_212, m_222, vvy, vy_sq, c18o1, c1o18);
-
- ////////////////////////////////////////////////////////////////////////////////////
- // Z - Dir
- backwardInverseChimeraWithK(m_000, m_001, m_002, vvz, vz_sq, c36o1, c1o36);
- backwardInverseChimeraWithK(m_010, m_011, m_012, vvz, vz_sq, c9o1, c1o9);
- backwardInverseChimeraWithK(m_020, m_021, m_022, vvz, vz_sq, c36o1, c1o36);
- backwardInverseChimeraWithK(m_100, m_101, m_102, vvz, vz_sq, c9o1, c1o9);
- backwardInverseChimeraWithK(m_110, m_111, m_112, vvz, vz_sq, c9o4, c4o9);
- backwardInverseChimeraWithK(m_120, m_121, m_122, vvz, vz_sq, c9o1, c1o9);
- backwardInverseChimeraWithK(m_200, m_201, m_202, vvz, vz_sq, c36o1, c1o36);
- backwardInverseChimeraWithK(m_210, m_211, m_212, vvz, vz_sq, c9o1, c1o9);
- backwardInverseChimeraWithK(m_220, m_221, m_222, vvz, vz_sq, c36o1, c1o36);
-
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Write distributions: style of reading and writing the distributions from/to
- //! stored arrays dependent on timestep is based on the esoteric twist algorithm
- //! <a href="https://doi.org/10.3390/computation5020019"><b>[ M. Geier et al. (2017),
- //! DOI:10.3390/computation5020019 ]</b></a>
- //!
- (distCoarse.f[DIR_000])[k_000] = f_000;
- (distCoarse.f[DIR_P00])[k_000] = f_P00;
- (distCoarse.f[DIR_M00])[k_M00] = f_M00;
- (distCoarse.f[DIR_0P0])[k_000] = f_0P0;
- (distCoarse.f[DIR_0M0])[k_0M0] = f_0M0;
- (distCoarse.f[DIR_00P])[k_000] = f_00P;
- (distCoarse.f[DIR_00M])[k_00M] = f_00M;
- (distCoarse.f[DIR_PP0])[k_000] = f_PP0;
- (distCoarse.f[DIR_MM0])[k_MM0] = f_MM0;
- (distCoarse.f[DIR_PM0])[k_0M0] = f_PM0;
- (distCoarse.f[DIR_MP0])[k_M00] = f_MP0;
- (distCoarse.f[DIR_P0P])[k_000] = f_P0P;
- (distCoarse.f[DIR_M0M])[k_M0M] = f_M0M;
- (distCoarse.f[DIR_P0M])[k_00M] = f_P0M;
- (distCoarse.f[DIR_M0P])[k_M00] = f_M0P;
- (distCoarse.f[DIR_0PP])[k_000] = f_0PP;
- (distCoarse.f[DIR_0MM])[k_0MM] = f_0MM;
- (distCoarse.f[DIR_0PM])[k_00M] = f_0PM;
- (distCoarse.f[DIR_0MP])[k_0M0] = f_0MP;
- (distCoarse.f[DIR_PPP])[k_000] = f_PPP;
- (distCoarse.f[DIR_MPP])[k_M00] = f_MPP;
- (distCoarse.f[DIR_PMP])[k_0M0] = f_PMP;
- (distCoarse.f[DIR_MMP])[k_MM0] = f_MMP;
- (distCoarse.f[DIR_PPM])[k_00M] = f_PPM;
- (distCoarse.f[DIR_MPM])[k_M0M] = f_MPM;
- (distCoarse.f[DIR_PMM])[k_0MM] = f_PMM;
- (distCoarse.f[DIR_MMM])[k_MMM] = f_MMM;
- ////////////////////////////////////////////////////////////////////////////////////
+ // 1.calculate moments
+ vf::lbm::MomentsOnSourceNodeSet momentsSet;
+ vf::gpu::calculateMomentSet<hasTurbulentViscosity>(
+ momentsSet, nodeIndex, distributionsFine, neighborXfine, neighborYfine, neighborZfine, indicesFineMMM, turbulentViscosityFine, numberOfLBnodesFine, omegaFine, true);
+
+ // 2.calculate coefficients
+ vf::lbm::Coefficients coefficients;
+ momentsSet.calculateCoefficients(coefficients, neighborFineToCoarse.x[nodeIndex], neighborFineToCoarse.y[nodeIndex], neighborFineToCoarse.z[nodeIndex]);
+
+ // 3. interpolate fine to coarse
+ interpolate<hasTurbulentViscosity>(
+ coefficients,
+ nodeIndex,
+ distributionsCoarse,
+ neighborXcoarse,
+ neighborYcoarse,
+ neighborZcoarse,
+ numberOfLBnodesCoarse,
+ indicesCoarse000,
+ omega_coarse,
+ turbulentViscosityCoarse,
+ isEvenTimestep);
}
-template __global__ void scaleFC_compressible<true>( real *distributionsCoarse, real *distributionsFine, unsigned int *neighborXcoarse, unsigned int *neighborYcoarse, unsigned int *neighborZcoarse, unsigned int *neighborXfine, unsigned int *neighborYfine, unsigned int *neighborZfine, unsigned long long numberOfLBnodesCoarse, unsigned long long numberOfLBnodesFine, bool isEvenTimestep, unsigned int *indicesCoarse000, unsigned int *indicesFineMMM, unsigned int numberOfInterfaceNodes, real omegaCoarse, real omegaFine, real* turbulentViscosityCoarse, real* turbulentViscosityFine, ICellNeigh neighborFineToCoarse);
+template __global__ void scaleFC_compressible<true>(real *distributionsCoarse, real *distributionsFine, unsigned int *neighborXcoarse, unsigned int *neighborYcoarse, unsigned int *neighborZcoarse, unsigned int *neighborXfine, unsigned int *neighborYfine, unsigned int *neighborZfine, unsigned long long numberOfLBnodesCoarse, unsigned long long numberOfLBnodesFine, bool isEvenTimestep, unsigned int *indicesCoarse000, unsigned int *indicesFineMMM, unsigned int numberOfInterfaceNodes, real omegaCoarse, real omegaFine, real* turbulentViscosityCoarse, real* turbulentViscosityFine, ICellNeigh neighborFineToCoarse);
-template __global__ void scaleFC_compressible<false>( real *distributionsCoarse, real *distributionsFine, unsigned int *neighborXcoarse, unsigned int *neighborYcoarse, unsigned int *neighborZcoarse, unsigned int *neighborXfine, unsigned int *neighborYfine, unsigned int *neighborZfine, unsigned long long numberOfLBnodesCoarse, unsigned long long numberOfLBnodesFine, bool isEvenTimestep, unsigned int *indicesCoarse000, unsigned int *indicesFineMMM, unsigned int numberOfInterfaceNodes, real omegaCoarse, real omegaFine, real* turbulentViscosityCoarse, real* turbulentViscosityFine, ICellNeigh neighborFineToCoarse);
\ No newline at end of file
+template __global__ void scaleFC_compressible<false>(real *distributionsCoarse, real *distributionsFine, unsigned int *neighborXcoarse, unsigned int *neighborYcoarse, unsigned int *neighborZcoarse, unsigned int *neighborXfine, unsigned int *neighborYfine, unsigned int *neighborZfine, unsigned long long numberOfLBnodesCoarse, unsigned long long numberOfLBnodesFine, bool isEvenTimestep, unsigned int *indicesCoarse000, unsigned int *indicesFineMMM, unsigned int numberOfInterfaceNodes, real omegaCoarse, real omegaFine, real* turbulentViscosityCoarse, real* turbulentViscosityFine, ICellNeigh neighborFineToCoarse);
\ No newline at end of file
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cu b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cu
index a1d9ba6665576c90406eee13084e5133acdb448c..3cc4b33f0b752943c97b1b770c62189a6c17d9c8 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cu
@@ -19,33 +19,33 @@ __device__ DistributionWrapper::DistributionWrapper(real *distributions, unsigne
__device__ void DistributionWrapper::read()
{
- distribution.f[vf::lbm::dir::PZZ] = (distribution_references.f[DIR_P00])[k];
- distribution.f[vf::lbm::dir::MZZ] = (distribution_references.f[DIR_M00])[kw];
- distribution.f[vf::lbm::dir::ZPZ] = (distribution_references.f[DIR_0P0])[k];
- distribution.f[vf::lbm::dir::ZMZ] = (distribution_references.f[DIR_0M0])[ks];
- distribution.f[vf::lbm::dir::ZZP] = (distribution_references.f[DIR_00P])[k];
- distribution.f[vf::lbm::dir::ZZM] = (distribution_references.f[DIR_00M])[kb];
- distribution.f[vf::lbm::dir::PPZ] = (distribution_references.f[DIR_PP0])[k];
- distribution.f[vf::lbm::dir::MMZ] = (distribution_references.f[DIR_MM0])[ksw];
- distribution.f[vf::lbm::dir::PMZ] = (distribution_references.f[DIR_PM0])[ks];
- distribution.f[vf::lbm::dir::MPZ] = (distribution_references.f[DIR_MP0])[kw];
- distribution.f[vf::lbm::dir::PZP] = (distribution_references.f[DIR_P0P])[k];
- distribution.f[vf::lbm::dir::MZM] = (distribution_references.f[DIR_M0M])[kbw];
- distribution.f[vf::lbm::dir::PZM] = (distribution_references.f[DIR_P0M])[kb];
- distribution.f[vf::lbm::dir::MZP] = (distribution_references.f[DIR_M0P])[kw];
- distribution.f[vf::lbm::dir::ZPP] = (distribution_references.f[DIR_0PP])[k];
- distribution.f[vf::lbm::dir::ZMM] = (distribution_references.f[DIR_0MM])[kbs];
- distribution.f[vf::lbm::dir::ZPM] = (distribution_references.f[DIR_0PM])[kb];
- distribution.f[vf::lbm::dir::ZMP] = (distribution_references.f[DIR_0MP])[ks];
- distribution.f[vf::lbm::dir::PPP] = (distribution_references.f[DIR_PPP])[k];
- distribution.f[vf::lbm::dir::MPP] = (distribution_references.f[DIR_MPP])[kw];
- distribution.f[vf::lbm::dir::PMP] = (distribution_references.f[DIR_PMP])[ks];
- distribution.f[vf::lbm::dir::MMP] = (distribution_references.f[DIR_MMP])[ksw];
- distribution.f[vf::lbm::dir::PPM] = (distribution_references.f[DIR_PPM])[kb];
- distribution.f[vf::lbm::dir::MPM] = (distribution_references.f[DIR_MPM])[kbw];
- distribution.f[vf::lbm::dir::PMM] = (distribution_references.f[DIR_PMM])[kbs];
- distribution.f[vf::lbm::dir::MMM] = (distribution_references.f[DIR_MMM])[kbsw];
- distribution.f[vf::lbm::dir::ZZZ] = (distribution_references.f[DIR_000])[k];
+ distribution.f[vf::lbm::dir::DIR_P00] = (distribution_references.f[DIR_P00])[k];
+ distribution.f[vf::lbm::dir::DIR_M00] = (distribution_references.f[DIR_M00])[kw];
+ distribution.f[vf::lbm::dir::DIR_0P0] = (distribution_references.f[DIR_0P0])[k];
+ distribution.f[vf::lbm::dir::DIR_0M0] = (distribution_references.f[DIR_0M0])[ks];
+ distribution.f[vf::lbm::dir::DIR_00P] = (distribution_references.f[DIR_00P])[k];
+ distribution.f[vf::lbm::dir::DIR_00M] = (distribution_references.f[DIR_00M])[kb];
+ distribution.f[vf::lbm::dir::DIR_PP0] = (distribution_references.f[DIR_PP0])[k];
+ distribution.f[vf::lbm::dir::DIR_MM0] = (distribution_references.f[DIR_MM0])[ksw];
+ distribution.f[vf::lbm::dir::DIR_PM0] = (distribution_references.f[DIR_PM0])[ks];
+ distribution.f[vf::lbm::dir::DIR_MP0] = (distribution_references.f[DIR_MP0])[kw];
+ distribution.f[vf::lbm::dir::DIR_P0P] = (distribution_references.f[DIR_P0P])[k];
+ distribution.f[vf::lbm::dir::DIR_M0M] = (distribution_references.f[DIR_M0M])[kbw];
+ distribution.f[vf::lbm::dir::DIR_P0M] = (distribution_references.f[DIR_P0M])[kb];
+ distribution.f[vf::lbm::dir::DIR_M0P] = (distribution_references.f[DIR_M0P])[kw];
+ distribution.f[vf::lbm::dir::DIR_0PP] = (distribution_references.f[DIR_0PP])[k];
+ distribution.f[vf::lbm::dir::DIR_0MM] = (distribution_references.f[DIR_0MM])[kbs];
+ distribution.f[vf::lbm::dir::DIR_0PM] = (distribution_references.f[DIR_0PM])[kb];
+ distribution.f[vf::lbm::dir::DIR_0MP] = (distribution_references.f[DIR_0MP])[ks];
+ distribution.f[vf::lbm::dir::DIR_PPP] = (distribution_references.f[DIR_PPP])[k];
+ distribution.f[vf::lbm::dir::DIR_MPP] = (distribution_references.f[DIR_MPP])[kw];
+ distribution.f[vf::lbm::dir::DIR_PMP] = (distribution_references.f[DIR_PMP])[ks];
+ distribution.f[vf::lbm::dir::DIR_MMP] = (distribution_references.f[DIR_MMP])[ksw];
+ distribution.f[vf::lbm::dir::DIR_PPM] = (distribution_references.f[DIR_PPM])[kb];
+ distribution.f[vf::lbm::dir::DIR_MPM] = (distribution_references.f[DIR_MPM])[kbw];
+ distribution.f[vf::lbm::dir::DIR_PMM] = (distribution_references.f[DIR_PMM])[kbs];
+ distribution.f[vf::lbm::dir::DIR_MMM] = (distribution_references.f[DIR_MMM])[kbsw];
+ distribution.f[vf::lbm::dir::DIR_000] = (distribution_references.f[DIR_000])[k];
}
__device__ void DistributionWrapper::write()
diff --git a/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.cpp b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.cpp
index e8fc3f318c920be36be7861a28659124a7b1e977..1c1e65fa34720a1f9d19b5ef02e4afda167b323f 100644
--- a/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.cpp
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.cpp
@@ -415,7 +415,7 @@ void BCKernelManager::runPrecursorBCKernelPost(int level, uint t, CudaMemoryMana
para->getParD(level)->precursorBC.current = para->getParD(level)->precursorBC.next;
para->getParD(level)->precursorBC.next = tmp;
- real loadTime = nextTime*pow(2,-level)*para->getTimeRatio();
+ real loadTime = nextTime*exp2(-level)*para->getTimeRatio();
for(auto reader : para->getParH(level)->transientBCInputFileReader)
{
diff --git a/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManagerTest.cpp b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManagerTest.cpp
index a0e02112e821eedcfeb013d3465529f668309529..6b429d2d9c03e546286d3d2b0ced3612c0a4649a 100644
--- a/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManagerTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManagerTest.cpp
@@ -1,3 +1,4 @@
+
#include <gmock/gmock.h>
#include <stdexcept>
@@ -18,44 +19,123 @@ protected:
}
};
-TEST_F(BCKernelManagerTest_BCsNotSpecified, velocityBoundaryConditionPost_NotSpecified)
+TEST_F(BCKernelManagerTest_BCsNotSpecified, velocityBoundaryConditionPostNotSpecified_noBoundaryNodes_doesNotThrow)
+{
+ para->getParD(0)->velocityBC.numberOfBCnodes = 0;
+ EXPECT_NO_THROW(BCKernelManager(para, &bcFactory));
+}
+
+TEST_F(BCKernelManagerTest_BCsNotSpecified, velocityBoundaryConditionPostNotSpecified_withBoundaryNodes_throws)
{
para->getParD(0)->velocityBC.numberOfBCnodes = 1;
EXPECT_THROW(BCKernelManager(para, &bcFactory), std::runtime_error);
}
-TEST_F(BCKernelManagerTest_BCsNotSpecified, noSlipBoundaryConditionPost_NotSpecified)
+TEST_F(BCKernelManagerTest_BCsNotSpecified, noSlipBoundaryConditionPostNotSpecified_noBoundaryNodes_doesNotThrow)
+{
+ para->getParD(0)->noSlipBC.numberOfBCnodes = 0;
+ EXPECT_NO_THROW(BCKernelManager(para, &bcFactory));
+}
+
+TEST_F(BCKernelManagerTest_BCsNotSpecified, noSlipBoundaryConditionPostNotSpecified_withBoundaryNodes_doesNotThrow)
{
para->getParD(0)->noSlipBC.numberOfBCnodes = 1;
EXPECT_NO_THROW(BCKernelManager(para, &bcFactory)); // no throw, as a default is specified
}
-TEST_F(BCKernelManagerTest_BCsNotSpecified, slipBoundaryConditionPost_NotSpecified)
+TEST_F(BCKernelManagerTest_BCsNotSpecified, slipBoundaryConditionPostNotSpecified_noBoundaryNodes_doesNotThrow)
+{
+ para->getParD(0)->slipBC.numberOfBCnodes = 0;
+ EXPECT_NO_THROW(BCKernelManager(para, &bcFactory));
+}
+
+TEST_F(BCKernelManagerTest_BCsNotSpecified, slipBoundaryConditionPostNotSpecified_withBoundaryNodes_throws)
{
para->getParD(0)->slipBC.numberOfBCnodes = 1;
EXPECT_THROW(BCKernelManager(para, &bcFactory), std::runtime_error);
}
-TEST_F(BCKernelManagerTest_BCsNotSpecified, pressureBoundaryConditionPre_NotSpecified)
+TEST_F(BCKernelManagerTest_BCsNotSpecified, pressureBoundaryConditionPreNotSpecified_noBoundaryNodes_doesNotThrow)
+{
+ para->getParD(0)->pressureBC.numberOfBCnodes = 0;
+ EXPECT_NO_THROW(BCKernelManager(para, &bcFactory));
+}
+
+TEST_F(BCKernelManagerTest_BCsNotSpecified, pressureBoundaryConditionPreNotSpecified_withBoundaryNodes_throws)
{
para->getParD(0)->pressureBC.numberOfBCnodes = 1;
EXPECT_THROW(BCKernelManager(para, &bcFactory), std::runtime_error);
}
-TEST_F(BCKernelManagerTest_BCsNotSpecified, geometryBoundaryConditionPost_NotSpecified)
+TEST_F(BCKernelManagerTest_BCsNotSpecified, geometryBoundaryConditionPostNotSpecified_noBoundaryNodes_doesNotThrow)
+{
+ para->getParD(0)->geometryBC.numberOfBCnodes = 0;
+ EXPECT_NO_THROW(BCKernelManager(para, &bcFactory));
+}
+
+TEST_F(BCKernelManagerTest_BCsNotSpecified, geometryBoundaryConditionPostNotSpecified_withBoundaryNodes_doesNotThrow)
{
para->getParD(0)->geometryBC.numberOfBCnodes = 1;
EXPECT_NO_THROW(BCKernelManager(para, &bcFactory)); // no throw, as a default is specified
}
-TEST_F(BCKernelManagerTest_BCsNotSpecified, stressBoundaryConditionPost_NotSpecified)
+TEST_F(BCKernelManagerTest_BCsNotSpecified, stressBoundaryConditionPostNotSpecified_noBoundaryNodes_doesNotThrow)
+{
+ para->getParD(0)->stressBC.numberOfBCnodes = 0;
+ EXPECT_NO_THROW(BCKernelManager(para, &bcFactory));
+}
+
+TEST_F(BCKernelManagerTest_BCsNotSpecified, stressBoundaryConditionPostNotSpecified_withBoundaryNodes_throws)
{
para->getParD(0)->stressBC.numberOfBCnodes = 1;
EXPECT_THROW(BCKernelManager(para, &bcFactory), std::runtime_error);
}
-TEST_F(BCKernelManagerTest_BCsNotSpecified, precursorBoundaryConditionPost_NotSpecified)
+TEST_F(BCKernelManagerTest_BCsNotSpecified, precursorBoundaryConditionPostNotSpecified_noBoundaryNodes_doesNotThrow)
+{
+ para->getParD(0)->precursorBC.numberOfBCnodes = 0;
+ EXPECT_NO_THROW(BCKernelManager(para, &bcFactory));
+}
+
+TEST_F(BCKernelManagerTest_BCsNotSpecified, precursorBoundaryConditionPostNotSpecified_withBoundaryNodes_throws)
{
para->getParD(0)->precursorBC.numberOfBCnodes = 1;
EXPECT_THROW(BCKernelManager(para, &bcFactory), std::runtime_error);
}
+
+class BoundaryConditionFactoryMock : public BoundaryConditionFactory
+{
+public:
+ mutable uint numberOfCalls = 0;
+
+ [[nodiscard]] boundaryCondition getVelocityBoundaryConditionPost(bool) const override
+ {
+ return [this](LBMSimulationParameter *, QforBoundaryConditions *) { numberOfCalls++; };
+ }
+};
+
+class BCKernelManagerTest_runBCs : public testing::Test
+{
+protected:
+ BoundaryConditionFactoryMock bcFactory;
+ SPtr<Parameter> para = std::make_shared<Parameter>();
+ UPtr<BCKernelManager> sut;
+
+ void SetUp() override
+ {
+ para->initLBMSimulationParameter();
+ sut = std::make_unique<BCKernelManager>(para, &bcFactory);
+ }
+};
+
+TEST_F(BCKernelManagerTest_runBCs, runVelocityBCKernelPost)
+{
+ para->getParD(0)->velocityBC.numberOfBCnodes = 1;
+ sut->runVelocityBCKernelPost(0);
+ EXPECT_THAT(bcFactory.numberOfCalls, testing::Eq(1));
+
+ bcFactory.numberOfCalls = 0;
+ para->getParD(0)->velocityBC.numberOfBCnodes = 0;
+ sut->runVelocityBCKernelPost(0);
+ EXPECT_THAT(bcFactory.numberOfCalls, testing::Eq(0));
+}
diff --git a/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManagerTest.cpp b/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManagerTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b86e167ca8d2f95897b1a87d4b850acbfbe8a1b3
--- /dev/null
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManagerTest.cpp
@@ -0,0 +1,81 @@
+#include <gmock/gmock.h>
+#include <stdexcept>
+
+#include "GridScalingKernelManager.h"
+#include "Factories/GridScalingFactory.h"
+#include "Parameter/Parameter.h"
+#include "PointerDefinitions.h"
+
+class GridScalingKernelManagerTest_Initialization : public testing::Test
+{
+protected:
+ GridScalingFactory scalingFactory;
+ SPtr<Parameter> para = std::make_shared<Parameter>();
+
+ void SetUp() override
+ {
+ para->setGridX({2, 8});
+ para->setGridY({2, 8});
+ para->setGridZ({2, 8});
+ para->setDistX({0, 0});
+ para->setDistY({0, 0});
+ para->setDistZ({0, 0});
+ }
+};
+
+TEST_F(GridScalingKernelManagerTest_Initialization, singleLevel_noScalingFactoryProvided_doesNotThrow)
+{
+ // only one level --> no scaling factory needed --> no error
+ para->initLBMSimulationParameter();
+ EXPECT_NO_THROW(GridScalingKernelManager(para, nullptr));
+}
+
+TEST_F(GridScalingKernelManagerTest_Initialization, singleLevel_scalingFactoryProvided_doesNotThrow)
+{
+ // only one level --> no scaling function needed --> no error
+ para->initLBMSimulationParameter();
+ EXPECT_NO_THROW(GridScalingKernelManager(para, &scalingFactory));
+}
+
+TEST_F(GridScalingKernelManagerTest_Initialization, singleLevel_scalingFactoryAndFunctionProvided_doesNotThrow)
+{
+ // only one level, but the user provided a scaling function anyway --> no error
+ para->initLBMSimulationParameter();
+ scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
+ EXPECT_NO_THROW(GridScalingKernelManager(para, &scalingFactory));
+}
+
+TEST_F(GridScalingKernelManagerTest_Initialization, multipleLevels_notScalingFactoryProvided_throws)
+{
+ // multiple levels, but the user forgot the scaling factory --> error
+ para->setMaxLevel(2);
+ para->initLBMSimulationParameter();
+ EXPECT_THROW(GridScalingKernelManager(para, nullptr), std::runtime_error);
+}
+
+TEST_F(GridScalingKernelManagerTest_Initialization, multipleLevelWithoutInterpolationNodes_noScalingFunctionProvided_doesNotThrow)
+{
+ // multiple levels, but no interpolation nodes specified --> no scaling function needed --> no error
+ para->setMaxLevel(2);
+ para->initLBMSimulationParameter();
+ EXPECT_NO_THROW(GridScalingKernelManager(para, &scalingFactory));
+}
+
+TEST_F(GridScalingKernelManagerTest_Initialization, multipleLevelWithoutInterpolationNodes_scalingFunctionProvided_doesNotThrow)
+{
+ // multiple levels and NO interpolation nodes specified, but the user provided a scaling function anyway --> no error
+ para->setMaxLevel(2);
+ para->initLBMSimulationParameter();
+ scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleRhoSq);
+ EXPECT_NO_THROW(GridScalingKernelManager(para, &scalingFactory));
+}
+
+TEST_F(GridScalingKernelManagerTest_Initialization, multipleLevelWithInterpolationNodes_noScalingFunctionProvided_throws)
+{
+ // multiple levels and interpolation nodes specified, but the user forgot to set the scalingFunction --> error
+ para->setMaxLevel(2);
+ para->initLBMSimulationParameter();
+ para->getParD(0)->fineToCoarse.numberOfCells = 100;
+ EXPECT_THROW(GridScalingKernelManager(para, &scalingFactory), std::runtime_error);
+}
+
diff --git a/src/gpu/VirtualFluids_GPU/LBM/GPUHelperFunctions/KernelUtilities.h b/src/gpu/VirtualFluids_GPU/LBM/GPUHelperFunctions/KernelUtilities.h
index 5541bc54597ea02c5e3e89d00169b6eb6ff6564b..ebd1b8ab367b31c62fc1608b39215622819d35d9 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/GPUHelperFunctions/KernelUtilities.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/GPUHelperFunctions/KernelUtilities.h
@@ -34,8 +34,11 @@
#define KERNEL_UTILITIES_H
#include "LBM/LB.h"
-#include "lbm/constants/D3Q27.h"
-#include "basics/constants/NumericConstants.h"
+
+#include <cassert>
+
+#include <lbm/constants/D3Q27.h>
+#include <basics/constants/NumericConstants.h>
using namespace vf::basics::constant;
using namespace vf::lbm::dir;
@@ -201,6 +204,125 @@ __inline__ __device__ bool isValidFluidNode(uint nodeType)
}
+struct ListIndices
+{
+ __device__ ListIndices() {}
+ __device__ ListIndices(unsigned int k, unsigned int* neighborX, unsigned int* neighborY, unsigned int* neighborZ)
+ {
+ k_000 = k;
+ k_M00 = neighborX[k_000];
+ k_0M0 = neighborY[k_000];
+ k_00M = neighborZ[k_000];
+ k_MM0 = neighborY[k_M00];
+ k_M0M = neighborZ[k_M00];
+ k_0MM = neighborZ[k_0M0];
+ k_MMM = neighborZ[k_MM0];
+ }
+
+ unsigned int k_000 { 0 };
+ unsigned int k_M00 { 0 };
+ unsigned int k_0M0 { 0 };
+ unsigned int k_00M { 0 };
+ unsigned int k_MM0 { 0 };
+ unsigned int k_M0M { 0 };
+ unsigned int k_0MM { 0 };
+ unsigned int k_MMM { 0 };
+};
+
+
+////////////////////////////////////////////////////////////////////////////////////
+//! - Read distributions: style of reading and writing the distributions from/to
+//! stored arrays dependent on timestep is based on the esoteric twist algorithm
+//! <a href="https://doi.org/10.3390/computation5020019"><b>[ M. Geier et al. (2017),
+//! DOI:10.3390/computation5020019 ]</b></a>
+__device__ __inline__ void read(real *f, const Distributions27 &dist, const ListIndices &indices)
+{
+ f[DIR_000] = (dist.f[DIR_000])[indices.k_000];
+ f[DIR_P00] = (dist.f[DIR_P00])[indices.k_000];
+ f[DIR_M00] = (dist.f[DIR_M00])[indices.k_M00];
+ f[DIR_0P0] = (dist.f[DIR_0P0])[indices.k_000];
+ f[DIR_0M0] = (dist.f[DIR_0M0])[indices.k_0M0];
+ f[DIR_00P] = (dist.f[DIR_00P])[indices.k_000];
+ f[DIR_00M] = (dist.f[DIR_00M])[indices.k_00M];
+ f[DIR_PP0] = (dist.f[DIR_PP0])[indices.k_000];
+ f[DIR_MM0] = (dist.f[DIR_MM0])[indices.k_MM0];
+ f[DIR_PM0] = (dist.f[DIR_PM0])[indices.k_0M0];
+ f[DIR_MP0] = (dist.f[DIR_MP0])[indices.k_M00];
+ f[DIR_P0P] = (dist.f[DIR_P0P])[indices.k_000];
+ f[DIR_M0M] = (dist.f[DIR_M0M])[indices.k_M0M];
+ f[DIR_P0M] = (dist.f[DIR_P0M])[indices.k_00M];
+ f[DIR_M0P] = (dist.f[DIR_M0P])[indices.k_M00];
+ f[DIR_0PP] = (dist.f[DIR_0PP])[indices.k_000];
+ f[DIR_0MM] = (dist.f[DIR_0MM])[indices.k_0MM];
+ f[DIR_0PM] = (dist.f[DIR_0PM])[indices.k_00M];
+ f[DIR_0MP] = (dist.f[DIR_0MP])[indices.k_0M0];
+ f[DIR_PPP] = (dist.f[DIR_PPP])[indices.k_000];
+ f[DIR_MPP] = (dist.f[DIR_MPP])[indices.k_M00];
+ f[DIR_PMP] = (dist.f[DIR_PMP])[indices.k_0M0];
+ f[DIR_MMP] = (dist.f[DIR_MMP])[indices.k_MM0];
+ f[DIR_PPM] = (dist.f[DIR_PPM])[indices.k_00M];
+ f[DIR_MPM] = (dist.f[DIR_MPM])[indices.k_M0M];
+ f[DIR_PMM] = (dist.f[DIR_PMM])[indices.k_0MM];
+ f[DIR_MMM] = (dist.f[DIR_MMM])[indices.k_MMM];
+}
+
+__device__ __inline__ void readInverse(real *f, const Distributions27 &dist, const ListIndices &indices)
+{
+ //TODO: https://git.rz.tu-bs.de/irmb/VirtualFluids_dev/-/issues/101
+ assert((false) || !fprintf(stderr, "Not implemented yet.\n"));
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+//! - Write distributions: style of reading and writing the distributions from/to
+//! stored arrays dependent on timestep is based on the esoteric twist algorithm
+//! <a href="https://doi.org/10.3390/computation5020019"><b>[ M. Geier et al. (2017),
+//! DOI:10.3390/computation5020019 ]</b></a>
+__inline__ __device__ void write(Distributions27 &destination, const ListIndices &indices, const real* f)
+{
+ (destination.f[DIR_000])[indices.k_000] = f[DIR_000];
+ (destination.f[DIR_P00])[indices.k_000] = f[DIR_P00];
+ (destination.f[DIR_M00])[indices.k_M00] = f[DIR_M00];
+ (destination.f[DIR_0P0])[indices.k_000] = f[DIR_0P0];
+ (destination.f[DIR_0M0])[indices.k_0M0] = f[DIR_0M0];
+ (destination.f[DIR_00P])[indices.k_000] = f[DIR_00P];
+ (destination.f[DIR_00M])[indices.k_00M] = f[DIR_00M];
+ (destination.f[DIR_PP0])[indices.k_000] = f[DIR_PP0];
+ (destination.f[DIR_MM0])[indices.k_MM0] = f[DIR_MM0];
+ (destination.f[DIR_PM0])[indices.k_0M0] = f[DIR_PM0];
+ (destination.f[DIR_MP0])[indices.k_M00] = f[DIR_MP0];
+ (destination.f[DIR_P0P])[indices.k_000] = f[DIR_P0P];
+ (destination.f[DIR_M0M])[indices.k_M0M] = f[DIR_M0M];
+ (destination.f[DIR_P0M])[indices.k_00M] = f[DIR_P0M];
+ (destination.f[DIR_M0P])[indices.k_M00] = f[DIR_M0P];
+ (destination.f[DIR_0PP])[indices.k_000] = f[DIR_0PP];
+ (destination.f[DIR_0MM])[indices.k_0MM] = f[DIR_0MM];
+ (destination.f[DIR_0PM])[indices.k_00M] = f[DIR_0PM];
+ (destination.f[DIR_0MP])[indices.k_0M0] = f[DIR_0MP];
+ (destination.f[DIR_PPP])[indices.k_000] = f[DIR_PPP];
+ (destination.f[DIR_MPP])[indices.k_M00] = f[DIR_MPP];
+ (destination.f[DIR_PMP])[indices.k_0M0] = f[DIR_PMP];
+ (destination.f[DIR_MMP])[indices.k_MM0] = f[DIR_MMP];
+ (destination.f[DIR_PPM])[indices.k_00M] = f[DIR_PPM];
+ (destination.f[DIR_MPM])[indices.k_M0M] = f[DIR_MPM];
+ (destination.f[DIR_PMM])[indices.k_0MM] = f[DIR_PMM];
+ (destination.f[DIR_MMM])[indices.k_MMM] = f[DIR_MMM];
+}
+
+__inline__ __device__ void writeInverse(Distributions27 &destination, const ListIndices &indices, const real* f)
+{
+ //TODO: https://git.rz.tu-bs.de/irmb/VirtualFluids_dev/-/issues/101
+ assert((false) || !fprintf(stderr, "Not implemented yet.\n"));
+}
+
+
+
+
+__inline__ __device__ real calculateOmega(const real omega_old, real turbulenceViscosity)
+{
+ return omega_old / (c1o1 + c3o1 * omega_old * turbulenceViscosity);
+}
+
}
#endif
diff --git a/src/gpu/VirtualFluids_GPU/LBM/GPUHelperFunctions/ScalingUtilities.h b/src/gpu/VirtualFluids_GPU/LBM/GPUHelperFunctions/ScalingUtilities.h
index a7c1390c728df1d0ca83424fb7f9f4fb09faba65..606f6b38b4f50ebc621cce23f05c2d54091934f9 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/GPUHelperFunctions/ScalingUtilities.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/GPUHelperFunctions/ScalingUtilities.h
@@ -33,9 +33,15 @@
#ifndef SCALING_HELPER_FUNCTIONS_H
#define SCALING_HELPER_FUNCTIONS_H
-#include "LBM/LB.h"
-#include "lbm/constants/D3Q27.h"
-#include "basics/constants/NumericConstants.h"
+#include "LBM/GPUHelperFunctions/KernelUtilities.h"
+
+#include <basics/constants/NumericConstants.h>
+
+#include <lbm/constants/D3Q27.h>
+#include <lbm/KernelParameter.h>
+#include <basics/DataTypes.h>
+
+#include <lbm/refinement/Coefficients.h>
using namespace vf::basics::constant;
using namespace vf::lbm::dir;
@@ -43,94 +49,196 @@ using namespace vf::lbm::dir;
namespace vf::gpu
{
-__device__ __inline__ void calculateMomentsOnSourceNodes(Distributions27 &dist, real &omega, unsigned int &k_000,
- unsigned int &k_M00, unsigned int &k_0M0, unsigned int &k_00M,
- unsigned int &k_MM0, unsigned int &k_M0M, unsigned int &k_0MM,
- unsigned int &k_MMM, real &drho, real &velocityX,
- real &velocityY, real &velocityZ, real &kxyFromfcNEQ,
- real &kyzFromfcNEQ, real &kxzFromfcNEQ, real &kxxMyyFromfcNEQ,
- real &kxxMzzFromfcNEQ)
+template<bool hasTurbulentViscosity> __device__ void calculateMomentSet(
+ vf::lbm::MomentsOnSourceNodeSet& momentsSet,
+ const unsigned nodeIndex,
+ real *distribution,
+ unsigned int *neighborX,
+ unsigned int *neighborY,
+ unsigned int *neighborZ,
+ unsigned int *indices_MMM,
+ real* turbulentViscosity,
+ unsigned long long numberOfLBnodes,
+ const real omega,
+ bool isEvenTimestep
+)
{
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Set local distributions (f's) on source nodes:
- //!
- real f_000 = (dist.f[DIR_000])[k_000];
- real f_P00 = (dist.f[DIR_P00])[k_000];
- real f_M00 = (dist.f[DIR_M00])[k_M00];
- real f_0P0 = (dist.f[DIR_0P0])[k_000];
- real f_0M0 = (dist.f[DIR_0M0])[k_0M0];
- real f_00P = (dist.f[DIR_00P])[k_000];
- real f_00M = (dist.f[DIR_00M])[k_00M];
- real f_PP0 = (dist.f[DIR_PP0])[k_000];
- real f_MM0 = (dist.f[DIR_MM0])[k_MM0];
- real f_PM0 = (dist.f[DIR_PM0])[k_0M0];
- real f_MP0 = (dist.f[DIR_MP0])[k_M00];
- real f_P0P = (dist.f[DIR_P0P])[k_000];
- real f_M0M = (dist.f[DIR_M0M])[k_M0M];
- real f_P0M = (dist.f[DIR_P0M])[k_00M];
- real f_M0P = (dist.f[DIR_M0P])[k_M00];
- real f_0PP = (dist.f[DIR_0PP])[k_000];
- real f_0MM = (dist.f[DIR_0MM])[k_0MM];
- real f_0PM = (dist.f[DIR_0PM])[k_00M];
- real f_0MP = (dist.f[DIR_0MP])[k_0M0];
- real f_PPP = (dist.f[DIR_PPP])[k_000];
- real f_MPP = (dist.f[DIR_MPP])[k_M00];
- real f_PMP = (dist.f[DIR_PMP])[k_0M0];
- real f_MMP = (dist.f[DIR_MMP])[k_MM0];
- real f_PPM = (dist.f[DIR_PPM])[k_00M];
- real f_MPM = (dist.f[DIR_MPM])[k_M0M];
- real f_PMM = (dist.f[DIR_PMM])[k_0MM];
- real f_MMM = (dist.f[DIR_MMM])[k_MMM];
-
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Calculate density and velocity using pyramid summation for low round-off errors as in Eq. (J1)-(J3) \ref
- //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015),
- //! DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
- //!
- drho = ((((f_PPP + f_MMM) + (f_MPM + f_PMP)) + ((f_MPP + f_PMM) + (f_MMP + f_PPM))) +
- (((f_0MP + f_0PM) + (f_0MM + f_0PP)) + ((f_M0P + f_P0M) + (f_M0M + f_P0P)) +
- ((f_MP0 + f_PM0) + (f_MM0 + f_PP0))) +
- ((f_M00 + f_P00) + (f_0M0 + f_0P0) + (f_00M + f_00P))) +
- f_000;
-
- real oneOverRho = c1o1 / (c1o1 + drho);
-
- velocityX = ((((f_PPP - f_MMM) + (f_PMP - f_MPM)) + ((f_PMM - f_MPP) + (f_PPM - f_MMP))) +
- (((f_P0M - f_M0P) + (f_P0P - f_M0M)) + ((f_PM0 - f_MP0) + (f_PP0 - f_MM0))) + (f_P00 - f_M00)) *
- oneOverRho;
- velocityY = ((((f_PPP - f_MMM) + (f_MPM - f_PMP)) + ((f_MPP - f_PMM) + (f_PPM - f_MMP))) +
- (((f_0PM - f_0MP) + (f_0PP - f_0MM)) + ((f_MP0 - f_PM0) + (f_PP0 - f_MM0))) + (f_0P0 - f_0M0)) *
- oneOverRho;
- velocityZ = ((((f_PPP - f_MMM) + (f_PMP - f_MPM)) + ((f_MPP - f_PMM) + (f_MMP - f_PPM))) +
- (((f_0MP - f_0PM) + (f_0PP - f_0MM)) + ((f_M0P - f_P0M) + (f_P0P - f_M0M))) + (f_00P - f_00M)) *
- oneOverRho;
-
- ////////////////////////////////////////////////////////////////////////////////////
- //! - Calculate second order moments for interpolation
+ real omega_ = omega;
+ Distributions27 distFine;
+ getPointersToDistributions(distFine, distribution, numberOfLBnodes, isEvenTimestep);
+
+ ListIndices indices;
+
+ //////////////////////////////////////////////////////////////////////////
+ //! - Calculate moments for each source node
//!
- // example: kxxMzz: moment, second derivative in x direction minus the second derivative in z direction
- kxyFromfcNEQ = -c3o1 * omega *
- ((f_MM0 + f_MMM + f_MMP - f_MP0 - f_MPM - f_MPP - f_PM0 - f_PMM - f_PMP + f_PP0 + f_PPM + f_PPP) /
- (c1o1 + drho) -
- ((velocityX * velocityY)));
- kyzFromfcNEQ = -c3o1 * omega *
- ((f_0MM + f_PMM + f_MMM - f_0MP - f_PMP - f_MMP - f_0PM - f_PPM - f_MPM + f_0PP + f_PPP + f_MPP) /
- (c1o1 + drho) -
- ((velocityY * velocityZ)));
- kxzFromfcNEQ = -c3o1 * omega *
- ((f_M0M + f_MMM + f_MPM - f_M0P - f_MMP - f_MPP - f_P0M - f_PMM - f_PPM + f_P0P + f_PMP + f_PPP) /
- (c1o1 + drho) -
- ((velocityX * velocityZ)));
- kxxMyyFromfcNEQ = -c3o2 * omega *
- ((f_M0M + f_M00 + f_M0P - f_0MM - f_0M0 - f_0MP - f_0PM - f_0P0 - f_0PP + f_P0M + f_P00 + f_P0P) /
- (c1o1 + drho) -
- ((velocityX * velocityX - velocityY * velocityY)));
- kxxMzzFromfcNEQ = -c3o2 * omega *
- ((f_MM0 + f_M00 + f_MP0 - f_0MM - f_0MP - f_00M - f_00P - f_0PM - f_0PP + f_PM0 + f_P00 + f_PP0) /
- (c1o1 + drho) -
- ((velocityX * velocityX - velocityZ * velocityZ)));
+ //////////////////////////////////////////////////////////////////////////
+ // source node BSW = MMM
+ //////////////////////////////////////////////////////////////////////////
+ // index of the base node and its neighbors
+ unsigned int k_base_000 = indices_MMM[nodeIndex];
+ unsigned int k_base_M00 = neighborX [k_base_000];
+ unsigned int k_base_0M0 = neighborY [k_base_000];
+ unsigned int k_base_00M = neighborZ [k_base_000];
+ unsigned int k_base_MM0 = neighborY [k_base_M00];
+ unsigned int k_base_M0M = neighborZ [k_base_M00];
+ unsigned int k_base_0MM = neighborZ [k_base_0M0];
+ unsigned int k_base_MMM = neighborZ [k_base_MM0];
+ //////////////////////////////////////////////////////////////////////////
+ // Set neighbor indices
+ indices.k_000 = k_base_000;
+ indices.k_M00 = k_base_M00;
+ indices.k_0M0 = k_base_0M0;
+ indices.k_00M = k_base_00M;
+ indices.k_MM0 = k_base_MM0;
+ indices.k_M0M = k_base_M0M;
+ indices.k_0MM = k_base_0MM;
+ indices.k_MMM = k_base_MMM;
+
+ omega_ = hasTurbulentViscosity ? calculateOmega(omega, turbulentViscosity[indices.k_000]) : omega;
+
+ real f_fine[27];
+
+ read(f_fine, distFine, indices);
+ momentsSet.calculateMMM(f_fine, omega_);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node TSW = MMP
+ //////////////////////////////////////////////////////////////////////////
+ // Set neighbor indices - has to be recalculated for the new source node
+ indices.k_000 = indices.k_00M;
+ indices.k_M00 = indices.k_M0M;
+ indices.k_0M0 = indices.k_0MM;
+ indices.k_00M = neighborZ[indices.k_00M];
+ indices.k_MM0 = indices.k_MMM;
+ indices.k_M0M = neighborZ[indices.k_M0M];
+ indices.k_0MM = neighborZ[indices.k_0MM];
+ indices.k_MMM = neighborZ[indices.k_MMM];
+
+ omega_ = hasTurbulentViscosity ? calculateOmega(omega, turbulentViscosity[indices.k_000]) : omega;
+
+ read(f_fine, distFine, indices);
+ momentsSet.calculateMMP(f_fine, omega_);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node TSE = PMP
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_000 = indices.k_M00;
+ indices.k_M00 = neighborX[indices.k_M00];
+ indices.k_0M0 = indices.k_MM0;
+ indices.k_00M = indices.k_M0M;
+ indices.k_MM0 = neighborX[indices.k_MM0];
+ indices.k_M0M = neighborX[indices.k_M0M];
+ indices.k_0MM = indices.k_MMM;
+ indices.k_MMM = neighborX[indices.k_MMM];
+
+ omega_ = hasTurbulentViscosity ? calculateOmega(omega, turbulentViscosity[indices.k_000]) : omega;
+
+ read(f_fine, distFine, indices);
+ momentsSet.calculatePMP(f_fine, omega_);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node BSE = PMM
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_00M = indices.k_000;
+ indices.k_M0M = indices.k_M00;
+ indices.k_0MM = indices.k_0M0;
+ indices.k_MMM = indices.k_MM0;
+ indices.k_000 = k_base_M00;
+ indices.k_M00 = neighborX[k_base_M00];
+ indices.k_0M0 = k_base_MM0;
+ indices.k_MM0 = neighborX[k_base_MM0];
+
+ omega_ = hasTurbulentViscosity ? calculateOmega(omega, turbulentViscosity[indices.k_000]) : omega;
+
+ read(f_fine, distFine, indices);
+ momentsSet.calculatePMM(f_fine, omega_);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node BNW = MPM
+ //////////////////////////////////////////////////////////////////////////
+ // index of the base node and its neighbors --> indices of all source nodes
+ k_base_000 = k_base_0M0;
+ k_base_M00 = k_base_MM0;
+ k_base_0M0 = neighborY[k_base_0M0];
+ k_base_00M = k_base_0MM;
+ k_base_MM0 = neighborY[k_base_MM0];
+ k_base_M0M = k_base_MMM;
+ k_base_0MM = neighborY[k_base_0MM];
+ k_base_MMM = neighborY[k_base_MMM];
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_000 = k_base_000;
+ indices.k_M00 = k_base_M00;
+ indices.k_0M0 = k_base_0M0;
+ indices.k_00M = k_base_00M;
+ indices.k_MM0 = k_base_MM0;
+ indices.k_M0M = k_base_M0M;
+ indices.k_0MM = k_base_0MM;
+ indices.k_MMM = k_base_MMM;
+
+ omega_ = hasTurbulentViscosity ? calculateOmega(omega, turbulentViscosity[indices.k_000]) : omega;
+
+ read(f_fine, distFine, indices);
+ momentsSet.calculateMPM(f_fine, omega_);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node TNW = MPP
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_000 = indices.k_00M;
+ indices.k_M00 = indices.k_M0M;
+ indices.k_0M0 = indices.k_0MM;
+ indices.k_00M = neighborZ[indices.k_00M];
+ indices.k_MM0 = indices.k_MMM;
+ indices.k_M0M = neighborZ[indices.k_M0M];
+ indices.k_0MM = neighborZ[indices.k_0MM];
+ indices.k_MMM = neighborZ[indices.k_MMM];
+
+ omega_ = hasTurbulentViscosity ? calculateOmega(omega, turbulentViscosity[indices.k_000]) : omega;
+
+ read(f_fine, distFine, indices);
+ momentsSet.calculateMPP(f_fine, omega_);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node TNE = PPP
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_000 = indices.k_M00;
+ indices.k_M00 = neighborX[indices.k_M00];
+ indices.k_0M0 = indices.k_MM0;
+ indices.k_00M = indices.k_M0M;
+ indices.k_MM0 = neighborX[indices.k_MM0];
+ indices.k_M0M = neighborX[indices.k_M0M];
+ indices.k_0MM = indices.k_MMM;
+ indices.k_MMM = neighborX[indices.k_MMM];
+
+ omega_ = hasTurbulentViscosity ? calculateOmega(omega, turbulentViscosity[indices.k_000]) : omega;
+
+ read(f_fine, distFine, indices);
+ momentsSet.calculatePPP(f_fine, omega_);
+
+ //////////////////////////////////////////////////////////////////////////
+ // source node BNE = PPM
+ //////////////////////////////////////////////////////////////////////////
+ // index
+ indices.k_00M = indices.k_000;
+ indices.k_M0M = indices.k_M00;
+ indices.k_0MM = indices.k_0M0;
+ indices.k_MMM = indices.k_MM0;
+ indices.k_000 = k_base_M00;
+ indices.k_M00 = neighborX[k_base_M00];
+ indices.k_0M0 = k_base_MM0;
+ indices.k_MM0 = neighborX[k_base_MM0];
+
+ omega_ = hasTurbulentViscosity ? calculateOmega(omega, turbulentViscosity[indices.k_000]) : omega;
+
+ read(f_fine, distFine, indices);
+ momentsSet.calculatePPM(f_fine, omega_);
}
-} // namespace vf::gpu
+}
#endif
diff --git a/src/gpu/VirtualFluids_GPU/LBM/LB.h b/src/gpu/VirtualFluids_GPU/LBM/LB.h
index a5ae5f5ceef213e8ec9b2306106035a09b1ffd0d..5da2a2a82c59d9a70e26849d4ee413b7c6e8f1d3 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/LB.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/LB.h
@@ -107,47 +107,59 @@ constexpr std::initializer_list<CollisionTemplate> bulk_CollisionTemplate = { Co
//Interface Cells
// example of old names (pre 2023) ICellCFC: interpolation from Coarse (C) to Fine (F), indices of the Coarse cells (C)
-typedef struct ICells{
+struct ICells
+{
uint* fineCellIndices;
uint* coarseCellIndices;
uint numberOfCells;
-} InterpolationCells;
+};
+
+using InterpolationCells = ICells;
//! \brief stores location of neighboring cell (necessary for refinement into the wall)
-typedef struct ICellNeigh{
+struct ICellNeigh
+{
real* x;
real* y;
real* z;
-} InterpolationCellNeighbor;
+};
-// Distribution functions g 6
-typedef struct Distri6 { // ADD IN FUTURE RELEASE
+using InterpolationCellNeighbor = ICellNeigh;
+
+// ADD IN FUTURE RELEASE
+struct Distributions6
+{
real* g[6];
-} Distributions6;
+};
-// Distribution functions f 7
-typedef struct Distri7{ // ADD IN FUTURE RELEASE
+// ADD IN FUTURE RELEASE
+struct Distributions7
+{
real* f[7];
-} Distributions7;
+};
-// Distribution functions f 19
-typedef struct Distri19{ // DEPRECATED
+// DEPRECATED
+struct Distributions19
+{
real* f[19];
-} Distributions19;
+};
-// Distribution functions f 27
-typedef struct Distri27{
+struct Distributions27
+{
real* f[27];
-} Distributions27, DistributionReferences27;
+};
-// Subgrid distances q 27
-typedef struct SubgridDist27{
+using DistributionReferences27 = Distributions27;
+
+struct SubgridDistances27
+{
real* q[27];
-} SubgridDistances27;
+};
//Q for second order BCs
//! \struct to manage sub-grid-distances (q) for second order Boundary Conditions (BCs)
-typedef struct QforBC{
+struct QforBoundaryConditions
+{
int* k;
int* kN;
long long* valueQ;
@@ -160,13 +172,15 @@ typedef struct QforBC{
real *Vx1, *Vy1, *Vz1;
real *deltaVz, *RhoBC;
real *normalX, *normalY, *normalZ;
-}QforBoundaryConditions;
+};
-typedef struct QforPrecursorBC{
+struct QforPrecursorBoundaryConditions
+{
int* k;
int numberOfBCnodes=0;
int sizeQ;
int numberOfPrecursorNodes=0;
+ uint streamIndex=0;
uint nPrecursorReads=0;
uint timeStepsBetweenReads;
size_t numberOfQuantities;
@@ -175,34 +189,38 @@ typedef struct QforPrecursorBC{
real* weights0PP, *weights0PM, *weights0MP, *weights0MM;
real* last, *current, *next;
real velocityX, velocityY, velocityZ;
-}QforPrecursorBoundaryConditions;
+};
-//BCTemp
-typedef struct TempforBC{ // ADD IN FUTURE RELEASE
+// ADD IN FUTURE RELEASE
+struct TempforBoundaryConditions
+{
int* k;
real* temp;
int kTemp=0;
-}TempforBoundaryConditions;
+};
-//BCTempVel
-typedef struct TempVelforBC{ // ADD IN FUTURE RELEASE
+// ADD IN FUTURE RELEASE
+struct TempVelforBoundaryConditions
+{
int* k;
real* temp;
real* tempPulse;
real* velo;
int kTemp=0;
-}TempVelforBoundaryConditions;
+};
-//BCTempPress
-typedef struct TempPressforBC{ // ADD IN FUTURE RELEASE
+// ADD IN FUTURE RELEASE
+struct TempPressforBoundaryConditions
+{
int* k;
real* temp;
real* velo;
int kTemp=0;
-}TempPressforBoundaryConditions;
+};
// Settings for wall model used in StressBC
-typedef struct WMparas{
+struct WallModelParameters
+{
real* z0;
int* samplingOffset;
bool hasMonitor;
@@ -210,11 +228,12 @@ typedef struct WMparas{
real* Fx;
real* Fy;
real* Fz;
-}WallModelParameters;
+};
-//measurePoints
-typedef struct MeasP{ // ADD IN FUTURE RELEASE
+// ADD IN FUTURE RELEASE
+struct MeasurePoints
+{
std::string name;
uint k;
std::vector<real> Vx;
@@ -225,10 +244,11 @@ typedef struct MeasP{ // ADD IN FUTURE RELEASE
//real* Vy;
//real* Vz;
//real* Rho;
-}MeasurePoints;
+};
+
-//Process Neighbors
-typedef struct PN27{
+struct ProcessNeighbor27
+{
real* f[27];
uint memsizeFs;
int* index;
@@ -236,9 +256,11 @@ typedef struct PN27{
uint rankNeighbor;
int numberOfNodes;
int numberOfFs;
-}ProcessNeighbor27;
+};
-typedef struct PN_F3 { // ADD IN FUTURE RELEASE
+// ADD IN FUTURE RELEASE
+struct ProcessNeighborF3
+{
real* g[6];
uint memsizeGs;
int* index;
@@ -246,10 +268,11 @@ typedef struct PN_F3 { // ADD IN FUTURE RELEASE
uint rankNeighbor;
int numberOfNodes;
int numberOfGs;
-}ProcessNeighborF3;
+};
-//path line particles // DEPRECATED
-typedef struct PLP{
+// DEPRECATED
+struct PathLineParticles
+{
bool *stuck, *hot;
real *coordXabsolut, *coordYabsolut, *coordZabsolut;
real *coordXlocal, *coordYlocal, *coordZlocal;
@@ -260,13 +283,12 @@ typedef struct PLP{
uint *cellBaseID;
uint numberOfParticles, numberOfTimestepsParticles;
uint memSizeID, memSizeTimestep, memSizerealAll, memSizereal, memSizeBool, memSizeBoolBC;
-}PathLineParticles;
+};
//////////////////////////////////////////////////////////////////////////
// DEPRECATED
-inline int vectorPosition(int i, int j, int k, int Lx, int Ly )
+inline int vectorPosition(int i, int j, int k, int Lx, int Ly)
{
- //return((j+15)*(Lx+2*16)+(i+15));
return((Lx+2*STARTOFFX)*((Ly+2*STARTOFFY)*(k+STARTOFFZ)+(j+STARTOFFY))+(i+STARTOFFX));
}
//////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index 55c0250223901a94d03bd1e65bbb72438bcc99c3..dddc795ccda96b49a03373c05a701f32662e9565 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -139,9 +139,8 @@ void Simulation::init(GridProvider &gridProvider, BoundaryConditionFactory *bcFa
//////////////////////////////////////////////////////////////////////////
// CUDA streams
if (para->getUseStreams()) {
- para->getStreamManager()->registerStream(CudaStreamIndex::SubDomainBorder);
- para->getStreamManager()->registerStream(CudaStreamIndex::Bulk);
- para->getStreamManager()->launchStreams();
+ para->getStreamManager()->registerAndLaunchStream(CudaStreamIndex::SubDomainBorder);
+ para->getStreamManager()->registerAndLaunchStream(CudaStreamIndex::Bulk);
para->getStreamManager()->createCudaEvents();
}
//////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/Output/EdgeNodeDebugWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/EdgeNodeDebugWriter.hpp
index fb0423de958e16727eca8e5a40af2c3e32faf1ae..ee5333dfc130ac7dfdf7ab8c4de812a2916777fa 100644
--- a/src/gpu/VirtualFluids_GPU/Output/EdgeNodeDebugWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/EdgeNodeDebugWriter.hpp
@@ -13,7 +13,7 @@
#include <basics/writer/WbWriterVtkXmlBinary.h>
#include <cmath>
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
namespace EdgeNodeDebugWriter
{
@@ -54,7 +54,7 @@ void writeEdgeNodesXZ_Send(SPtr<Parameter> para)
nodeCount++;
}
std::string filenameVec = para->getFName() + "_writeEdgeNodesXZ_Send_PID_" +
- std::to_string(vf::gpu::Communicator::getInstance().getPID()) + "_" +
+ std::to_string(vf::gpu::MpiCommunicator::getInstance().getPID()) + "_" +
StringUtil::toString<int>(level);
WbWriterVtkXmlBinary::getInstance()->writeNodesWithNodeData(filenameVec, nodesVec, datanames, nodedata);
@@ -90,7 +90,7 @@ void writeEdgeNodesXZ_Recv(SPtr<Parameter> para)
nodeCount++;
}
std::string filenameVec = para->getFName() + "_writeEdgeNodesXZ_Recv_PID_" +
- std::to_string(vf::gpu::Communicator::getInstance().getPID()) + "_" +
+ std::to_string(vf::gpu::MpiCommunicator::getInstance().getPID()) + "_" +
StringUtil::toString<int>(level);
WbWriterVtkXmlBinary::getInstance()->writeNodesWithNodeData(filenameVec, nodesVec, datanames, nodedata);
diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
index cb8cefa389c141b7f38bbc54a68d8cf9841ba699..e28c802429c1703314c59402e2d4d490388b8ce1 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
@@ -8,7 +8,7 @@
#include "FileWriter.h"
#include <logger/Logger.h>
-#include <stdio.h>
+#include <cstdio>
#include <fstream>
#include <sstream>
#include <cmath>
@@ -23,6 +23,37 @@
#include <basics/writer/WbWriterVtkXmlBinary.h>
+std::string makePartFileNameEnding(int level, int ID, int part, int timestep)
+{
+ return "_lev_" + StringUtil::toString<int>(level) + "_ID_" + StringUtil::toString<int>(ID) + "_Part_" + StringUtil::toString<int>(part) + "_t_" + StringUtil::toString<int>(timestep) + ".vtk";
+}
+
+std::string makeCollectionFileNameEnding(int ID, int timestep)
+{
+ return "_ID_" + StringUtil::toString<int>(ID) + "_t_" + StringUtil::toString<int>(timestep) + ".vtk";
+}
+
+std::string makePartFileName(const std::string &prefix, int level, int ID, int part, int timestep)
+{
+ return prefix + "_bin" + makePartFileNameEnding(level, ID, part, timestep);
+}
+
+std::string makeMedianPartFileName(const std::string &prefix, int level, int ID, int part, int timestep)
+{
+ return prefix + "_bin_median" + makePartFileNameEnding(level, ID, part, timestep);
+}
+
+
+std::string makeCollectionFileName(const std::string &prefix, int ID, int timestep)
+{
+ return prefix + "_bin" + makeCollectionFileNameEnding(ID, timestep);
+}
+
+std::string makeMedianCollectionFileName(const std::string &prefix, int ID, int timestep)
+{
+ return prefix + "_bin_median" + makeCollectionFileNameEnding(ID, timestep);
+}
+
void FileWriter::writeInit(std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager)
{
unsigned int timestep = para->getTimestepInit();
@@ -50,30 +81,29 @@ void FileWriter::writeTimestep(std::shared_ptr<Parameter> para, unsigned int tim
void FileWriter::writeTimestep(std::shared_ptr<Parameter> para, unsigned int timestep, int level)
{
- const unsigned int numberOfParts = (uint)para->getParH(level)->numberOfNodes / para->getlimitOfNodesForVTK() + 1;
- std::vector<std::string> fname;
- std::vector<std::string> fnameMed;
+ const unsigned int numberOfParts = (uint)para->getParH(level)->numberOfNodes / para->getLimitOfNodesForVTK() + 1;
+ std::vector<std::string> fnames;
+ std::vector<std::string> fnamesMed;
for (unsigned int i = 1; i <= numberOfParts; i++)
{
- fname.push_back(para->getFName() + "_bin_lev_" + StringUtil::toString<int>(level) + "_ID_" + StringUtil::toString<int>(para->getMyProcessID()) + "_Part_" + StringUtil::toString<int>(i) + "_t_" + StringUtil::toString<int>(timestep) + ".vtk");
- fnameMed.push_back(para->getFName() + "_bin_median_lev_" + StringUtil::toString<int>(level) + "_ID_" + StringUtil::toString<int>(para->getMyProcessID()) + "_Part_" + StringUtil::toString<int>(i) + "_t_" + StringUtil::toString<int>(timestep) + ".vtk");
+ std::string fname = makePartFileName(para->getFName(), level, para->getMyProcessID(), i, timestep);
+ std::string fnameMed = makeMedianPartFileName(para->getFName(), level, para->getMyProcessID(), i, timestep);
- this->fileNamesForCollectionFile.push_back( fname.back() );
- this->fileNamesForCollectionFileMedian.push_back( fnameMed.back() );
+ fnames.push_back(fname);
+ fnamesMed.push_back(fnameMed);
}
- if (para->getDiffOn() == true)
- writeUnstrucuredGridLTConc(para, level, fname);
- else
- writeUnstrucuredGridLT(para, level, fname);
+ std::vector<std::string> fnamesLong = writeUnstructuredGridLT(para, level, fnames);
+ for(auto fname : fnamesLong)
+ this->fileNamesForCollectionFile.push_back(fname.substr( fname.find_last_of('/') + 1 ));
+
if (para->getCalcMedian())
{
- if (para->getDiffOn() == true)
- writeUnstrucuredGridMedianLTConc(para, level, fnameMed);
- else
- writeUnstrucuredGridMedianLT(para, level, fnameMed);
+ std::vector<std::string> fnamesMedianLong = writeUnstructuredGridMedianLT(para, level, fnamesMed);
+ for(auto fname : fnamesMedianLong)
+ this->fileNamesForCollectionFileMedian.push_back(fname.substr( fname.find_last_of('/') + 1 ));
}
}
@@ -84,194 +114,169 @@ bool FileWriter::isPeriodicCell(std::shared_ptr<Parameter> para, int level, unsi
(para->getParH(level)->coordinateZ[number5] < para->getParH(level)->coordinateZ[number1]);
}
-void VIRTUALFLUIDS_GPU_EXPORT FileWriter::writeCollectionFile(std::shared_ptr<Parameter> para, unsigned int timestep)
+std::vector<std::string> FileWriter::getNodeDataNames(std::shared_ptr<Parameter> para)
{
- std::string filename = para->getFName() + "_bin_ID_" + StringUtil::toString<int>(para->getMyProcessID()) + "_t_" + StringUtil::toString<int>(timestep) + ".vtk";
-
- std::ofstream file;
-
- file.open( filename + ".pvtu" );
-
- //////////////////////////////////////////////////////////////////////////
- file << "<?xml version=\"1.0\"?>" << std::endl;
- file << "<VTKFile type=\"PUnstructuredGrid\" version=\"0.1\" byte_order=\"LittleEndian\">" << std::endl;
- file << " <PUnstructuredGrid GhostLevel=\"1\">" << std::endl;
+ std::vector<std::string> nodeDataNames;
+ nodeDataNames.push_back("press");
+ nodeDataNames.push_back("rho");
+ nodeDataNames.push_back("vx1");
+ nodeDataNames.push_back("vx2");
+ nodeDataNames.push_back("vx3");
+ nodeDataNames.push_back("geo");
- file << " <PPointData>" << std::endl;
- file << " <PDataArray type=\"Float64\" Name=\"press\" /> " << std::endl;
- file << " <PDataArray type=\"Float64\" Name=\"rho\" /> " << std::endl;
- file << " <PDataArray type=\"Float64\" Name=\"vx1\" /> " << std::endl;
- file << " <PDataArray type=\"Float64\" Name=\"vx2\" /> " << std::endl;
- file << " <PDataArray type=\"Float64\" Name=\"vx3\" /> " << std::endl;
- file << " <PDataArray type=\"Float64\" Name=\"geo\" /> " << std::endl;
- if( para->getDiffOn() ) file << " <PDataArray type=\"Float64\" Name=\"conc\" /> " << std::endl;
- file << " </PPointData>" << std::endl;
+ if(para->getDiffOn())
+ nodeDataNames.push_back("conc");
- file << " <PPoints>" << std::endl;
- file << " <PDataArray type=\"Float32\" Name=\"Points\" NumberOfComponents=\"3\"/>" << std::endl;
- file << " </PPoints>" << std::endl;
-
- for( auto& fname : this->fileNamesForCollectionFile )
+ if(para->getIsBodyForce())
{
- const auto filenameWithoutPath=fname.substr( fname.find_last_of('/') + 1 );
- file << " <Piece Source=\"" << filenameWithoutPath << ".bin.vtu\"/>" << std::endl;
+ nodeDataNames.push_back("Fx");
+ nodeDataNames.push_back("Fy");
+ nodeDataNames.push_back("Fz");
}
- file << " </PUnstructuredGrid>" << std::endl;
- file << "</VTKFile>" << std::endl;
+ if(para->getUseTurbulentViscosity())
+ {
+ nodeDataNames.push_back("nut");
+ }
- //////////////////////////////////////////////////////////////////////////
+ if (para->getCalcTurbulenceIntensity()) {
+ nodeDataNames.push_back("vxx");
+ nodeDataNames.push_back("vyy");
+ nodeDataNames.push_back("vzz");
+ nodeDataNames.push_back("vxy");
+ nodeDataNames.push_back("vxz");
+ nodeDataNames.push_back("vyz");
+ }
+ return nodeDataNames;
+}
- file.close();
+std::vector<std::string> FileWriter::getMedianNodeDataNames(std::shared_ptr<Parameter> para)
+{
+ std::vector<std::string> nodeDataNames;
+
+ if(para->getDiffOn())
+ nodeDataNames.push_back("conc");
+ nodeDataNames.push_back("pressMed");
+ nodeDataNames.push_back("rhoMed");
+ nodeDataNames.push_back("vx1Med");
+ nodeDataNames.push_back("vx2Med");
+ nodeDataNames.push_back("vx3Med");
+ nodeDataNames.push_back("geo");
+
+ return nodeDataNames;
+}
+std::string VIRTUALFLUIDS_GPU_EXPORT FileWriter::writeCollectionFile(std::shared_ptr<Parameter> para, unsigned int timestep)
+{
+ std::string filename = makeCollectionFileName(para->getFName(), para->getMyProcessID(), timestep);
+ auto nodeDataNames = this->getNodeDataNames(para);
+ std::vector<std::string> cellDataNames;
+ std::string pFileName= WbWriterVtkXmlBinary::getInstance()->writeParallelFile(filename, this->fileNamesForCollectionFile, nodeDataNames, cellDataNames);
this->fileNamesForCollectionFile.clear();
+ return pFileName;
}
-void VIRTUALFLUIDS_GPU_EXPORT FileWriter::writeCollectionFileMedian(std::shared_ptr<Parameter> para, unsigned int timestep)
+std::string VIRTUALFLUIDS_GPU_EXPORT FileWriter::writeCollectionFileMedian(std::shared_ptr<Parameter> para, unsigned int timestep)
{
-
- std::string filename = para->getFName() + "_bin_median_ID_" + StringUtil::toString<int>(para->getMyProcessID()) + "_t_" + StringUtil::toString<int>(timestep) + ".vtk";
-
- std::ofstream file;
-
- file.open( filename + ".pvtu" );
-
- //////////////////////////////////////////////////////////////////////////
-
- file << "<VTKFile type=\"PUnstructuredGrid\" version=\"1.0\" byte_order=\"LittleEndian\" header_type=\"UInt64\">" << std::endl;
- file << " <PUnstructuredGrid GhostLevel=\"1\">" << std::endl;
-
- file << " <PPointData>" << std::endl;
- if( para->getDiffOn() ) file << " <DataArray type=\"Float32\" Name=\"concMed\" /> " << std::endl;
- file << " <DataArray type=\"Float32\" Name=\"pressMed\" /> " << std::endl;
- file << " <DataArray type=\"Float32\" Name=\"rhoMed\" /> " << std::endl;
- file << " <DataArray type=\"Float32\" Name=\"vx1Med\" /> " << std::endl;
- file << " <DataArray type=\"Float32\" Name=\"vx2Med\" /> " << std::endl;
- file << " <DataArray type=\"Float32\" Name=\"vx3Med\" /> " << std::endl;
- file << " <DataArray type=\"Float32\" Name=\"geo\" /> " << std::endl;
- file << " </PPointData>" << std::endl;
-
- file << " <PPoints>" << std::endl;
- file << " <PDataArray type=\"Float32\" Name=\"Points\" NumberOfComponents=\"3\"/>" << std::endl;
- file << " </PPoints>" << std::endl;
-
- for( auto& fname : this->fileNamesForCollectionFileMedian )
- {
- const auto filenameWithoutPath=fname.substr( fname.find_last_of('/') + 1 );
- file << " <Piece Source=\"" << filenameWithoutPath << ".bin.vtu\"/>" << std::endl;
- }
-
- file << " </PUnstructuredGrid>" << std::endl;
- file << "</VTKFile>" << std::endl;
-
- //////////////////////////////////////////////////////////////////////////
-
- file.close();
-
+ std::string filename = makeMedianCollectionFileName(para->getFName(), para->getMyProcessID(), timestep);
+ std::vector<std::string> nodeDataNames = getMedianNodeDataNames(para);
+ std::vector<std::string> cellDataNames;
+ std::string pFileName = WbWriterVtkXmlBinary::getInstance()->writeParallelFile(filename, this->fileNamesForCollectionFileMedian, nodeDataNames, cellDataNames);
this->fileNamesForCollectionFileMedian.clear();
+ return pFileName;
}
-void FileWriter::writeUnstrucuredGridLT(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname)
+std::vector<std::string> FileWriter::writeUnstructuredGridLT(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname)
{
std::vector< UbTupleFloat3 > nodes;
std::vector< UbTupleUInt8 > cells;
- std::vector< std::string > nodedatanames;
- nodedatanames.push_back("press");
- nodedatanames.push_back("rho");
- nodedatanames.push_back("vx1");
- nodedatanames.push_back("vx2");
- nodedatanames.push_back("vx3");
- nodedatanames.push_back("geo");
+ std::vector< std::string > nodeDataNames = getNodeDataNames(para);
+
+ std::vector< std::string > outFNames;
+
+ uint dataIndex = 6;
+
+ uint firstConcNode = dataIndex;
+ if(para->getDiffOn()) dataIndex++;
- uint firstBodyForceNode = (uint) nodedatanames.size();
- if(para->getIsBodyForce())
- {
- nodedatanames.push_back("Fx");
- nodedatanames.push_back("Fy");
- nodedatanames.push_back("Fz");
- }
+ uint firstBodyForceNode = dataIndex;
+ if(para->getIsBodyForce()) dataIndex+=3;
- uint firstNutNode = (uint) nodedatanames.size();
- if(para->getUseTurbulentViscosity())
- {
- nodedatanames.push_back("nut");
- }
+ uint firstNutNode = dataIndex;
+ if(para->getUseTurbulentViscosity()) dataIndex++;
- uint firstTurbNode = (uint) nodedatanames.size();
- if (para->getCalcTurbulenceIntensity()) {
- nodedatanames.push_back("vxx");
- nodedatanames.push_back("vyy");
- nodedatanames.push_back("vzz");
- nodedatanames.push_back("vxy");
- nodedatanames.push_back("vxz");
- nodedatanames.push_back("vyz");
- }
+ uint firstTurbulenceNode = dataIndex;
+ if (para->getCalcTurbulenceIntensity()) dataIndex += 6;
unsigned int number1, number2, number3, number4, number5, number6, number7, number8;
uint dn1, dn2, dn3, dn4, dn5, dn6, dn7, dn8;
bool neighborsAreFluid;
- unsigned int startpos = 0;
- unsigned int endpos = 0;
- unsigned int sizeOfNodes = 0;
- std::vector< std::vector< double > > nodedata(nodedatanames.size());
+ unsigned int startPosition;
+ unsigned int endPosition;
+ unsigned int sizeOfNodes;
+ std::vector< std::vector< double > > nodeData(nodeDataNames.size());
for (unsigned int part = 0; part < fname.size(); part++)
{
- if (((part + 1)*para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ if (((part + 1)*para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
else
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
- endpos = startpos + sizeOfNodes;
+ startPosition = part * para->getLimitOfNodesForVTK();
+ endPosition = startPosition + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
nodes.resize(sizeOfNodes);
- for (uint i = 0; i < (uint)nodedatanames.size(); i++)
- nodedata[i].resize(sizeOfNodes);
+ for (uint i = 0; i < (uint)nodeDataNames.size(); i++)
+ nodeData[i].resize(sizeOfNodes);
//////////////////////////////////////////////////////////////////////////
- for (unsigned int pos = startpos; pos < endpos; pos++)
+ for (unsigned int pos = startPosition; pos < endPosition; pos++)
{
if (para->getParH(level)->typeOfGridNode[pos] == GEO_FLUID)
{
+
//////////////////////////////////////////////////////////////////////////
double x1 = para->getParH(level)->coordinateX[pos];
double x2 = para->getParH(level)->coordinateY[pos];
double x3 = para->getParH(level)->coordinateZ[pos];
//////////////////////////////////////////////////////////////////////////
number1 = pos;
- dn1 = pos - startpos;
+ dn1 = pos - startPosition;
neighborsAreFluid = true;
//////////////////////////////////////////////////////////////////////////
nodes[dn1] = (makeUbTuple((float)(x1), (float)(x2), (float)(x3)));
- nodedata[0][dn1] = (double)para->getParH(level)->pressure[pos] / (double)3.0 * (double)para->getDensityRatio() * (double)para->getVelocityRatio() * (double)para->getVelocityRatio();
- nodedata[1][dn1] = (double)para->getParH(level)->rho[pos] / (double)3.0 * (double)para->getDensityRatio() * (double)para->getVelocityRatio() * (double)para->getVelocityRatio();
- nodedata[2][dn1] = (double)para->getParH(level)->velocityX[pos] * (double)para->getVelocityRatio();
- nodedata[3][dn1] = (double)para->getParH(level)->velocityY[pos] * (double)para->getVelocityRatio();
- nodedata[4][dn1] = (double)para->getParH(level)->velocityZ[pos] * (double)para->getVelocityRatio();
- nodedata[5][dn1] = (double)para->getParH(level)->typeOfGridNode[pos];
+ nodeData[0][dn1] = (double)para->getParH(level)->pressure[pos] / (double)3.0 * (double)para->getDensityRatio() * (double)para->getVelocityRatio() * (double)para->getVelocityRatio();
+ nodeData[1][dn1] = (double)para->getParH(level)->rho[pos] / (double)3.0 * (double)para->getDensityRatio() * (double)para->getVelocityRatio() * (double)para->getVelocityRatio();
+ nodeData[2][dn1] = (double)para->getParH(level)->velocityX[pos] * (double)para->getVelocityRatio();
+ nodeData[3][dn1] = (double)para->getParH(level)->velocityY[pos] * (double)para->getVelocityRatio();
+ nodeData[4][dn1] = (double)para->getParH(level)->velocityZ[pos] * (double)para->getVelocityRatio();
+ nodeData[5][dn1] = (double)para->getParH(level)->typeOfGridNode[pos];
+
+ if(para->getDiffOn())
+ nodeData[firstConcNode][dn1] = (double)para->getParH(level)->concentration[pos];
if(para->getIsBodyForce())
{
- nodedata[firstBodyForceNode ][dn1] = (double)para->getParH(level)->forceX_SP[pos] * (double)para->getScaledForceRatio(level);
- nodedata[firstBodyForceNode + 1][dn1] = (double)para->getParH(level)->forceY_SP[pos] * (double)para->getScaledForceRatio(level);
- nodedata[firstBodyForceNode + 2][dn1] = (double)para->getParH(level)->forceZ_SP[pos] * (double)para->getScaledForceRatio(level);
+ nodeData[firstBodyForceNode ][dn1] = (double)para->getParH(level)->forceX_SP[pos] * (double)para->getScaledForceRatio(level);
+ nodeData[firstBodyForceNode + 1][dn1] = (double)para->getParH(level)->forceY_SP[pos] * (double)para->getScaledForceRatio(level);
+ nodeData[firstBodyForceNode + 2][dn1] = (double)para->getParH(level)->forceZ_SP[pos] * (double)para->getScaledForceRatio(level);
}
if(para->getUseTurbulentViscosity())
{
- nodedata[firstNutNode][dn1] = (double)para->getParH(level)->turbViscosity[pos] * (double)para->getScaledViscosityRatio(level);
+ nodeData[firstNutNode][dn1] = (double)para->getParH(level)->turbViscosity[pos] * (double)para->getScaledViscosityRatio(level);
}
if (para->getCalcTurbulenceIntensity()) {
- nodedata[firstTurbNode ][dn1] = (double)para->getParH(level)->vxx[pos];
- nodedata[firstTurbNode + 1][dn1] = (double)para->getParH(level)->vyy[pos];
- nodedata[firstTurbNode + 2][dn1] = (double)para->getParH(level)->vzz[pos];
- nodedata[firstTurbNode + 3][dn1] = (double)para->getParH(level)->vxy[pos];
- nodedata[firstTurbNode + 4][dn1] = (double)para->getParH(level)->vxz[pos];
- nodedata[firstTurbNode + 5][dn1] = (double)para->getParH(level)->vyz[pos];
+ nodeData[firstTurbulenceNode ][dn1] = (double)para->getParH(level)->vxx[pos];
+ nodeData[firstTurbulenceNode + 1][dn1] = (double)para->getParH(level)->vyy[pos];
+ nodeData[firstTurbulenceNode + 2][dn1] = (double)para->getParH(level)->vzz[pos];
+ nodeData[firstTurbulenceNode + 3][dn1] = (double)para->getParH(level)->vxy[pos];
+ nodeData[firstTurbulenceNode + 4][dn1] = (double)para->getParH(level)->vxz[pos];
+ nodeData[firstTurbulenceNode + 5][dn1] = (double)para->getParH(level)->vyz[pos];
}
//////////////////////////////////////////////////////////////////////////
@@ -291,21 +296,21 @@ void FileWriter::writeUnstrucuredGridLT(std::shared_ptr<Parameter> para, int lev
para->getParH(level)->typeOfGridNode[number7] != GEO_FLUID ||
para->getParH(level)->typeOfGridNode[number8] != GEO_FLUID) neighborsAreFluid = false;
//////////////////////////////////////////////////////////////////////////
- if (number2 > endpos ||
- number3 > endpos ||
- number4 > endpos ||
- number5 > endpos ||
- number6 > endpos ||
- number7 > endpos ||
- number8 > endpos) neighborsAreFluid = false;
- //////////////////////////////////////////////////////////////////////////
- dn2 = number2 - startpos;
- dn3 = number3 - startpos;
- dn4 = number4 - startpos;
- dn5 = number5 - startpos;
- dn6 = number6 - startpos;
- dn7 = number7 - startpos;
- dn8 = number8 - startpos;
+ if (number2 > endPosition ||
+ number3 > endPosition ||
+ number4 > endPosition ||
+ number5 > endPosition ||
+ number6 > endPosition ||
+ number7 > endPosition ||
+ number8 > endPosition) neighborsAreFluid = false;
+ //////////////////////////////////////////////////////////////////////////
+ dn2 = number2 - startPosition;
+ dn3 = number3 - startPosition;
+ dn4 = number4 - startPosition;
+ dn5 = number5 - startPosition;
+ dn6 = number6 - startPosition;
+ dn7 = number7 - startPosition;
+ dn8 = number8 - startPosition;
//////////////////////////////////////////////////////////////////////////
if (isPeriodicCell(para, level, number2, number1, number3, number5))
continue;
@@ -314,164 +319,53 @@ void FileWriter::writeUnstrucuredGridLT(std::shared_ptr<Parameter> para, int lev
cells.push_back(makeUbTuple(dn1, dn2, dn3, dn4, dn5, dn6, dn7, dn8));
}
}
- WbWriterVtkXmlBinary::getInstance()->writeOctsWithNodeData(fname[part], nodes, cells, nodedatanames, nodedata);
+ outFNames.push_back( WbWriterVtkXmlBinary::getInstance()->writeOctsWithNodeData(fname[part], nodes, cells, nodeDataNames, nodeData) );
}
+ return outFNames;
}
-void FileWriter::writeUnstrucuredGridLTConc(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname)
+std::vector<std::string> FileWriter::writeUnstructuredGridMedianLT(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname)
{
- std::vector< UbTupleFloat3 > nodes;
- std::vector< UbTupleUInt8 > cells;
- std::vector< std::string > nodedatanames;
- nodedatanames.push_back("press");
- nodedatanames.push_back("rho");
- nodedatanames.push_back("vx1");
- nodedatanames.push_back("vx2");
- nodedatanames.push_back("vx3");
- nodedatanames.push_back("geo");
- nodedatanames.push_back("conc");
- unsigned int number1, number2, number3, number4, number5, number6, number7, number8;
- uint dn1, dn2, dn3, dn4, dn5, dn6, dn7, dn8;
- bool neighborsAreFluid;
- unsigned int startpos = 0;
- unsigned int endpos = 0;
- unsigned int sizeOfNodes = 0;
- std::vector< std::vector< double > > nodedata(nodedatanames.size());
+ std::vector< std::string > outFNames;
- for (unsigned int part = 0; part < fname.size(); part++)
- {
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
- else
- sizeOfNodes = para->getlimitOfNodesForVTK();
-
- //////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
- endpos = startpos + sizeOfNodes;
- //////////////////////////////////////////////////////////////////////////
- cells.clear();
- nodes.resize(sizeOfNodes);
- nodedata[0].resize(sizeOfNodes);
- nodedata[1].resize(sizeOfNodes);
- nodedata[2].resize(sizeOfNodes);
- nodedata[3].resize(sizeOfNodes);
- nodedata[4].resize(sizeOfNodes);
- nodedata[5].resize(sizeOfNodes);
- nodedata[6].resize(sizeOfNodes);
- //////////////////////////////////////////////////////////////////////////
- for (unsigned int pos = startpos; pos < endpos; pos++)
- {
- if (para->getParH(level)->typeOfGridNode[pos] == GEO_FLUID)
- {
- //////////////////////////////////////////////////////////////////////////
- double x1 = para->getParH(level)->coordinateX[pos];
- double x2 = para->getParH(level)->coordinateY[pos];
- double x3 = para->getParH(level)->coordinateZ[pos];
- //////////////////////////////////////////////////////////////////////////
- number1 = pos;
- dn1 = pos - startpos;
- neighborsAreFluid = true;
- //////////////////////////////////////////////////////////////////////////
- nodes[dn1] = (makeUbTuple((float)(x1), (float)(x2), (float)(x3)));
- nodedata[0][dn1] = (double)para->getParH(level)->pressure[pos] / (double)3.0 * (double)para->getDensityRatio() * (double)para->getVelocityRatio() * (double)para->getVelocityRatio();
- nodedata[1][dn1] = (double)para->getParH(level)->rho[pos] / (double)3.0 * (double)para->getDensityRatio() * (double)para->getVelocityRatio() * (double)para->getVelocityRatio();
- nodedata[2][dn1] = (double)para->getParH(level)->velocityX[pos] * (double)para->getVelocityRatio();
- nodedata[3][dn1] = (double)para->getParH(level)->velocityY[pos] * (double)para->getVelocityRatio();
- nodedata[4][dn1] = (double)para->getParH(level)->velocityZ[pos] * (double)para->getVelocityRatio();
- nodedata[5][dn1] = (double)para->getParH(level)->typeOfGridNode[pos];
- nodedata[6][dn1] = (double)para->getParH(level)->concentration[pos];
- //////////////////////////////////////////////////////////////////////////
- number2 = para->getParH(level)->neighborX[number1];
- number3 = para->getParH(level)->neighborY[number2];
- number4 = para->getParH(level)->neighborY[number1];
- number5 = para->getParH(level)->neighborZ[number1];
- number6 = para->getParH(level)->neighborZ[number2];
- number7 = para->getParH(level)->neighborZ[number3];
- number8 = para->getParH(level)->neighborZ[number4];
- //////////////////////////////////////////////////////////////////////////
- if (para->getParH(level)->typeOfGridNode[number2] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number3] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number4] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number5] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number6] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number7] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number8] != GEO_FLUID) neighborsAreFluid = false;
- //////////////////////////////////////////////////////////////////////////
- if (number2 > endpos ||
- number3 > endpos ||
- number4 > endpos ||
- number5 > endpos ||
- number6 > endpos ||
- number7 > endpos ||
- number8 > endpos) neighborsAreFluid = false;
- //////////////////////////////////////////////////////////////////////////
- dn2 = number2 - startpos;
- dn3 = number3 - startpos;
- dn4 = number4 - startpos;
- dn5 = number5 - startpos;
- dn6 = number6 - startpos;
- dn7 = number7 - startpos;
- dn8 = number8 - startpos;
- //////////////////////////////////////////////////////////////////////////
- if (isPeriodicCell(para, level, number2, number1, number3, number5))
- continue;
- //////////////////////////////////////////////////////////////////////////
- if (neighborsAreFluid)
- cells.push_back(makeUbTuple(dn1, dn2, dn3, dn4, dn5, dn6, dn7, dn8));
- }
- }
- WbWriterVtkXmlBinary::getInstance()->writeOctsWithNodeData(fname[part], nodes, cells, nodedatanames, nodedata);
- }
-}
-
-void FileWriter::writeUnstrucuredGridMedianLT(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname)
-{
std::vector< UbTupleFloat3 > nodes;
std::vector< UbTupleUInt8 > cells;
//std::vector< UbTupleUInt8 > cells2;
- std::vector< std::string > nodedatanames;
- nodedatanames.push_back("pressMed");
- nodedatanames.push_back("rhoMed");
- nodedatanames.push_back("vx1Med");
- nodedatanames.push_back("vx2Med");
- nodedatanames.push_back("vx3Med");
- nodedatanames.push_back("geo");
+ std::vector< std::string > nodeDataNames = getMedianNodeDataNames(para);
+ int startIndex = para->getDiffOn()? 1 : 0;
+
unsigned int number1, number2, number3, number4, number5, number6, number7, number8;
unsigned int dn1, dn2, dn3, dn4, dn5, dn6, dn7, dn8;
bool neighborsFluid;
- unsigned int startpos = 0;
- unsigned int endpos = 0;
- unsigned int sizeOfNodes = 0;
- std::vector< std::vector< double > > nodedata(nodedatanames.size());
+ unsigned int startPosition;
+ unsigned int endPosition;
+ unsigned int sizeOfNodes;
+ std::vector< std::vector< double > > nodeData(nodeDataNames.size());
//printf("\n test for if... \n");
for (unsigned int part = 0; part < fname.size(); part++)
{
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
- endpos = startpos + sizeOfNodes;
+ startPosition = part * para->getLimitOfNodesForVTK();
+ endPosition = startPosition + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
nodes.resize(sizeOfNodes);
- nodedata[0].resize(sizeOfNodes);
- nodedata[1].resize(sizeOfNodes);
- nodedata[2].resize(sizeOfNodes);
- nodedata[3].resize(sizeOfNodes);
- nodedata[4].resize(sizeOfNodes);
- nodedata[5].resize(sizeOfNodes);
+ for (size_t i = 0; i < nodeDataNames.size(); i++)
+ nodeData[i].resize(sizeOfNodes);
//////////////////////////////////////////////////////////////////////////
//printf("\n test in if II... \n");
- for (unsigned int pos = startpos; pos < endpos; pos++)
+ for (unsigned int pos = startPosition; pos < endPosition; pos++)
{
if (para->getParH(level)->typeOfGridNode[pos] == GEO_FLUID)
{
@@ -481,16 +375,18 @@ void FileWriter::writeUnstrucuredGridMedianLT(std::shared_ptr<Parameter> para, i
double x3 = para->getParH(level)->coordinateZ[pos];
//////////////////////////////////////////////////////////////////////////
number1 = pos;
- dn1 = pos - startpos;
+ dn1 = pos - startPosition;
neighborsFluid = true;
//////////////////////////////////////////////////////////////////////////
nodes[dn1] = (makeUbTuple((float)(x1), (float)(x2), (float)(x3)));
- nodedata[0][dn1] = para->getParH(level)->press_SP_Med_Out[pos] / 3.0f * para->getDensityRatio() * para->getVelocityRatio() * para->getVelocityRatio();
- nodedata[1][dn1] = para->getParH(level)->rho_SP_Med_Out[pos] / 3.0f * para->getDensityRatio() * para->getVelocityRatio() * para->getVelocityRatio();
- nodedata[2][dn1] = para->getParH(level)->vx_SP_Med_Out[pos] * para->getVelocityRatio();
- nodedata[3][dn1] = para->getParH(level)->vy_SP_Med_Out[pos] * para->getVelocityRatio();
- nodedata[4][dn1] = para->getParH(level)->vz_SP_Med_Out[pos] * para->getVelocityRatio();
- nodedata[5][dn1] = (double)para->getParH(level)->typeOfGridNode[pos];
+ if(para->getDiffOn())
+ nodeData[0][dn1] = (double)para->getParH(level)->Conc_Med_Out[pos];
+ nodeData[startIndex ][dn1] = para->getParH(level)->press_SP_Med_Out[pos] / 3.0f * para->getDensityRatio() * para->getVelocityRatio() * para->getVelocityRatio();
+ nodeData[startIndex + 1][dn1] = para->getParH(level)->rho_SP_Med_Out[pos] / 3.0f * para->getDensityRatio() * para->getVelocityRatio() * para->getVelocityRatio();
+ nodeData[startIndex + 2][dn1] = para->getParH(level)->vx_SP_Med_Out[pos] * para->getVelocityRatio();
+ nodeData[startIndex + 3][dn1] = para->getParH(level)->vy_SP_Med_Out[pos] * para->getVelocityRatio();
+ nodeData[startIndex + 4][dn1] = para->getParH(level)->vz_SP_Med_Out[pos] * para->getVelocityRatio();
+ nodeData[startIndex + 5][dn1] = (double)para->getParH(level)->typeOfGridNode[pos];
//////////////////////////////////////////////////////////////////////////
number2 = para->getParH(level)->neighborX[number1];
number3 = para->getParH(level)->neighborY[number2];
@@ -508,21 +404,21 @@ void FileWriter::writeUnstrucuredGridMedianLT(std::shared_ptr<Parameter> para, i
para->getParH(level)->typeOfGridNode[number7] != GEO_FLUID ||
para->getParH(level)->typeOfGridNode[number8] != GEO_FLUID) neighborsFluid = false;
//////////////////////////////////////////////////////////////////////////
- if (number2 > endpos ||
- number3 > endpos ||
- number4 > endpos ||
- number5 > endpos ||
- number6 > endpos ||
- number7 > endpos ||
- number8 > endpos) neighborsFluid = false;
- //////////////////////////////////////////////////////////////////////////
- dn2 = number2 - startpos;
- dn3 = number3 - startpos;
- dn4 = number4 - startpos;
- dn5 = number5 - startpos;
- dn6 = number6 - startpos;
- dn7 = number7 - startpos;
- dn8 = number8 - startpos;
+ if (number2 > endPosition ||
+ number3 > endPosition ||
+ number4 > endPosition ||
+ number5 > endPosition ||
+ number6 > endPosition ||
+ number7 > endPosition ||
+ number8 > endPosition) neighborsFluid = false;
+ //////////////////////////////////////////////////////////////////////////
+ dn2 = number2 - startPosition;
+ dn3 = number3 - startPosition;
+ dn4 = number4 - startPosition;
+ dn5 = number5 - startPosition;
+ dn6 = number6 - startPosition;
+ dn7 = number7 - startPosition;
+ dn8 = number8 - startPosition;
//////////////////////////////////////////////////////////////////////////
if (isPeriodicCell(para, level, number2, number1, number3, number5))
continue;
@@ -531,122 +427,8 @@ void FileWriter::writeUnstrucuredGridMedianLT(std::shared_ptr<Parameter> para, i
//////////////////////////////////////////////////////////////////////////
}
}
- WbWriterVtkXmlBinary::getInstance()->writeOctsWithNodeData(fname[part], nodes, cells, nodedatanames, nodedata);
+ outFNames.push_back(WbWriterVtkXmlBinary::getInstance()->writeOctsWithNodeData(fname[part], nodes, cells, nodeDataNames, nodeData));
//////////////////////////////////////////////////////////////////////////
}
-}
-
-void FileWriter::writeUnstrucuredGridMedianLTConc(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname)
-{
- std::vector< UbTupleFloat3 > nodes;
- std::vector< UbTupleUInt8 > cells;
- std::vector< std::string > nodedatanames;
- nodedatanames.push_back("concMed");
- nodedatanames.push_back("pressMed");
- nodedatanames.push_back("rhoMed");
- nodedatanames.push_back("vx1Med");
- nodedatanames.push_back("vx2Med");
- nodedatanames.push_back("vx3Med");
- nodedatanames.push_back("geo");
- uint number1, number2, number3, number4, number5, number6, number7, number8;
- uint dn1, dn2, dn3, dn4, dn5, dn6, dn7, dn8;
- bool neighborsFluid;
- uint startpos = 0;
- uint endpos = 0;
- uint sizeOfNodes = 0;
- std::vector< std::vector< double > > nodedata(nodedatanames.size());
-
- for (unsigned int part = 0; part < fname.size(); part++)
- {
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
- else
- sizeOfNodes = para->getlimitOfNodesForVTK();
- //////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
- endpos = startpos + sizeOfNodes;
- //////////////////////////////////////////////////////////////////////////
- cells.clear();
- nodes.resize(sizeOfNodes);
- nodedata[0].resize(sizeOfNodes);
- nodedata[1].resize(sizeOfNodes);
- nodedata[2].resize(sizeOfNodes);
- nodedata[3].resize(sizeOfNodes);
- nodedata[4].resize(sizeOfNodes);
- nodedata[5].resize(sizeOfNodes);
- nodedata[6].resize(sizeOfNodes);
- //////////////////////////////////////////////////////////////////////////
- for (unsigned int pos = startpos; pos < endpos; pos++)
- {
- if (para->getParH(level)->typeOfGridNode[pos] == GEO_FLUID)
- {
- //////////////////////////////////////////////////////////////////////////
- double x1 = para->getParH(level)->coordinateX[pos];
- double x2 = para->getParH(level)->coordinateY[pos];
- double x3 = para->getParH(level)->coordinateZ[pos];
- //////////////////////////////////////////////////////////////////////////
- number1 = pos;
- dn1 = pos - startpos;
- neighborsFluid = true;
- //////////////////////////////////////////////////////////////////////////
- nodes[dn1] = (makeUbTuple((float)(x1), (float)(x2), (float)(x3)));
- nodedata[0][dn1] = (double)para->getParH(level)->Conc_Med_Out[pos];
- nodedata[1][dn1] = (double)para->getParH(level)->press_SP_Med_Out[pos] / 3.0f * para->getDensityRatio() * para->getVelocityRatio() * para->getVelocityRatio();
- nodedata[2][dn1] = (double)para->getParH(level)->rho_SP_Med_Out[pos] / 3.0f * para->getDensityRatio() * para->getVelocityRatio() * para->getVelocityRatio();
- nodedata[3][dn1] = (double)para->getParH(level)->vx_SP_Med_Out[pos] * para->getVelocityRatio();
- nodedata[4][dn1] = (double)para->getParH(level)->vy_SP_Med_Out[pos] * para->getVelocityRatio();
- nodedata[5][dn1] = (double)para->getParH(level)->vz_SP_Med_Out[pos] * para->getVelocityRatio();
- nodedata[6][dn1] = (double)para->getParH(level)->typeOfGridNode[pos];
- //////////////////////////////////////////////////////////////////////////
- number2 = para->getParH(level)->neighborX[number1];
- number3 = para->getParH(level)->neighborY[number2];
- number4 = para->getParH(level)->neighborY[number1];
- number5 = para->getParH(level)->neighborZ[number1];
- number6 = para->getParH(level)->neighborZ[number2];
- number7 = para->getParH(level)->neighborZ[number3];
- number8 = para->getParH(level)->neighborZ[number4];
- //////////////////////////////////////////////////////////////////////////
- if (para->getParH(level)->typeOfGridNode[number2] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number3] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number4] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number5] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number6] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number7] != GEO_FLUID ||
- para->getParH(level)->typeOfGridNode[number8] != GEO_FLUID) neighborsFluid = false;
- //////////////////////////////////////////////////////////////////////////
- if (number2 > endpos ||
- number3 > endpos ||
- number4 > endpos ||
- number5 > endpos ||
- number6 > endpos ||
- number7 > endpos ||
- number8 > endpos) neighborsFluid = false;
- //////////////////////////////////////////////////////////////////////////
- dn2 = number2 - startpos;
- dn3 = number3 - startpos;
- dn4 = number4 - startpos;
- dn5 = number5 - startpos;
- dn6 = number6 - startpos;
- dn7 = number7 - startpos;
- dn8 = number8 - startpos;
- //////////////////////////////////////////////////////////////////////////
- if (isPeriodicCell(para, level, number2, number1, number3, number5))
- continue;
- //////////////////////////////////////////////////////////////////////////
- if (neighborsFluid)
- cells.push_back(makeUbTuple(dn1, dn2, dn3, dn4, dn5, dn6, dn7, dn8));
- //////////////////////////////////////////////////////////////////////////
- }
- }
- WbWriterVtkXmlBinary::getInstance()->writeOctsWithNodeData(fname[part], nodes, cells, nodedatanames, nodedata);
- //////////////////////////////////////////////////////////////////////////
- }
-}
-//////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
+ return outFNames;
+}
\ No newline at end of file
diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
index 2d7c176fa067ea86573849e90bd91dab259526b4..73794f957f573d9dc29f57adff4e15d1f6ba7e18 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
@@ -11,27 +11,26 @@
class Parameter;
class CudaMemoryManager;
-struct PN27;
class FileWriter : public DataWriter
{
public:
- void writeInit(std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager) override;
- void writeTimestep(std::shared_ptr<Parameter> para, unsigned int timestep) override;
+ void writeInit(std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager) override;
+ void writeTimestep(std::shared_ptr<Parameter> para, unsigned int timestep) override;
private:
- void writeTimestep(std::shared_ptr<Parameter> para, unsigned int timestep, int level) override;
- //void writeParticle(Parameter* para, unsigned int t);
- void writeUnstrucuredGridLT(std::shared_ptr<Parameter> para, int level,
+ void writeTimestep(std::shared_ptr<Parameter> para, unsigned int timestep, int level) override;
+ std::vector<std::string> writeUnstructuredGridLT(std::shared_ptr<Parameter> para, int level,
std::vector<std::string> &fname);
- void writeUnstrucuredGridLTConc(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname);
- void writeUnstrucuredGridMedianLT(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname);
- void writeUnstrucuredGridMedianLTConc(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname);
- bool isPeriodicCell(std::shared_ptr<Parameter> para, int level, unsigned int number2, unsigned int number1, unsigned int number3, unsigned int number5);
+ std::vector<std::string> writeUnstructuredGridMedianLT(std::shared_ptr<Parameter> para, int level, std::vector<std::string >& fname);
+ bool isPeriodicCell(std::shared_ptr<Parameter> para, int level, unsigned int number2, unsigned int number1, unsigned int number3, unsigned int number5);
- void writeCollectionFile( std::shared_ptr<Parameter> para, unsigned int timestep );
+ std::string writeCollectionFile( std::shared_ptr<Parameter> para, unsigned int timestep );
- void writeCollectionFileMedian( std::shared_ptr<Parameter> para, unsigned int timestep );
+ std::string writeCollectionFileMedian( std::shared_ptr<Parameter> para, unsigned int timestep );
+
+ std::vector<std::string> getNodeDataNames(std::shared_ptr<Parameter> para);
+ std::vector<std::string> getMedianNodeDataNames(std::shared_ptr<Parameter> para);
std::vector< std::string > fileNamesForCollectionFile;
std::vector< std::string > fileNamesForCollectionFileMedian;
diff --git a/src/gpu/VirtualFluids_GPU/Output/InterfaceDebugWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/InterfaceDebugWriter.hpp
index 705d86992d9eac39b66cf5033f7c32b5cb4fb602..4af9a50a123588e25f1ca9faa5c18581601f69d2 100644
--- a/src/gpu/VirtualFluids_GPU/Output/InterfaceDebugWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/InterfaceDebugWriter.hpp
@@ -11,7 +11,7 @@
#include <basics/writer/WbWriterVtkXmlBinary.h>
#include <cmath>
-#include "VirtualFluids_GPU/Communication/Communicator.h"
+#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
namespace InterfaceDebugWriter
{
@@ -650,7 +650,7 @@ void writeInterfaceFCC_Send(Parameter *para)
nodeCount++;
}
std::string filenameVec = para->getFName() + "_writeInterfaceFCC_Send_PID_" +
- std::to_string(vf::gpu::Communicator::getInstance().getPID()) + "_" +
+ std::to_string(vf::gpu::MpiCommunicator::getInstance().getPID()) + "_" +
StringUtil::toString<int>(level);
WbWriterVtkXmlBinary::getInstance()->writeNodesWithNodeData(filenameVec, nodesVec, datanames, nodedata);
@@ -703,7 +703,7 @@ void writeInterfaceCFC_Recv(Parameter *para)
nodeCount++;
}
std::string filenameVec = para->getFName() + "_writeInterfaceCFC_Recv_PID_" +
- std::to_string(vf::gpu::Communicator::getInstance().getPID()) + "_" +
+ std::to_string(vf::gpu::MpiCommunicator::getInstance().getPID()) + "_" +
StringUtil::toString<int>(level);
WbWriterVtkXmlBinary::getInstance()->writeNodesWithNodeData(filenameVec, nodesVec, datanames, nodedata);
@@ -808,7 +808,7 @@ void writeSendNodesStream(Parameter *para)
}
}
std::string filenameVec = para->getFName() + "_writeSendNodesStreams_PID_" +
- std::to_string(vf::gpu::Communicator::getInstance().getPID()) + "_" +
+ std::to_string(vf::gpu::MpiCommunicator::getInstance().getPID()) + "_" +
StringUtil::toString<int>(level);
WbWriterVtkXmlBinary::getInstance()->writeNodesWithNodeData(filenameVec, nodesVec, datanames, nodedata);
@@ -894,7 +894,7 @@ void writeRecvNodesStream(Parameter *para)
// Recv are nodes ghost nodes and therefore they can't be coarse cells for the interpolation from coarse to fine
std::string filenameVec = para->getFName() + "_writeRecvNodesStreams_PID_" +
- std::to_string(vf::gpu::Communicator::getInstance().getPID()) + "_" +
+ std::to_string(vf::gpu::MpiCommunicator::getInstance().getPID()) + "_" +
StringUtil::toString<int>(level);
WbWriterVtkXmlBinary::getInstance()->writeNodesWithNodeData(filenameVec, nodesVec, datanames, nodedata);
diff --git a/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp
index b24dab20be957fa27b9306d0bbabbec53694753c..d58526cab3b114e77bdb146053584795b05bac8a 100644
--- a/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp
@@ -33,8 +33,8 @@ namespace QDebugWriter
}
}
if (qKey > 0) {
- real transportKey = *((real*)&qKey);
- qNode.push_back(transportKey);
+ float transportKey = *((float*)&qKey);
+ qNode.push_back((real)transportKey);
qNode.push_back((real)k[j]);
qs.push_back(qNode);
}
diff --git a/src/gpu/VirtualFluids_GPU/Output/Timer.cpp b/src/gpu/VirtualFluids_GPU/Output/Timer.cpp
index 5a5e010944a776038416386267c3bf6477d47e9f..f6efff58440bd786d57a3ccb44d2271c29761323 100644
--- a/src/gpu/VirtualFluids_GPU/Output/Timer.cpp
+++ b/src/gpu/VirtualFluids_GPU/Output/Timer.cpp
@@ -52,7 +52,7 @@ void Timer::outputPerformance(uint t, Parameter* para, vf::gpu::Communicator& co
// When using multiple GPUs, sum the nups of all processes
if (communicator.getNumberOfProcess() > 1) {
- double nupsSum = communicator.sumNups(fnups);
+ double nupsSum = communicator.reduceSum(fnups);
if (communicator.getPID() == 0)
VF_LOG_INFO("Sum of all {} processes: Nups in Mio: {:.1f}", communicator.getNumberOfProcess(), nupsSum);
}
diff --git a/src/gpu/VirtualFluids_GPU/Output/UnstructuredGridWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/UnstructuredGridWriter.hpp
index cafe70205455ae8592c1efe86e4ba9de8e1ba170..5d5548ba7e64a23152126446e3c438da1c7e7653 100644
--- a/src/gpu/VirtualFluids_GPU/Output/UnstructuredGridWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/UnstructuredGridWriter.hpp
@@ -197,16 +197,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if ( ((part+1)*para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if ( ((part+1)*para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -340,16 +340,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -479,16 +479,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -628,16 +628,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -771,16 +771,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -1342,16 +1342,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if ( ((part+1)*para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if ( ((part+1)*para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -1465,16 +1465,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -1595,16 +1595,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -1975,16 +1975,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -2080,16 +2080,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
@@ -2192,16 +2192,16 @@ namespace UnstructuredGridWriter
vxmax = 0;
//printf("\n test in if I... \n");
//////////////////////////////////////////////////////////////////////////
- if (((part + 1) * para->getlimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
+ if (((part + 1) * para->getLimitOfNodesForVTK()) > (uint)para->getParH(level)->numberOfNodes)
{
- sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getlimitOfNodesForVTK());
+ sizeOfNodes = (uint)para->getParH(level)->numberOfNodes - (part * para->getLimitOfNodesForVTK());
}
else
{
- sizeOfNodes = para->getlimitOfNodesForVTK();
+ sizeOfNodes = para->getLimitOfNodesForVTK();
}
//////////////////////////////////////////////////////////////////////////
- startpos = part * para->getlimitOfNodesForVTK();
+ startpos = part * para->getLimitOfNodesForVTK();
endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
cells.clear();
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.cpp b/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.cpp
index 3cc771e413134e90b0d09d8eeb6dfee791f8a1e2..c6db87138610a6c029a06e32b70f496dc2306a83 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.cpp
@@ -31,15 +31,14 @@
#include <helper_cuda.h>
#include <iostream>
-void CudaStreamManager::registerStream(CudaStreamIndex streamIndex)
+int CudaStreamManager::registerAndLaunchStream(CudaStreamIndex streamIndex)
{
- if(streamIndex != CudaStreamIndex::Legacy)
- cudaStreams.emplace(streamIndex, nullptr);
-}
-void CudaStreamManager::launchStreams()
-{
- for (auto &stream : cudaStreams)
- cudaStreamCreate(&stream.second);
+ if(streamIndex == CudaStreamIndex::Legacy) return 0;
+
+ cudaStream_t new_stream = nullptr;
+ cudaStreamCreate(&new_stream);
+ cudaStreams.emplace(streamIndex, new_stream);
+ return int(cudaStreams.count(streamIndex) - 1);
}
void CudaStreamManager::terminateStreams()
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.h b/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.h
index 631a945a653e6b4b60924a650e94b3873ebacc7d..98032ef16adebf56f10d8ed5e9c04bbf517876c3 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.h
@@ -1,28 +1,28 @@
//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
//
-// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
+// License as published by the Free Software Foundation, either version 3 of
// the License, or (at your option) any later version.
-//
-// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
// for more details.
-//
+//
// You should have received a copy of the GNU General Public License along
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
@@ -43,27 +43,26 @@ enum class CudaStreamIndex
Precursor,
ActuatorFarm
};
+
class CudaStreamManager
-{
+{
private:
std::multimap<CudaStreamIndex, cudaStream_t> cudaStreams;
cudaEvent_t startBulkKernel = NULL;
cudaStream_t legacyStream = CU_STREAM_LEGACY;
-
public:
- void registerStream(CudaStreamIndex streamIndex);
- void launchStreams();
+ int registerAndLaunchStream(CudaStreamIndex streamIndex);
void terminateStreams();
- cudaStream_t &getStream(CudaStreamIndex streamIndex, uint multiStreamIndex=0);
+ cudaStream_t &getStream(CudaStreamIndex streamIndex, uint multiStreamIndex = 0);
bool streamIsRegistered(CudaStreamIndex streamIndex);
// Events
void createCudaEvents();
void destroyCudaEvents();
- void triggerStartBulkKernel(CudaStreamIndex streamIndex, uint multiStreamIndex=0);
- void waitOnStartBulkKernelEvent(CudaStreamIndex streamIndex, uint multiStreamIndex=0);
+ void triggerStartBulkKernel(CudaStreamIndex streamIndex, uint multiStreamIndex = 0);
+ void waitOnStartBulkKernelEvent(CudaStreamIndex streamIndex, uint multiStreamIndex = 0);
};
#endif
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
index bf0d72448fb5a69c849d93749e24f29290cf9621..9044f69dccdc848192f62b02c737b8ec961d4ba8 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
@@ -37,7 +37,15 @@
#include <cstdlib>
#include <optional>
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#pragma clang diagnostic ignored "-Wunused-but-set-parameter"
+#endif
#include <curand_kernel.h>
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
#include "StringUtilities/StringUtil.h"
@@ -1713,7 +1721,7 @@ unsigned int Parameter::getOutputCount()
{
return this->outputCount;
}
-unsigned int Parameter::getlimitOfNodesForVTK()
+unsigned int Parameter::getLimitOfNodesForVTK()
{
return this->limitOfNodesForVTK;
}
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
index 5944cf66caed4f680ff0480c7b7c39ff7d237aab..89398e063027fe062cce240e397eff59a67732c2 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
@@ -700,7 +700,7 @@ public:
real getEndXHotWall();
unsigned int getStepEnsight();
unsigned int getOutputCount();
- unsigned int getlimitOfNodesForVTK();
+ unsigned int getLimitOfNodesForVTK();
unsigned int getStartTurn();
bool getEvenOrOdd(int level);
bool getDiffOn();
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
index b86d5657922deb9dca6e89574efc72766bcd16ce..bed52dc97b8bde45712bca95f924a026ccb894f1 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
@@ -4,9 +4,18 @@
#include <iostream>
#include <string>
+#include "LBM/Simulation.h"
#include "Parameter.h"
+#include "PointerDefinitions.h"
#include "basics/config/ConfigurationFile.h"
+#include "Factories/BoundaryConditionFactory.h"
+#include "Factories/GridScalingFactory.h"
+#include "Communication/Communicator.h"
+#include "DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
+#include "GPU/CudaMemoryManager.h"
+#include "gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h"
+
TEST(ParameterTest, passingEmptyFileWithoutPath_ShouldNotThrow)
{
// assuming that the config files is stored parallel to this file.
@@ -198,6 +207,49 @@ TEST(ParameterTest, userMissedSlashMultiGPU)
EXPECT_THAT(para.getConcentration(), testing::Eq("gridPathTest/0/conc.dat"));
}
+class MockGridGenerator : public GridGenerator
+{
+
+public:
+ MockGridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_ptr<Parameter> para,
+ std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::gpu::Communicator &communicator)
+ : GridGenerator(builder, para, cudaMemoryManager, communicator)
+ {
+ }
+
+ void initalGridInformations() override
+ {
+ para->setGridX({ 2, 8 });
+ para->setGridY({ 2, 8 });
+ para->setGridZ({ 2, 8 });
+ para->setDistX({ 0, 0 });
+ para->setDistY({ 0, 0 });
+ para->setDistZ({ 0, 0 });
+ }
+ void allocArrays_CoordNeighborGeo() override{};
+ void setBoundingBox() override{};
+ void allocArrays_OffsetScale() override{};
+ void allocArrays_BoundaryValues() override{};
+ void allocArrays_BoundaryQs() override{};
+};
+
+TEST(ParameterTest, whenCreatingParameterClassWithGridRefinement_afterCallingInitLBMSimulationParameter_shouldNotThrow)
+{
+ auto para = std::make_shared<Parameter>();
+ para->setMaxLevel(2);
+
+ para->setGridX({ 2, 8 });
+ para->setGridY({ 2, 8 });
+ para->setGridZ({ 2, 8 });
+ para->setDistX({ 0, 0 });
+ para->setDistY({ 0, 0 });
+ para->setDistZ({ 0, 0 });
+
+ EXPECT_THAT(para->getParH(1), testing::Eq(nullptr)); // Parameter initialization incomplete
+ para->initLBMSimulationParameter();
+ EXPECT_THAT(para->getParH(1), testing::Ne(nullptr));
+}
+
class ParameterTestCumulantK17 : public testing::Test
{
protected:
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
index bcdd63657d13cd8a9dcef3372fe02760a337b057..f2d4b27a159c3f3687bd58933b55558ca08cd16d 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
@@ -310,7 +310,7 @@ void ActuatorFarm::init(Parameter* para, GridProvider* gridProvider, CudaMemoryM
this->initBladeVelocities(cudaMemoryManager);
this->initBladeForces(cudaMemoryManager);
this->initBoundingSpheres(para, cudaMemoryManager);
- this->streamIndex = 0;
+ this->streamIndex = para->getStreamManager()->registerAndLaunchStream(CudaStreamIndex::ActuatorFarm);
}
void ActuatorFarm::interact(Parameter* para, CudaMemoryManager* cudaMemoryManager, int level, unsigned int t)
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
index 811045a32b18fd0f5d7f71be39b0dfec8982b352..90c434bd60e623175d5c8bfbbf23fa41f01e8a37 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
@@ -16,8 +16,6 @@ class CudaMemoryManager;
class VIRTUALFLUIDS_GPU_EXPORT PreCollisionInteractor
{
-private:
- SPtr<Parameter> para;
protected:
PreCollisionInteractor()
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PrecursorWriter.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PrecursorWriter.cu
index 99c60fd3d2aae2e796e0c95e624b9d5d33c30ef1..b1ebaf28edc7966074f7cc96e31bf8489ca8e4a9 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PrecursorWriter.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PrecursorWriter.cu
@@ -208,7 +208,7 @@ void PrecursorWriter::init(Parameter* para, GridProvider* gridProvider, CudaMemo
precursorStructs[level]->origin = makeUbTuple(lowestY, lowestZ);
precursorStructs[level]->extent = makeUbTuple(0, ny-1, 0, nz-1);
precursorStructs[level]->numberOfPointsInData = ny*nz;
- precursorStructs[level]->numberOfTimestepsPerFile = min(para->getlimitOfNodesForVTK()/(ny*nz), maxtimestepsPerFile);
+ precursorStructs[level]->numberOfTimestepsPerFile = min(para->getLimitOfNodesForVTK()/(ny*nz), maxtimestepsPerFile);
precursorStructs[level]->numberOfFilesWritten = 0;
precursorStructs[level]->numberOfTimestepsBuffered = 0;
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.cu
index e89d392b5d4bf5983f9bb47642fef81d0f06cc89..705b7173606d1956c50c59d5cc1f7635a4b7883b 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.cu
@@ -16,9 +16,11 @@
#include "DataStructureInitializer/GridProvider.h"
#include "GPU/CudaMemoryManager.h"
#include "GPU/GPU_Interface.h"
+#include "basics/constants/NumericConstants.h"
#include <algorithm>
+using namespace vf::basics::constant;
///////////////////////////////////////////////////////////////////////////////////
/// Functors for thrust reductions
///////////////////////////////////////////////////////////////////////////////////
@@ -307,7 +309,7 @@ void PlanarAverageProbe::calculateQuantities(SPtr<ProbeStruct> probeStruct, Para
neighborInplane2 = para->getParD(level)->neighborY;
}
- bool doTmpAveraging = t_level>=(this->getTStartTmpAveraging()*pow(2,level));
+ bool doTmpAveraging = t_level>=(this->getTStartTmpAveraging()*exp2(level));
// Pointer casts to use device arrays in thrust reductions
thrust::device_ptr<uint> indices_thrust = thrust::device_pointer_cast(probeStruct->pointIndicesD);
@@ -317,7 +319,7 @@ void PlanarAverageProbe::calculateQuantities(SPtr<ProbeStruct> probeStruct, Para
thrust::device_ptr<real> nut_thrust = thrust::device_pointer_cast(para->getParD(level)->turbViscosity);
real N = (real)probeStruct->nIndices;
- real n = (real)probeStruct->vals;
+ real invNumberOfTimestepsInTmpAvg = c1o1/real(probeStruct->timestepInTimeAverage+1);
uint nPoints = probeStruct->nPoints;
// Permutation iterators for direct iteration over the velocities of the planes
typedef thrust::device_vector<real>::iterator valIterator;
@@ -353,17 +355,17 @@ void PlanarAverageProbe::calculateQuantities(SPtr<ProbeStruct> probeStruct, Para
if(probeStruct->quantitiesH[int(Statistic::SpatioTemporalMeans)] && doTmpAveraging)
{
- uint arrOff = probeStruct->arrayOffsetsH[int(Statistic::SpatioTemporalMeans)];
- real spatTmpMean_vx_old = probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node];
- real spatTmpMean_vy_old = probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node];
- real spatTmpMean_vz_old = probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node];
- real spatTmpMean_nut_old;
- if(para->getUseTurbulentViscosity()) spatTmpMean_nut_old = probeStruct->quantitiesArrayH[(arrOff+3)*nPoints+node];;
-
- probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node] += (spatMean_vx-spatTmpMean_vx_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node] += (spatMean_vy-spatTmpMean_vy_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node] += (spatMean_vz-spatTmpMean_vz_old)/n;
- if(para->getUseTurbulentViscosity()) probeStruct->quantitiesArrayH[(arrOff+3)*nPoints+node] += (spatMean_nut-spatTmpMean_nut_old)/n;
+ uint arrOff = probeStruct->arrayOffsetsH[int(Statistic::SpatioTemporalMeans)];
+ real spatTmpMean_vx_old = probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node];
+ real spatTmpMean_vy_old = probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node];
+ real spatTmpMean_vz_old = probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node];
+ real spatTmpMean_nut_old;
+ if(para->getUseTurbulentViscosity()) spatTmpMean_nut_old = probeStruct->quantitiesArrayH[(arrOff+3)*nPoints+node];;
+
+ probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node] += (spatMean_vx-spatTmpMean_vx_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node] += (spatMean_vy-spatTmpMean_vy_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node] += (spatMean_vz-spatTmpMean_vz_old)*invNumberOfTimestepsInTmpAvg;
+ if(para->getUseTurbulentViscosity()) probeStruct->quantitiesArrayH[(arrOff+3)*nPoints+node] += (spatMean_nut-spatTmpMean_nut_old)*invNumberOfTimestepsInTmpAvg;
}
@@ -400,12 +402,12 @@ void PlanarAverageProbe::calculateQuantities(SPtr<ProbeStruct> probeStruct, Para
real spatTmpMean_vxvz_old = probeStruct->quantitiesArrayH[(arrOff+4)*nPoints+node];
real spatTmpMean_vyvz_old = probeStruct->quantitiesArrayH[(arrOff+5)*nPoints+node];
- probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node] += (spatMean_vxvx-spatTmpMean_vxvx_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node] += (spatMean_vyvy-spatTmpMean_vyvy_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node] += (spatMean_vzvz-spatTmpMean_vzvz_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+3)*nPoints+node] += (spatMean_vxvy-spatTmpMean_vxvy_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+4)*nPoints+node] += (spatMean_vxvz-spatTmpMean_vxvz_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+5)*nPoints+node] += (spatMean_vyvz-spatTmpMean_vyvz_old)/n;
+ probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node] += (spatMean_vxvx-spatTmpMean_vxvx_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node] += (spatMean_vyvy-spatTmpMean_vyvy_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node] += (spatMean_vzvz-spatTmpMean_vzvz_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+3)*nPoints+node] += (spatMean_vxvy-spatTmpMean_vxvy_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+4)*nPoints+node] += (spatMean_vxvz-spatTmpMean_vxvz_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+5)*nPoints+node] += (spatMean_vyvz-spatTmpMean_vyvz_old)*invNumberOfTimestepsInTmpAvg;
}
if(probeStruct->quantitiesH[int(Statistic::SpatialSkewness)])
@@ -435,9 +437,9 @@ void PlanarAverageProbe::calculateQuantities(SPtr<ProbeStruct> probeStruct, Para
real spatTmpMean_Sy_old = probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node];
real spatTmpMean_Sz_old = probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node];
- probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node] += (spatMean_Sx-spatTmpMean_Sx_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node] += (spatMean_Sy-spatTmpMean_Sy_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node] += (spatMean_Sz-spatTmpMean_Sz_old)/n;
+ probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node] += (spatMean_Sx-spatTmpMean_Sx_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node] += (spatMean_Sy-spatTmpMean_Sy_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node] += (spatMean_Sz-spatTmpMean_Sz_old)*invNumberOfTimestepsInTmpAvg;
}
if(probeStruct->quantitiesH[int(Statistic::SpatialFlatness)])
@@ -464,9 +466,9 @@ void PlanarAverageProbe::calculateQuantities(SPtr<ProbeStruct> probeStruct, Para
real spatTmpMean_Fy_old = probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node];
real spatTmpMean_Fz_old = probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node];
- probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node] += (spatMean_Fx-spatTmpMean_Fx_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node] += (spatMean_Fy-spatTmpMean_Fy_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node] += (spatMean_Fz-spatTmpMean_Fz_old)/n;
+ probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+node] += (spatMean_Fx-spatTmpMean_Fx_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+node] += (spatMean_Fy-spatTmpMean_Fy_old)*invNumberOfTimestepsInTmpAvg;
+ probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+node] += (spatMean_Fz-spatTmpMean_Fz_old)*invNumberOfTimestepsInTmpAvg;
}
}
}
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.h
index 3d3533f74501e776f9150c83c9d9101a0be7ecbc..c2370231c0bc341ca9b3980578ce4aadc1b75c7a 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.h
@@ -90,6 +90,8 @@ private:
std::vector<real>& pointCoordsX_level, std::vector<real>& pointCoordsY_level, std::vector<real>& pointCoordsZ_level,
int level) override;
void calculateQuantities(SPtr<ProbeStruct> probeStruct, Parameter* para, uint t, int level) override;
+ void getTaggedFluidNodes(Parameter *para, GridProvider* gridProvider) override {};
+
private:
real posX, posY, posZ;
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.cu
index f55045505bff0e3b5b0b1426be4e9e1a3832d088..19f7f6c62ae7ac83c90fc2a7aff0e286a70063d1 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.cu
@@ -102,10 +102,23 @@ void PlaneProbe::findPoints(Parameter* para, GridProvider* gridProvider, std::ve
void PlaneProbe::calculateQuantities(SPtr<ProbeStruct> probeStruct, Parameter* para, uint t, int level)
{
vf::cuda::CudaGrid grid = vf::cuda::CudaGrid(para->getParH(level)->numberofthreads, probeStruct->nPoints);
- calcQuantitiesKernel<<<grid.grid, grid.threads>>>( probeStruct->pointIndicesD, probeStruct->nPoints, probeStruct->vals,
- para->getParD(level)->velocityX, para->getParD(level)->velocityY, para->getParD(level)->velocityZ, para->getParD(level)->rho,
- para->getParD(level)->neighborX, para->getParD(level)->neighborY, para->getParD(level)->neighborZ,
- probeStruct->quantitiesD, probeStruct->arrayOffsetsD, probeStruct->quantitiesArrayD);
+ calcQuantitiesKernel<<<grid.grid, grid.threads>>>( probeStruct->pointIndicesD,
+ probeStruct->nPoints,
+ 0,
+ 0,
+ probeStruct->timestepInTimeAverage,
+ probeStruct->nTimesteps,
+ para->getParD(level)->velocityX,
+ para->getParD(level)->velocityY,
+ para->getParD(level)->velocityZ,
+ para->getParD(level)->rho,
+ para->getParD(level)->neighborX,
+ para->getParD(level)->neighborY,
+ para->getParD(level)->neighborZ,
+ probeStruct->quantitiesD,
+ probeStruct->arrayOffsetsD,
+ probeStruct->quantitiesArrayD
+ );
}
void PlaneProbe::getTaggedFluidNodes(Parameter *para, GridProvider* gridProvider)
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.cu
index 89e1f6b87687ed42c079415a5340f1d385c8d62c..19c170608a606227d21c25791776bd3195b16e04 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.cu
@@ -103,13 +103,22 @@ void PointProbe::findPoints(Parameter* para, GridProvider* gridProvider, std::ve
void PointProbe::calculateQuantities(SPtr<ProbeStruct> probeStruct, Parameter* para, uint t, int level)
{
vf::cuda::CudaGrid grid = vf::cuda::CudaGrid(para->getParH(level)->numberofthreads, probeStruct->nPoints);
- interpAndCalcQuantitiesKernel<<<grid.grid, grid.threads>>>( probeStruct->pointIndicesD, probeStruct->nPoints, probeStruct->vals,
+ int oldTimestepInTimeseries = this->outputTimeSeries ? calcOldTimestep(probeStruct->timestepInTimeseries, probeStruct->lastTimestepInOldTimeseries) : 0;
+ int currentTimestep = this->outputTimeSeries ? probeStruct->timestepInTimeseries : 0;
+ interpAndCalcQuantitiesKernel<<<grid.grid, grid.threads>>>( probeStruct->pointIndicesD, probeStruct->nPoints, oldTimestepInTimeseries, currentTimestep, probeStruct->timestepInTimeAverage, probeStruct->nTimesteps,
probeStruct->distXD, probeStruct->distYD, probeStruct->distZD,
para->getParD(level)->velocityX, para->getParD(level)->velocityY, para->getParD(level)->velocityZ, para->getParD(level)->rho,
para->getParD(level)->neighborX, para->getParD(level)->neighborY, para->getParD(level)->neighborZ,
probeStruct->quantitiesD, probeStruct->arrayOffsetsD, probeStruct->quantitiesArrayD);
}
+void PointProbe::addProbePoint(real pointCoordX, real pointCoordY, real pointCoordZ)
+{
+ this->pointCoordsX.push_back(pointCoordX);
+ this->pointCoordsY.push_back(pointCoordY);
+ this->pointCoordsZ.push_back(pointCoordZ);
+}
+
void PointProbe::addProbePointsFromList(std::vector<real>& _pointCoordsX, std::vector<real>& _pointCoordsY, std::vector<real>& _pointCoordsZ)
{
bool isSameLength = ( (_pointCoordsX.size()==_pointCoordsY.size()) && (_pointCoordsY.size()==_pointCoordsZ.size()));
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.h
index 08c359705f03b20fbd3276fe209b6ff4d782a5e5..b26211dc859bf4601b42a640d25e656b3552300b 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.h
@@ -50,7 +50,8 @@ public:
uint _tStartAvg,
uint _tAvg,
uint _tStartOut,
- uint _tOut
+ uint _tOut,
+ bool _outputTimeseries = false
): Probe(_probeName,
_outputPath,
_tStartAvg,
@@ -59,9 +60,10 @@ public:
_tStartOut,
_tOut,
true,
- false)
+ _outputTimeseries)
{}
+ void addProbePoint(real pointCoordX, real pointCoordY, real pointCoordZ);
void addProbePointsFromList(std::vector<real>& _pointCoordsX, std::vector<real>& _pointCoordsY, std::vector<real>& _pointCoordsZ);
void addProbePointsFromXNormalPlane(real pos_x, real pos0_y, real pos0_z, real pos1_y, real pos1_z, uint n_y, uint n_z);
void getTaggedFluidNodes(Parameter *para, GridProvider* gridProvider) override;
@@ -80,6 +82,8 @@ private:
private:
std::vector<real> pointCoordsX, pointCoordsY, pointCoordsZ;
+ uint getNumberOfTimestepsInTimeseries(Parameter* para, int level) override { return outputTimeSeries ? tOut*exp2(level) : 1; }
+
};
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
index a7a0e79c0bcbf0f7a9e13e879debfb378e23f69d..2be8743bb28e45234533cb63673a9aebd6b0cf10 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
@@ -47,69 +47,92 @@
using namespace vf::basics::constant;
-__device__ void calculatePointwiseQuantities(uint n, real* quantityArray, bool* quantities, uint* quantityArrayOffsets, uint nPoints, uint node, real vx, real vy, real vz, real rho)
+__host__ __device__ int calcArrayIndex(int node, int nNodes, int timestep, int nTimesteps, int array)
+{
+ return node+nNodes*(timestep+nTimesteps*array);
+}
+
+uint calcOldTimestep(uint currentTimestep, uint lastTimestepInOldSeries)
+{
+ return currentTimestep > 0 ? currentTimestep - 1 : lastTimestepInOldSeries;
+}
+
+__device__ void calculatePointwiseQuantities(
+ uint oldTimestepInTimeseries,
+ uint timestepInTimeseries,
+ uint timestepInAverage,
+ uint nTimesteps,
+ real* quantityArray,
+ bool* quantities,
+ uint* quantityArrayOffsets,
+ uint nPoints,
+ uint node,
+ real vx,
+ real vy,
+ real vz,
+ real rho)
{
//"https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm"
// also has extensions for higher order and covariances
+ int n = timestepInAverage+1;
real inv_n = 1/real(n);
- if(quantities[int(Statistic::Instantaneous)])
+ if (quantities[int(Statistic::Instantaneous)])
{
uint arrOff = quantityArrayOffsets[int(Statistic::Instantaneous)];
- quantityArray[(arrOff+0)*nPoints+node] = vx;
- quantityArray[(arrOff+1)*nPoints+node] = vy;
- quantityArray[(arrOff+2)*nPoints+node] = vz;
- quantityArray[(arrOff+3)*nPoints+node] = rho;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 0)] = vx;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 1)] = vy;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 2)] = vz;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 3)] = rho;
}
- if(quantities[int(Statistic::Means)])
+ if (quantities[int(Statistic::Means)])
{
-
uint arrOff = quantityArrayOffsets[int(Statistic::Means)];
- real vx_m_old = quantityArray[(arrOff+0)*nPoints+node];
- real vy_m_old = quantityArray[(arrOff+1)*nPoints+node];
- real vz_m_old = quantityArray[(arrOff+2)*nPoints+node];
- real rho_m_old = quantityArray[(arrOff+3)*nPoints+node];
-
- real vx_m_new = ( (n-1)*vx_m_old + vx )*inv_n;
- real vy_m_new = ( (n-1)*vy_m_old + vy )*inv_n;
- real vz_m_new = ( (n-1)*vz_m_old + vz )*inv_n;
- real rho_m_new = ( (n-1)*rho_m_old+ rho )*inv_n;
-
- quantityArray[(arrOff+0)*nPoints+node] = vx_m_new;
- quantityArray[(arrOff+1)*nPoints+node] = vy_m_new;
- quantityArray[(arrOff+2)*nPoints+node] = vz_m_new;
- quantityArray[(arrOff+3)*nPoints+node] = rho_m_new;
-
- if(quantities[int(Statistic::Variances)])
+ real vx_m_old = quantityArray[calcArrayIndex(node, nPoints, oldTimestepInTimeseries, nTimesteps, arrOff + 0)];
+ real vy_m_old = quantityArray[calcArrayIndex(node, nPoints, oldTimestepInTimeseries, nTimesteps, arrOff + 1)];
+ real vz_m_old = quantityArray[calcArrayIndex(node, nPoints, oldTimestepInTimeseries, nTimesteps, arrOff + 2)];
+ real rho_m_old = quantityArray[calcArrayIndex(node, nPoints, oldTimestepInTimeseries, nTimesteps, arrOff + 3)];
+
+ real vx_m_new = ((n - 1) * vx_m_old + vx) * inv_n;
+ real vy_m_new = ((n - 1) * vy_m_old + vy) * inv_n;
+ real vz_m_new = ((n - 1) * vz_m_old + vz) * inv_n;
+ real rho_m_new = ((n - 1) * rho_m_old + rho) * inv_n;
+
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 0)] = vx_m_new;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 1)] = vy_m_new;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 2)] = vz_m_new;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 3)] = rho_m_new;
+
+ if (quantities[int(Statistic::Variances)])
{
arrOff = quantityArrayOffsets[int(Statistic::Variances)];
- real vx_var_old = quantityArray[(arrOff+0)*nPoints+node];
- real vy_var_old = quantityArray[(arrOff+1)*nPoints+node];
- real vz_var_old = quantityArray[(arrOff+2)*nPoints+node];
- real rho_var_old = quantityArray[(arrOff+3)*nPoints+node];
+ real vx_var_old = quantityArray[calcArrayIndex(node, nPoints, oldTimestepInTimeseries, nTimesteps, arrOff + 0)];
+ real vy_var_old = quantityArray[calcArrayIndex(node, nPoints, oldTimestepInTimeseries, nTimesteps, arrOff + 1)];
+ real vz_var_old = quantityArray[calcArrayIndex(node, nPoints, oldTimestepInTimeseries, nTimesteps, arrOff + 2)];
+ real rho_var_old = quantityArray[calcArrayIndex(node, nPoints, oldTimestepInTimeseries, nTimesteps, arrOff + 3)];
- real vx_var_new = ( (n-1)*(vx_var_old )+(vx - vx_m_old )*(vx - vx_m_new ) )*inv_n;
- real vy_var_new = ( (n-1)*(vy_var_old )+(vy - vy_m_old )*(vy - vy_m_new ) )*inv_n;
- real vz_var_new = ( (n-1)*(vz_var_old )+(vz - vz_m_old )*(vz - vz_m_new ) )*inv_n;
- real rho_var_new = ( (n-1)*(rho_var_old)+(rho - rho_m_old)*(rho - rho_m_new) )*inv_n;
+ real vx_var_new = ((n - 1) * (vx_var_old) + (vx - vx_m_old) * (vx - vx_m_new)) * inv_n;
+ real vy_var_new = ((n - 1) * (vy_var_old) + (vy - vy_m_old) * (vy - vy_m_new)) * inv_n;
+ real vz_var_new = ((n - 1) * (vz_var_old) + (vz - vz_m_old) * (vz - vz_m_new)) * inv_n;
+ real rho_var_new = ((n - 1) * (rho_var_old) + (rho - rho_m_old) * (rho - rho_m_new)) * inv_n;
- quantityArray[(arrOff+0)*nPoints+node] = vx_var_new;
- quantityArray[(arrOff+1)*nPoints+node] = vy_var_new;
- quantityArray[(arrOff+2)*nPoints+node] = vz_var_new;
- quantityArray[(arrOff+3)*nPoints+node] = rho_var_new;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 0)] = vx_var_new;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 1)] = vy_var_new;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 2)] = vz_var_new;
+ quantityArray[calcArrayIndex(node, nPoints, timestepInTimeseries, nTimesteps, arrOff + 3)] = rho_var_new;
}
}
}
__global__ void calcQuantitiesKernel( uint* pointIndices,
- uint nPoints, uint n,
+ uint nPoints, uint oldTimestepInTimeseries, uint timestepInTimeseries, uint timestepInAverage, uint nTimesteps,
real* vx, real* vy, real* vz, real* rho,
uint* neighborX, uint* neighborY, uint* neighborZ,
bool* quantities,
uint* quantityArrayOffsets, real* quantityArray
- )
+ )
{
const uint x = threadIdx.x;
const uint y = blockIdx.x;
@@ -132,12 +155,12 @@ __global__ void calcQuantitiesKernel( uint* pointIndices,
u_interpZ = vz[k];
rho_interp = rho[k];
- calculatePointwiseQuantities(n, quantityArray, quantities, quantityArrayOffsets, nPoints, node, u_interpX, u_interpY, u_interpZ, rho_interp);
+ calculatePointwiseQuantities(oldTimestepInTimeseries, timestepInTimeseries, timestepInAverage, nTimesteps, quantityArray, quantities, quantityArrayOffsets, nPoints, node, u_interpX, u_interpY, u_interpZ, rho_interp);
}
__global__ void interpAndCalcQuantitiesKernel( uint* pointIndices,
- uint nPoints, uint n,
+ uint nPoints, uint oldTimestepInTimeseries, uint timestepInTimeseries, uint timestepInAverage, uint nTimesteps,
real* distX, real* distY, real* distZ,
real* vx, real* vy, real* vz, real* rho,
uint* neighborX, uint* neighborY, uint* neighborZ,
@@ -173,7 +196,7 @@ __global__ void interpAndCalcQuantitiesKernel( uint* pointIndices,
u_interpZ = trilinearInterpolation( dW, dE, dN, dS, dT, dB, k, ke, kn, kt, kne, kte, ktn, ktne, vz );
rho_interp = trilinearInterpolation( dW, dE, dN, dS, dT, dB, k, ke, kn, kt, kne, kte, ktn, ktne, rho );
- calculatePointwiseQuantities(n, quantityArray, quantities, quantityArrayOffsets, nPoints, node, u_interpX, u_interpY, u_interpZ, rho_interp);
+ calculatePointwiseQuantities(oldTimestepInTimeseries, timestepInTimeseries, timestepInAverage, nTimesteps, quantityArray, quantities, quantityArrayOffsets, nPoints, node, u_interpX, u_interpY, u_interpZ, rho_interp);
}
@@ -207,26 +230,28 @@ void Probe::init(Parameter* para, GridProvider* gridProvider, CudaMemoryManager*
pointCoordsX_level, pointCoordsY_level, pointCoordsZ_level,
level);
- this->addProbeStruct(cudaMemoryManager, probeIndices_level,
+ this->addProbeStruct(para, cudaMemoryManager, probeIndices_level,
distX_level, distY_level, distZ_level,
pointCoordsX_level, pointCoordsY_level, pointCoordsZ_level,
level);
+
+ if(this->outputTimeSeries) timeseriesFileNames.push_back(this->writeTimeseriesHeader(para, level));
}
}
-void Probe::addProbeStruct(CudaMemoryManager* cudaMemoryManager, std::vector<int>& probeIndices,
- std::vector<real>& distX, std::vector<real>& distY, std::vector<real>& distZ,
- std::vector<real>& pointCoordsX, std::vector<real>& pointCoordsY, std::vector<real>& pointCoordsZ,
- int level)
+void Probe::addProbeStruct( Parameter* para, CudaMemoryManager* cudaMemoryManager, std::vector<int>& probeIndices,
+ std::vector<real>& distX, std::vector<real>& distY, std::vector<real>& distZ,
+ std::vector<real>& pointCoordsX, std::vector<real>& pointCoordsY, std::vector<real>& pointCoordsZ,
+ int level)
{
probeParams[level] = SPtr<ProbeStruct>(new ProbeStruct);
- probeParams[level]->vals = 1;
+ probeParams[level]->nTimesteps = this->getNumberOfTimestepsInTimeseries(para, level);
probeParams[level]->nPoints = uint(pointCoordsX.size()); // Note, need to have both nPoints and nIndices because they differ in PlanarAverage
probeParams[level]->nIndices = uint(probeIndices.size());
- probeParams[level]->pointCoordsX = (real*)malloc(probeParams[level]->nPoints*sizeof(real));
- probeParams[level]->pointCoordsY = (real*)malloc(probeParams[level]->nPoints*sizeof(real));
- probeParams[level]->pointCoordsZ = (real*)malloc(probeParams[level]->nPoints*sizeof(real));
+ probeParams[level]->pointCoordsX = (real*)malloc(probeParams[level]->nPoints * sizeof(real));
+ probeParams[level]->pointCoordsY = (real*)malloc(probeParams[level]->nPoints * sizeof(real));
+ probeParams[level]->pointCoordsZ = (real*)malloc(probeParams[level]->nPoints * sizeof(real));
std::copy(pointCoordsX.begin(), pointCoordsX.end(), probeParams[level]->pointCoordsX);
std::copy(pointCoordsY.begin(), pointCoordsY.end(), probeParams[level]->pointCoordsY);
@@ -267,39 +292,57 @@ void Probe::addProbeStruct(CudaMemoryManager* cudaMemoryManager, std::vector<int
cudaMemoryManager->cudaAllocProbeQuantityArray(this, level);
- for(uint arr=0; arr<probeParams[level]->nArrays; arr++)
- {
- for( uint point=0; point<probeParams[level]->nPoints; point++)
- {
- probeParams[level]->quantitiesArrayH[arr*probeParams[level]->nPoints+point] = 0.0f;
- }
- }
+ std::fill_n(probeParams[level]->quantitiesArrayH, probeParams[level]->nArrays*probeParams[level]->nPoints*probeParams[level]->nTimesteps, c0o1);
+
if(this->hasDeviceQuantityArray)
cudaMemoryManager->cudaCopyProbeQuantityArrayHtoD(this, level);
+
}
void Probe::interact(Parameter* para, CudaMemoryManager* cudaMemoryManager, int level, uint t)
{
uint t_level = para->getTimeStep(level, t, false);
+ SPtr<ProbeStruct> probeStruct = this->getProbeStruct(level);
+
+ //!Skip empty probes
+ if(probeStruct->nPoints==0) return;
+
//! if tAvg==1 the probe will be evaluated in every sub-timestep of each respective level
//! else, the probe will only be evaluated in each synchronous time step tAvg
- uint tAvg_level = this->tAvg==1? this->tAvg: this->tAvg*pow(2,level);
+ uint level_coefficient = exp2(level);
- if(max(int(t_level) - int(this->tStartAvg*pow(2,level)), -1) % tAvg_level==0)
+ uint tAvg_level = this->tAvg == 1 ? this->tAvg : this->tAvg * level_coefficient;
+ uint tOut_level = this->tOut * level_coefficient;
+ uint tStartOut_level = this->tStartOut * level_coefficient;
+ uint tStartAvg_level = this->tStartAvg * level_coefficient;
+
+ uint tAfterStartAvg = t_level - tStartAvg_level;
+ uint tAfterStartOut = t_level - tStartOut_level;
+
+ if( (t > this->tStartAvg) && (tAfterStartAvg % tAvg_level == 0))
{
- SPtr<ProbeStruct> probeStruct = this->getProbeStruct(level);
this->calculateQuantities(probeStruct, para, t_level, level);
- if(t_level>=(this->tStartTmpAveraging*pow(2,level))) probeStruct->vals++;
+
+ if(t > this->tStartTmpAveraging) probeStruct->timestepInTimeAverage++;
+ if(this->outputTimeSeries && (t_level >= tStartOut_level)) probeStruct->timestepInTimeseries++;
}
//! output only in synchronous timesteps
- if(max(int(t_level) - int(this->tStartOut*pow(2,level)), -1) % int(this->tOut*pow(2,level)) == 0)
+ if( (t > this->tStartOut) && (tAfterStartOut % tOut_level == 0) )
{
if(this->hasDeviceQuantityArray)
cudaMemoryManager->cudaCopyProbeQuantityArrayDtoH(this, level);
this->write(para, level, t);
+
+ if(level == 0&& !this->outputTimeSeries) this->writeParallelFile(para, t);
+
+ if(this->outputTimeSeries)
+ {
+ probeStruct->lastTimestepInOldTimeseries = probeStruct->timestepInTimeseries > 0 ? probeStruct->timestepInTimeseries - 1: 0;
+ probeStruct->timestepInTimeseries = 0;
+ }
}
}
@@ -315,11 +358,6 @@ void Probe::free(Parameter* para, CudaMemoryManager* cudaMemoryManager)
}
}
-void Probe::getTaggedFluidNodes(Parameter *para, GridProvider* gridProvider)
-{
- // Do nothing
-};
-
void Probe::addStatistic(Statistic variable)
{
@@ -335,22 +373,32 @@ void Probe::addStatistic(Statistic variable)
}
}
+template<typename T>
+std::string nameComponent(std::string name, T value)
+{
+ return "_" + name + "_" + StringUtil::toString<T>(value);
+}
+
std::string Probe::makeParallelFileName(int id, int t)
{
- return this->probeName + "_bin_ID_" + StringUtil::toString<int>(id)
- + "_t_" + StringUtil::toString<int>(t)
- + ".vtk";
+ return this->probeName + "_bin" + nameComponent<int>("ID", id) + nameComponent<int>("t", t) + ".vtk";
+
}
std::string Probe::makeGridFileName(int level, int id, int t, uint part)
{
- return this->probeName + "_bin_lev_" + StringUtil::toString<int>(level)
- + "_ID_" + StringUtil::toString<int>(id)
- + "_Part_" + StringUtil::toString<int>(part)
- + "_t_" + StringUtil::toString<int>(t)
- + ".vtk";
+ return this->probeName + "_bin" + nameComponent<int>("lev", level)
+ + nameComponent<int>("ID", id)
+ + nameComponent<int>("Part", part)
+ + nameComponent<int>("t", t) + ".vtk";
}
+std::string Probe::makeTimeseriesFileName(int level, int id)
+{
+ return this->probeName + "_timeseries" + nameComponent<int>("lev", level)
+ + nameComponent<int>("ID", id)
+ + ".txt";
+}
void Probe::addAllAvailableStatistics()
{
for( int var=0; var < int(Statistic::LAST); var++)
@@ -362,16 +410,23 @@ void Probe::addAllAvailableStatistics()
void Probe::write(Parameter* para, int level, int t)
{
- int t_write = this->fileNameLU ? t: t/this->tOut;
+ if(this->outputTimeSeries)
+ {
+ this->appendTimeseriesFile(para, level, t);
+ }
+ else
+ {
+ int t_write = this->fileNameLU ? t: t/this->tOut;
- const uint numberOfParts = this->getProbeStruct(level)->nPoints / para->getlimitOfNodesForVTK() + 1;
+ const uint numberOfParts = this->getProbeStruct(level)->nPoints / para->getLimitOfNodesForVTK() + 1;
- std::vector<std::string> fnames;
- for (uint i = 1; i <= numberOfParts; i++)
- {
- this->writeGridFile(para, level, t_write, i);
+ std::vector<std::string> fnames;
+ for (uint i = 1; i <= numberOfParts; i++)
+ {
+ this->writeGridFile(para, level, t_write, i);
+ }
}
- if(level == 0&& !this->outputTimeSeries) this->writeParallelFile(para, t);
+
}
void Probe::writeParallelFile(Parameter* para, int t)
@@ -398,8 +453,8 @@ void Probe::writeGridFile(Parameter* para, int level, int t, uint part)
SPtr<ProbeStruct> probeStruct = this->getProbeStruct(level);
- uint startpos = (part-1) * para->getlimitOfNodesForVTK();
- uint sizeOfNodes = min(para->getlimitOfNodesForVTK(), probeStruct->nPoints - startpos);
+ uint startpos = (part-1) * para->getLimitOfNodesForVTK();
+ uint sizeOfNodes = min(para->getLimitOfNodesForVTK(), probeStruct->nPoints - startpos);
uint endpos = startpos + sizeOfNodes;
//////////////////////////////////////////////////////////////////////////
@@ -414,25 +469,28 @@ void Probe::writeGridFile(Parameter* para, int level, int t, uint part)
for( auto it=nodedata.begin(); it!=nodedata.end(); it++) it->resize(sizeOfNodes);
- for( int var=0; var < int(Statistic::LAST); var++){
+ uint arrLen = probeStruct->nPoints;
+ int nTimesteps = probeStruct->nTimesteps;
+ int timestep = probeStruct->timestepInTimeseries;
+
+ for( int var=0; var < int(Statistic::LAST); var++)
+ {
if(this->quantities[var])
{
- Statistic statistic = static_cast<Statistic>(var);
- real coeff;
+ Statistic statistic = static_cast<Statistic>(var);
std::vector<PostProcessingVariable> postProcessingVariables = this->getPostProcessingVariables(statistic);
uint n_arrs = uint(postProcessingVariables.size());
uint arrOff = probeStruct->arrayOffsetsH[var];
- uint arrLen = probeStruct->nPoints;
for(uint arr=0; arr<n_arrs; arr++)
{
- coeff = postProcessingVariables[arr].conversionFactor(level);
+ real coeff = postProcessingVariables[arr].conversionFactor(level);
for (uint pos = startpos; pos < endpos; pos++)
{
- nodedata[arrOff+arr][pos-startpos] = double(probeStruct->quantitiesArrayH[(arrOff+arr)*arrLen+pos]*coeff);
+ nodedata[arrOff+arr][pos-startpos] = double(probeStruct->quantitiesArrayH[calcArrayIndex(pos, arrLen, timestep, nTimesteps, arrOff+arr)]*coeff);
}
}
}
@@ -441,6 +499,91 @@ void Probe::writeGridFile(Parameter* para, int level, int t, uint part)
this->fileNamesForCollectionFile.push_back(fullName.substr(fullName.find_last_of('/') + 1));
}
+std::string Probe::writeTimeseriesHeader(Parameter* para, int level)
+{
+/*
+File Layout:
+TimeseriesOutput
+Quantities: Quant1 Quant2 Quant3
+Positions:
+point1.x, point1.y, point1.z
+point2.x, point2.y, point2.z
+...
+t0 point1.quant1 point2.quant1 ... point1.quant2 point2.quant2 ...
+t1 point1.quant1 point2.quant1 ... point1.quant2 point2.quant2 ...
+*/
+ auto probeStruct = this->getProbeStruct(level);
+ std::string fname = this->outputPath + "/" + this->makeTimeseriesFileName(level, para->getMyProcessID());
+ std::ofstream out(fname.c_str(), std::ios::out | std::ios::binary);
+
+ if(!out.is_open()) throw std::runtime_error("Could not open timeseries file!");
+
+ out << "TimeseriesOutput \n";
+ out << "Quantities: ";
+ for(std::string name : getVarNames())
+ out << name << ", ";
+ out << "\n";
+ out << "Number of points in this file: \n";
+ out << probeStruct->nPoints << "\n";
+ out << "Positions: x, y, z\n";
+ for( uint i=0; i<probeStruct->nPoints; i++)
+ out << probeStruct->pointCoordsX[i] << ", " << probeStruct->pointCoordsY[i] << ", " << probeStruct->pointCoordsZ[i] << "\n";
+
+ out.close();
+
+ return fname;
+}
+
+void Probe::appendTimeseriesFile(Parameter* para, int level, int t)
+{
+ std::ofstream out(this->timeseriesFileNames[level], std::ios::app | std::ios::binary);
+
+ uint t_level = para->getTimeStep(level, t, false);
+ uint tAvg_level = this->tAvg==1 ? this->tAvg: this->tAvg*exp2(-level);
+
+ real dt = para->getTimeRatio()*tAvg_level;
+ auto probeStruct = this->getProbeStruct(level);
+
+ real t_start = ( t-this->tOut )*para->getTimeRatio();
+
+ int vals_per_timestep = probeStruct->nPoints*probeStruct->nArrays+1;
+
+ real* timestep_array = (real*) malloc(vals_per_timestep*sizeof(real));
+
+ for(uint timestep=0; timestep<probeStruct->timestepInTimeseries; timestep++)
+ {
+ int val = 0;
+ timestep_array[val] = t_start+timestep*dt;
+ val++;
+
+ for( int var=0; var < int(Statistic::LAST); var++)
+ {
+ if(!this->quantities[var]) continue;
+
+ Statistic statistic = static_cast<Statistic>(var);
+ std::vector<PostProcessingVariable> postProcessingVariables = this->getPostProcessingVariables(statistic);
+ uint n_arrs = uint(postProcessingVariables.size());
+
+ uint arrOff = probeStruct->arrayOffsetsH[var];
+
+ for(uint arr=0; arr<n_arrs; arr++)
+ {
+ real coeff = postProcessingVariables[arr].conversionFactor(level);
+ for(uint point=0; point<probeStruct->nPoints; point++)
+ {
+ timestep_array[val] = probeStruct->quantitiesArrayH[calcArrayIndex(point, probeStruct->nPoints, timestep, probeStruct->nTimesteps, arrOff+arr)]*coeff;
+ val++;
+ }
+ }
+
+ }
+ out.write((char*) timestep_array, sizeof(real)*vals_per_timestep);
+ }
+ out.close();
+}
+
+
+
std::vector<std::string> Probe::getVarNames()
{
std::vector<std::string> varNames;
@@ -454,4 +597,4 @@ std::vector<std::string> Probe::getVarNames()
}
}
return varNames;
-}
\ No newline at end of file
+}
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h
index aaf294e87d23c64707a16692b9337d6e9ff9c896..c7391e2a3d6b858facfd4fba094d7942f2bf4505 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h
@@ -100,7 +100,11 @@ typedef struct PostProcessingVariable{
} PostProcessingVariable;
struct ProbeStruct{
- uint nPoints, nIndices, nArrays, vals;
+ uint nPoints, nIndices, nArrays;
+ uint nTimesteps=1;
+ uint timestepInTimeseries=0;
+ uint timestepInTimeAverage=0;
+ uint lastTimestepInOldTimeseries=0;
uint *pointIndicesH, *pointIndicesD;
real *pointCoordsX, *pointCoordsY, *pointCoordsZ;
bool hasDistances=false;
@@ -110,9 +114,10 @@ struct ProbeStruct{
uint *arrayOffsetsH, *arrayOffsetsD;
bool isEvenTAvg = true;
};
+__host__ __device__ int calcArrayIndex(int node, int nNodes, int timestep, int nTimesteps, int array);
__global__ void calcQuantitiesKernel( uint* pointIndices,
- uint nPoints, uint n,
+ uint nPoints, uint oldTimestepInTimeseries, uint timestepInTimeseries, uint timestepInAverage, uint nTimesteps,
real* vx, real* vy, real* vz, real* rho,
uint* neighborX, uint* neighborY, uint* neighborZ,
bool* quantities,
@@ -120,7 +125,7 @@ __global__ void calcQuantitiesKernel( uint* pointIndices,
);
__global__ void interpAndCalcQuantitiesKernel( uint* pointIndices,
- uint nPoints, uint n,
+ uint nPoints, uint oldTimestepInTimeseries, uint timestepInTimeseries, uint timestepInAverage, uint nTimesteps,
real* distX, real* distY, real* distZ,
real* vx, real* vy, real* vz, real* rho,
uint* neighborX, uint* neighborY, uint* neighborZ,
@@ -128,6 +133,7 @@ __global__ void interpAndCalcQuantitiesKernel( uint* pointIndices,
uint* quantityArrayOffsets, real* quantityArray
);
+uint calcOldTimestep(uint currentTimestep, uint lastTimestepInOldSeries);
class Probe : public PreCollisionInteractor
{
@@ -135,13 +141,13 @@ public:
Probe(
const std::string _probeName,
const std::string _outputPath,
- uint _tStartAvg,
- uint _tStartTmpAvg,
- uint _tAvg,
- uint _tStartOut,
- uint _tOut,
- bool _hasDeviceQuantityArray,
- bool _outputTimeSeries
+ const uint _tStartAvg,
+ const uint _tStartTmpAvg,
+ const uint _tAvg,
+ const uint _tStartOut,
+ const uint _tOut,
+ const bool _hasDeviceQuantityArray,
+ const bool _outputTimeSeries
): probeName(_probeName),
outputPath(_outputPath),
tStartAvg(_tStartAvg),
@@ -153,13 +159,12 @@ public:
outputTimeSeries(_outputTimeSeries),
PreCollisionInteractor()
{
- if (_tStartOut<_tStartAvg) throw std::runtime_error("Probe: tStartOut must be larger than tStartAvg!");
+ if (tStartOut < tStartAvg) throw std::runtime_error("Probe: tStartOut must be larger than tStartAvg!");
}
void init(Parameter* para, GridProvider* gridProvider, CudaMemoryManager* cudaMemoryManager) override;
void interact(Parameter* para, CudaMemoryManager* cudaMemoryManager, int level, uint t) override;
void free(Parameter* para, CudaMemoryManager* cudaMemoryManager) override;
- virtual void getTaggedFluidNodes(Parameter *para, GridProvider* gridProvider) override;
SPtr<ProbeStruct> getProbeStruct(int level){ return this->probeParams[level]; }
@@ -170,7 +175,6 @@ public:
uint getTStartTmpAveraging(){return this->tStartTmpAveraging;}
void setFileNameToNOut(){this->fileNameLU = false;}
- void setTStartTmpAveraging(uint _tStartTmpAveraging){this->tStartTmpAveraging = _tStartTmpAveraging;}
protected:
virtual WbWriterVtkXmlBinary* getWriter(){ return WbWriterVtkXmlBinary::getInstance(); };
@@ -185,7 +189,7 @@ private:
std::vector<real>& distX_level, std::vector<real>& distY_level, std::vector<real>& distZ_level,
std::vector<real>& pointCoordsX_level, std::vector<real>& pointCoordsY_level, std::vector<real>& pointCoordsZ_level,
int level) = 0;
- void addProbeStruct(CudaMemoryManager* cudaMemoryManager, std::vector<int>& probeIndices,
+ void addProbeStruct(Parameter* para, CudaMemoryManager* cudaMemoryManager, std::vector<int>& probeIndices,
std::vector<real>& distX, std::vector<real>& distY, std::vector<real>& distZ,
std::vector<real>& pointCoordsX, std::vector<real>& pointCoordsY, std::vector<real>& pointCoordsZ,
int level);
@@ -194,10 +198,15 @@ private:
virtual void write(Parameter* para, int level, int t);
virtual void writeParallelFile(Parameter* para, int t);
virtual void writeGridFile(Parameter* para, int level, int t, uint part);
+ std::string writeTimeseriesHeader(Parameter* para, int level);
+ void appendTimeseriesFile(Parameter* para, int level, int t);
std::vector<std::string> getVarNames();
std::string makeGridFileName(int level, int id, int t, uint part);
std::string makeParallelFileName(int id, int t);
+ std::string makeTimeseriesFileName(int leve, int id);
+
+ virtual uint getNumberOfTimestepsInTimeseries(Parameter* para, int level){ return 1; }
protected:
const std::string probeName;
@@ -205,20 +214,19 @@ protected:
std::vector<SPtr<ProbeStruct>> probeParams;
bool quantities[int(Statistic::LAST)] = {};
- bool hasDeviceQuantityArray; //!> flag initiating memCopy in Point and PlaneProbe. Other probes are only based on thrust reduce functions and therefore dont need explict memCopy in interact()
- bool outputTimeSeries; //!> flag initiating overwrite of output vtk files, skipping collection files and limiting the length of the written data to the current time step (currently only used for WallModelProbe)
+ const bool hasDeviceQuantityArray; //!> flag initiating memCopy in Point and PlaneProbe. Other probes are only based on thrust reduce functions and therefore dont need explict memCopy in interact()
+ const bool outputTimeSeries; //!> flag initiating time series output in Point and WallModelProbe.
std::vector<std::string> fileNamesForCollectionFile;
+ std::vector<std::string> timeseriesFileNames;
bool fileNameLU = true; //!> if true, written file name contains time step in LU, else is the number of the written probe files
protected:
- uint tStartAvg;
- uint tStartTmpAveraging; //!> only non-zero in PlanarAverageProbe and WallModelProbe to switch on Spatio-temporal averaging (while only doing spatial averaging for t<tStartTmpAveraging)
- uint tAvg; //! for tAvg==1 the probe will be evaluated in every sub-timestep of each respective level, else, the probe will only be evaluated in each synchronous time step
- uint tStartOut;
- uint tOut;
-
- uint tProbe = 0; //!> counter for number of probe evaluations. Only used when outputting timeseries
+ const uint tStartAvg;
+ const uint tStartTmpAveraging; //!> only non-zero in PlanarAverageProbe and WallModelProbe to switch on Spatio-temporal averaging (while only doing spatial averaging for t<tStartTmpAveraging)
+ const uint tAvg; //! for tAvg==1 the probe will be evaluated in every sub-timestep of each respective level, else, the probe will only be evaluated in each synchronous time step
+ const uint tStartOut;
+ const uint tOut;
std::function<real(int)> velocityRatio;
std::function<real(int)> densityRatio;
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.cu
index 3341111c134ace7ca6ff64eeb7f87b38f8014656..f52c666c920a049012888e8e1b71578e68d3da31 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.cu
@@ -10,63 +10,15 @@
#include <thrust/device_vector.h>
#include <thrust/reduce.h>
#include <thrust/device_ptr.h>
-#include <thrust/inner_product.h>
#include "Parameter/Parameter.h"
#include "DataStructureInitializer/GridProvider.h"
#include "GPU/CudaMemoryManager.h"
+#include "basics/constants/NumericConstants.h"
-
-///////////////////////////////////////////////////////////////////////////////////
-/// Functors for thrust reductions
-///////////////////////////////////////////////////////////////////////////////////
-
-template<typename T>
-struct pow2 : public thrust::unary_function<T,T>
-{
- __host__ __device__ T operator()(const T &x) const
- {
- return x * x;
- }
-};
-
-template<typename T>
-struct pow3 : public thrust::unary_function<T,T>
-{
- __host__ __device__ T operator()(const T &x) const
- {
- return x * x * x;
- }
-};
-
-template<typename T>
-struct pow4 : public thrust::unary_function<T,T>
-{
- __host__ __device__ T operator()(const T &x) const
- {
- return x * x * x * x;
- }
-};
-
-struct nth_moment
-{
- const float mean;
- const int n;
-
- nth_moment(float _mean, int _n) : mean(_mean), n(_n) {}
-
- __host__ __device__
- float operator()(const float& x) const {
-
- real fluctuation = x-mean;
- real moment = fluctuation;
- for(int i = 1; i<n; i++) moment *= fluctuation;
-
- return moment;
- }
-};
-
-
+using namespace vf::basics::constant;
+typedef thrust::device_vector<real>::iterator valIterator;
+typedef thrust::device_vector<uint>::iterator indIterator;
///////////////////////////////////////////////////////////////////////////////////
bool WallModelProbe::isAvailableStatistic(Statistic _variable)
{
@@ -156,16 +108,10 @@ void WallModelProbe::findPoints(Parameter* para, GridProvider* gridProvider, std
int level)
{
if ( !para->getHasWallModelMonitor()) throw std::runtime_error("WallModelProbe::findPoints(): !para->getHasWallModelMonitor() !");
-
- real dt = para->getTimeRatio();
- uint nt = uint((para->getTimestepEnd()-this->tStartAvg)/this->tAvg);
- for(uint t=0; t<nt; t++)
- {
- pointCoordsX_level.push_back(dt*(t*this->tAvg)+this->tStartAvg); // x coord will serve as time in this probe
- pointCoordsY_level.push_back(0);
- pointCoordsZ_level.push_back(0);
- }
+ pointCoordsX_level.push_back(0);
+ pointCoordsY_level.push_back(0);
+ pointCoordsZ_level.push_back(0);
if(this->evaluatePressureGradient)
{
@@ -183,118 +129,109 @@ void WallModelProbe::findPoints(Parameter* para, GridProvider* gridProvider, std
///////////////////////////////////////////////////////////////////////////////////
+template<typename T>
+T spatial_mean(T* device_pointer, uint numberOfPoints)
+{
+ thrust::device_ptr<T> thrust_pointer = thrust::device_pointer_cast(device_pointer);
+ return thrust::reduce(thrust_pointer, thrust_pointer+numberOfPoints)/real(numberOfPoints);
+}
+
+template<typename T>
+T index_based_spatial_mean(T* device_pointer, thrust::device_ptr<uint> indeces_ptr, uint numberOfIndeces)
+{
+ thrust::device_ptr<T> thrust_pointer = thrust::device_pointer_cast(device_pointer);
+
+ thrust::permutation_iterator<valIterator, indIterator> iter_begin(thrust_pointer, indeces_ptr);
+ thrust::permutation_iterator<valIterator, indIterator> iter_end (thrust_pointer, indeces_ptr+numberOfIndeces);
+ return thrust::reduce(iter_begin, iter_end)/real(numberOfIndeces);
+}
+
+template<typename T>
+T compute_and_save_mean(T* device_pointer, uint numberOfPoints, T* quantitiesArray, uint timestep, uint numberOfTimesteps, uint indexOfArray)
+{
+ T mean = spatial_mean(device_pointer, numberOfPoints);
+ quantitiesArray[calcArrayIndex(0, 1, timestep, numberOfTimesteps, indexOfArray)] = mean;
+ return mean;
+}
+
+template<typename T>
+T compute_and_save_index_based_mean(T* device_pointer, thrust::device_ptr<uint> indeces_ptr, uint numberOfIndices, T* quantitiesArray, uint timestep, uint numberOfTimesteps, uint indexOfArray)
+{
+ T mean = index_based_spatial_mean(device_pointer, indeces_ptr, numberOfIndices);
+ quantitiesArray[calcArrayIndex(0, 1, timestep, numberOfTimesteps, indexOfArray)] = mean;
+ return mean;
+}
+
+template<typename T>
+void temporal_average(T* quantitiesArray, T currentValue, uint currentTimestep, uint numberOfTimesteps, uint oldTimestep, uint indexOfArray, real invNumberOfAverages)
+{
+ T oldMean = quantitiesArray[calcArrayIndex(0, 1, oldTimestep, numberOfTimesteps, indexOfArray)];
+ quantitiesArray[calcArrayIndex(0, 1, currentTimestep, numberOfTimesteps, indexOfArray)] = oldMean + (currentValue-oldMean)*invNumberOfAverages;
+}
+
void WallModelProbe::calculateQuantities(SPtr<ProbeStruct> probeStruct, Parameter* para, uint t, int level)
{
bool doTmpAveraging = (t>this->getTStartTmpAveraging());
- real N = para->getParD(level)->stressBC.numberOfBCnodes;
- if(N<1) return; //Skipping levels without StressBC
- real n = (real)probeStruct->vals;
- int nPoints = probeStruct->nPoints;
-
- // Pointer casts to use device arrays in thrust reductions
- thrust::device_ptr<real> u_el_thrust = thrust::device_pointer_cast(para->getParD(level)->stressBC.Vx);
- thrust::device_ptr<real> v_el_thrust = thrust::device_pointer_cast(para->getParD(level)->stressBC.Vy);
- thrust::device_ptr<real> w_el_thrust = thrust::device_pointer_cast(para->getParD(level)->stressBC.Vz);
- thrust::device_ptr<real> u1_thrust = thrust::device_pointer_cast(para->getParD(level)->stressBC.Vx1);
- thrust::device_ptr<real> v1_thrust = thrust::device_pointer_cast(para->getParD(level)->stressBC.Vy1);
- thrust::device_ptr<real> w1_thrust = thrust::device_pointer_cast(para->getParD(level)->stressBC.Vz1);
- thrust::device_ptr<real> u_star_thrust = thrust::device_pointer_cast(para->getParD(level)->wallModel.u_star);
- thrust::device_ptr<real> Fx_thrust = thrust::device_pointer_cast(para->getParD(level)->wallModel.Fx);
- thrust::device_ptr<real> Fy_thrust = thrust::device_pointer_cast(para->getParD(level)->wallModel.Fy);
- thrust::device_ptr<real> Fz_thrust = thrust::device_pointer_cast(para->getParD(level)->wallModel.Fz);
- thrust::device_ptr<real> dpdx_thrust = thrust::device_pointer_cast(para->getParD(level)->forceX_SP);
- thrust::device_ptr<real> dpdy_thrust = thrust::device_pointer_cast(para->getParD(level)->forceY_SP);
- thrust::device_ptr<real> dpdz_thrust = thrust::device_pointer_cast(para->getParD(level)->forceZ_SP);
+ uint numberOfStressBCPoints = para->getParD(level)->stressBC.numberOfBCnodes;
+ if(numberOfStressBCPoints<1) return; //Skipping levels without StressBC
+ uint timestep = probeStruct->timestepInTimeseries;
+ real inv_n = c1o1/real(probeStruct->timestepInTimeAverage+1);
+ uint oldTimestep = calcOldTimestep(timestep, probeStruct->lastTimestepInOldTimeseries);
thrust::device_ptr<uint> indices_thrust = thrust::device_pointer_cast(probeStruct->pointIndicesD);
- typedef thrust::device_vector<real>::iterator valIterator;
- typedef thrust::device_vector<uint>::iterator indIterator;
- thrust::permutation_iterator<valIterator, indIterator> dpdx_iter_begin(dpdx_thrust, indices_thrust);
- thrust::permutation_iterator<valIterator, indIterator> dpdx_iter_end (dpdx_thrust, indices_thrust+probeStruct->nIndices);
- thrust::permutation_iterator<valIterator, indIterator> dpdy_iter_begin(dpdy_thrust, indices_thrust);
- thrust::permutation_iterator<valIterator, indIterator> dpdy_iter_end (dpdy_thrust, indices_thrust+probeStruct->nIndices);
- thrust::permutation_iterator<valIterator, indIterator> dpdz_iter_begin(dpdz_thrust, indices_thrust);
- thrust::permutation_iterator<valIterator, indIterator> dpdz_iter_end (dpdz_thrust, indices_thrust+probeStruct->nIndices);
if(probeStruct->quantitiesH[int(Statistic::SpatialMeans)])
{
- // Compute the instantaneous spatial means of the velocity moments
- real spatMean_u_el = thrust::reduce(u_el_thrust, u_el_thrust+N)/N;
- real spatMean_v_el = thrust::reduce(v_el_thrust, v_el_thrust+N)/N;
- real spatMean_w_el = thrust::reduce(w_el_thrust, w_el_thrust+N)/N;
- real spatMean_u1 = thrust::reduce(u1_thrust, u1_thrust+N)/N;
- real spatMean_v1 = thrust::reduce(v1_thrust, v1_thrust+N)/N;
- real spatMean_w1 = thrust::reduce(w1_thrust, w1_thrust+N)/N;
- real spatMean_u_star = thrust::reduce(u_star_thrust, u_star_thrust+N)/N;
- real spatMean_Fx = thrust::reduce(Fx_thrust, Fx_thrust+N)/N;
- real spatMean_Fy = thrust::reduce(Fy_thrust, Fy_thrust+N)/N;
- real spatMean_Fz = thrust::reduce(Fz_thrust, Fz_thrust+N)/N;
-
uint arrOff = probeStruct->arrayOffsetsH[int(Statistic::SpatialMeans)];
- probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+tProbe] = spatMean_u_el;
- probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+tProbe] = spatMean_v_el;
- probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+tProbe] = spatMean_w_el;
- probeStruct->quantitiesArrayH[(arrOff+3)*nPoints+tProbe] = spatMean_u1;
- probeStruct->quantitiesArrayH[(arrOff+4)*nPoints+tProbe] = spatMean_v1;
- probeStruct->quantitiesArrayH[(arrOff+5)*nPoints+tProbe] = spatMean_w1;
- probeStruct->quantitiesArrayH[(arrOff+6)*nPoints+tProbe] = spatMean_u_star;
- probeStruct->quantitiesArrayH[(arrOff+7)*nPoints+tProbe] = spatMean_Fx;
- probeStruct->quantitiesArrayH[(arrOff+8)*nPoints+tProbe] = spatMean_Fy;
- probeStruct->quantitiesArrayH[(arrOff+9)*nPoints+tProbe] = spatMean_Fz;
+ // Compute the instantaneous spatial means of the velocity moments
+ real spatMean_u_el = compute_and_save_mean(para->getParD(level)->stressBC.Vx , numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+0);
+ real spatMean_v_el = compute_and_save_mean(para->getParD(level)->stressBC.Vy , numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+1);
+ real spatMean_w_el = compute_and_save_mean(para->getParD(level)->stressBC.Vz , numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+2);
+ real spatMean_u1 = compute_and_save_mean(para->getParD(level)->stressBC.Vx1 , numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+3);
+ real spatMean_v1 = compute_and_save_mean(para->getParD(level)->stressBC.Vy1 , numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+4);
+ real spatMean_w1 = compute_and_save_mean(para->getParD(level)->stressBC.Vz1 , numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+5);
+ real spatMean_u_star = compute_and_save_mean(para->getParD(level)->wallModel.u_star, numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+6);
+ real spatMean_Fx = compute_and_save_mean(para->getParD(level)->wallModel.Fx , numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+7);
+ real spatMean_Fy = compute_and_save_mean(para->getParD(level)->wallModel.Fy , numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+8);
+ real spatMean_Fz = compute_and_save_mean(para->getParD(level)->wallModel.Fz , numberOfStressBCPoints, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+9);
real spatMean_dpdx;
real spatMean_dpdy;
real spatMean_dpdz;
if(this->evaluatePressureGradient)
{
- real N_fluid = (real)probeStruct->nIndices;
- spatMean_dpdx = thrust::reduce(dpdx_iter_begin, dpdx_iter_end)/N_fluid;
- spatMean_dpdy = thrust::reduce(dpdy_iter_begin, dpdy_iter_end)/N_fluid;
- spatMean_dpdz = thrust::reduce(dpdz_iter_begin, dpdz_iter_end)/N_fluid;
- probeStruct->quantitiesArrayH[(arrOff+10)*nPoints+tProbe] = spatMean_dpdx;
- probeStruct->quantitiesArrayH[(arrOff+11)*nPoints+tProbe] = spatMean_dpdy;
- probeStruct->quantitiesArrayH[(arrOff+12)*nPoints+tProbe] = spatMean_dpdz;
+ spatMean_dpdx = compute_and_save_index_based_mean(para->getParD(level)->forceX_SP, indices_thrust, probeStruct->nIndices, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+10);
+ spatMean_dpdy = compute_and_save_index_based_mean(para->getParD(level)->forceY_SP, indices_thrust, probeStruct->nIndices, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+11);
+ spatMean_dpdz = compute_and_save_index_based_mean(para->getParD(level)->forceZ_SP, indices_thrust, probeStruct->nIndices, probeStruct->quantitiesArrayH, timestep, probeStruct->nTimesteps, arrOff+12);
}
if(probeStruct->quantitiesH[int(Statistic::SpatioTemporalMeans)] && doTmpAveraging)
{
uint arrOff = probeStruct->arrayOffsetsH[int(Statistic::SpatioTemporalMeans)];
- real spatMean_u_el_old = probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+tProbe-1];
- real spatMean_v_el_old = probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+tProbe-1];
- real spatMean_w_el_old = probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+tProbe-1];
- real spatMean_u1_old = probeStruct->quantitiesArrayH[(arrOff+3)*nPoints+tProbe-1];
- real spatMean_v1_old = probeStruct->quantitiesArrayH[(arrOff+4)*nPoints+tProbe-1];
- real spatMean_w1_old = probeStruct->quantitiesArrayH[(arrOff+5)*nPoints+tProbe-1];
- real spatMean_u_star_old = probeStruct->quantitiesArrayH[(arrOff+6)*nPoints+tProbe-1];
- real spatMean_Fx_old = probeStruct->quantitiesArrayH[(arrOff+7)*nPoints+tProbe-1];
- real spatMean_Fy_old = probeStruct->quantitiesArrayH[(arrOff+8)*nPoints+tProbe-1];
- real spatMean_Fz_old = probeStruct->quantitiesArrayH[(arrOff+9)*nPoints+tProbe-1];
-
- probeStruct->quantitiesArrayH[(arrOff+0)*nPoints+tProbe] = spatMean_u_el_old + (spatMean_u_el-spatMean_u_el_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+1)*nPoints+tProbe] = spatMean_v_el_old + (spatMean_v_el-spatMean_v_el_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+2)*nPoints+tProbe] = spatMean_w_el_old + (spatMean_w_el-spatMean_w_el_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+3)*nPoints+tProbe] = spatMean_u1_old + (spatMean_u1-spatMean_u1_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+4)*nPoints+tProbe] = spatMean_v1_old + (spatMean_v1-spatMean_v1_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+5)*nPoints+tProbe] = spatMean_w1_old + (spatMean_w1-spatMean_w1_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+6)*nPoints+tProbe] = spatMean_u_star_old +(spatMean_u_star-spatMean_u_star_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+7)*nPoints+tProbe] = spatMean_Fx_old + (spatMean_Fx-spatMean_Fx_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+8)*nPoints+tProbe] = spatMean_Fy_old + (spatMean_Fy-spatMean_Fy_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+9)*nPoints+tProbe] = spatMean_Fz_old + (spatMean_Fz-spatMean_Fz_old)/n;
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_u_el , timestep, probeStruct->nTimesteps, oldTimestep, arrOff+0, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_v_el , timestep, probeStruct->nTimesteps, oldTimestep, arrOff+1, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_w_el , timestep, probeStruct->nTimesteps, oldTimestep, arrOff+2, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_u1 , timestep, probeStruct->nTimesteps, oldTimestep, arrOff+3, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_v1 , timestep, probeStruct->nTimesteps, oldTimestep, arrOff+4, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_w1 , timestep, probeStruct->nTimesteps, oldTimestep, arrOff+5, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_u_star, timestep, probeStruct->nTimesteps, oldTimestep, arrOff+6, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_Fx , timestep, probeStruct->nTimesteps, oldTimestep, arrOff+7, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_Fy , timestep, probeStruct->nTimesteps, oldTimestep, arrOff+8, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_Fz , timestep, probeStruct->nTimesteps, oldTimestep, arrOff+9, inv_n);
if(this->evaluatePressureGradient)
{
- real spatMean_dpdx_old = probeStruct->quantitiesArrayH[(arrOff+10)*nPoints+tProbe-1];
- real spatMean_dpdy_old = probeStruct->quantitiesArrayH[(arrOff+11)*nPoints+tProbe-1];
- real spatMean_dpdz_old = probeStruct->quantitiesArrayH[(arrOff+12)*nPoints+tProbe-1];
- probeStruct->quantitiesArrayH[(arrOff+10)*nPoints+tProbe] = spatMean_dpdx_old + (spatMean_dpdx-spatMean_dpdx_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+11)*nPoints+tProbe] = spatMean_dpdy_old + (spatMean_dpdy-spatMean_dpdy_old)/n;
- probeStruct->quantitiesArrayH[(arrOff+12)*nPoints+tProbe] = spatMean_dpdz_old + (spatMean_dpdz-spatMean_dpdz_old)/n;
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_dpdx, timestep, probeStruct->nTimesteps, oldTimestep, arrOff+10, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_dpdy, timestep, probeStruct->nTimesteps, oldTimestep, arrOff+11, inv_n);
+ temporal_average(probeStruct->quantitiesArrayH, spatMean_dpdz, timestep, probeStruct->nTimesteps, oldTimestep, arrOff+12, inv_n);
}
}
}
-
-
- this->tProbe += 1;
getLastCudaError("WallModelProbe::calculateQuantities execution failed");
}
+uint WallModelProbe::getNumberOfTimestepsInTimeseries(Parameter* para, int level)
+{
+ return this->tOut*exp2(level)/this->tAvg+1;
+}
+
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.h
index 4ea90f74c7a0d57af4995e1b5874234967f1e901..c912656d2dcbb9551b8a156f7fe9818de0f315a4 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.h
@@ -81,6 +81,8 @@ private:
std::vector<real>& pointCoordsX_level, std::vector<real>& pointCoordsY_level, std::vector<real>& pointCoordsZ_level,
int level) override;
void calculateQuantities(SPtr<ProbeStruct> probeStruct, Parameter* para, uint t, int level) override;
+ void getTaggedFluidNodes(Parameter *para, GridProvider* gridProvider) override {};
+ uint getNumberOfTimestepsInTimeseries(Parameter* para, int level) override;
private:
bool outputStress = false; //!> if true, output wall force is converted to a stress
diff --git a/src/lbm/BGK.cpp b/src/lbm/BGK.cpp
index 5d1993c872b1aefea801e6e2d2c602a82ecd9281..b59572293e3ffd8f15e8edc864b2993e48b00296 100644
--- a/src/lbm/BGK.cpp
+++ b/src/lbm/BGK.cpp
@@ -2,10 +2,9 @@
#include <basics/DataTypes.h>
+#include <basics/constants/NumericConstants.h>
-#include "constants/NumericConstants.h"
#include "constants/D3Q27.h"
-
#include "MacroscopicQuantities.h"
namespace vf::lbm
diff --git a/src/lbm/CumulantChimera.cpp b/src/lbm/CumulantChimera.cpp
index f8e11d468471efe96b3d9e17c356b8c1a3d59ff8..f1257c4e579b36f868f3476282e79d44291750b1 100644
--- a/src/lbm/CumulantChimera.cpp
+++ b/src/lbm/CumulantChimera.cpp
@@ -1,12 +1,11 @@
-#include "CumulantChimera.h"
#include <cmath>
#include <basics/DataTypes.h>
+#include <basics/constants/NumericConstants.h>
-#include "constants/NumericConstants.h"
#include "constants/D3Q27.h"
-
+#include "CumulantChimera.h"
#include "Chimera.h"
#include "MacroscopicQuantities.h"
diff --git a/src/lbm/MacroscopicQuantities.h b/src/lbm/MacroscopicQuantities.h
index 751c874f1c240f5502ccaef5f6e540be1e5d28ff..e1b066a104874a95701ff3a77f6747884c5a54d7 100644
--- a/src/lbm/MacroscopicQuantities.h
+++ b/src/lbm/MacroscopicQuantities.h
@@ -9,8 +9,8 @@
#endif
#include <basics/DataTypes.h>
+#include <basics/constants/NumericConstants.h>
-#include "constants/NumericConstants.h"
#include "constants/D3Q27.h"
@@ -53,6 +53,14 @@ inline __host__ __device__ real getIncompressibleVelocityX3(const real *const &f
(((f[dir::DIR_0MP] - f[dir::DIR_0PM]) + (f[dir::DIR_0PP] - f[dir::DIR_0MM])) + ((f[dir::DIR_M0P] - f[dir::DIR_P0M]) + (f[dir::DIR_P0P] - f[dir::DIR_M0M]))) + (f[dir::DIR_00P] - f[dir::DIR_00M]));
}
+inline __host__ __device__ void getIncompressibleMacroscopicValues(const real *const &f /*[27]*/, real &rho, real &vx1, real &vx2, real &vx3)
+{
+ rho = getDensity(f);
+ vx1 = getIncompressibleVelocityX1(f);
+ vx2 = getIncompressibleVelocityX2(f);
+ vx3 = getIncompressibleVelocityX3(f);
+}
+
/*
@@ -75,6 +83,25 @@ inline __host__ __device__ real getCompressibleVelocityX3(const real *const &f27
return getIncompressibleVelocityX3(f27) / (rho + basics::constant::c1o1);
}
+inline __host__ __device__ void getCompressibleMacroscopicValues(const real *const &f /*[27]*/, real &drho, real& oneOverRho, real &vx1, real &vx2, real &vx3)
+{
+ drho = getDensity(f);
+ vx1 = getIncompressibleVelocityX1(f);
+ vx2 = getIncompressibleVelocityX2(f);
+ vx3 = getIncompressibleVelocityX3(f);
+ oneOverRho = vf::basics::constant::c1o1 / (drho + vf::basics::constant::c1o1);
+ vx1 *= oneOverRho;
+ vx2 *= oneOverRho;
+ vx3 *= oneOverRho;
+}
+
+inline __host__ __device__ void getCompressibleMacroscopicValues(const real *const &f /*[27]*/, real &drho, real &vx1, real &vx2, real &vx3)
+{
+ real oneOverRho;
+ getCompressibleMacroscopicValues(f, drho, oneOverRho, vx1, vx2, vx3);
+}
+
+
/*
* Pressure
*/
diff --git a/src/lbm/MacroscopicQuantitiesTests.cpp b/src/lbm/MacroscopicQuantitiesTests.cpp
index 382ec180e7a97749c4a005734a61f96ec7a146d5..b39387ae7ac741cc4dc36b4c58de4bad43052793 100644
--- a/src/lbm/MacroscopicQuantitiesTests.cpp
+++ b/src/lbm/MacroscopicQuantitiesTests.cpp
@@ -1,30 +1,43 @@
#include <gmock/gmock.h>
+#include <array>
#include "MacroscopicQuantities.h"
#include "constants/D3Q27.h"
+#include <basics/tests/testUtilities.h>
+
/*
* given distributions, which are all one.
*/
-real f[27] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+// real f[27] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+
+class MacroscopicQuantitiesTest : public testing::Test {
+
+ void SetUp() override {
+ f = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+ }
+
+ public:
+ std::array<real, 27> f;
+};
using namespace vf::lbm;
-TEST(MacroscopicQuantitiesTest, check_density)
+TEST_F(MacroscopicQuantitiesTest, check_density)
{
- const double density = getDensity(f);
+ const double density = getDensity(f.data());
const double expected_density = 27.;
ASSERT_THAT(density, testing::DoubleEq(expected_density));
}
-TEST(MacroscopicQuantitiesTest, whenFsAreEqual_velocityInEachDirectionShouldBeZero)
+TEST_F(MacroscopicQuantitiesTest, whenFsAreEqual_velocityInEachDirectionShouldBeZero)
{
- const double velocityX1 = getIncompressibleVelocityX1(f);
- const double velocityX2 = getIncompressibleVelocityX2(f);
- const double velocityX3 = getIncompressibleVelocityX3(f);
+ const double velocityX1 = getIncompressibleVelocityX1(f.data());
+ const double velocityX2 = getIncompressibleVelocityX2(f.data());
+ const double velocityX3 = getIncompressibleVelocityX3(f.data());
const double expected_velocity = 0.;
EXPECT_THAT(velocityX1, testing::DoubleEq(expected_velocity));
@@ -32,13 +45,13 @@ TEST(MacroscopicQuantitiesTest, whenFsAreEqual_velocityInEachDirectionShouldBeZe
EXPECT_THAT(velocityX3, testing::DoubleEq(expected_velocity));
}
-TEST(MacroscopicQuantitiesTest, givenAllFsAreOne_when_Eis2_velocityInX1ShouldBeOne)
+TEST_F(MacroscopicQuantitiesTest, givenAllFsAreOne_when_Eis2_velocityInX1ShouldBeOne)
{
f[dir::DIR_P00] = 2.;
- const double velocityX1 = getIncompressibleVelocityX1(f);
- const double velocityX2 = getIncompressibleVelocityX2(f);
- const double velocityX3 = getIncompressibleVelocityX3(f);
+ const double velocityX1 = getIncompressibleVelocityX1(f.data());
+ const double velocityX2 = getIncompressibleVelocityX2(f.data());
+ const double velocityX3 = getIncompressibleVelocityX3(f.data());
const double expected_velocity_x1 = 1.;
const double expected_velocity_x2 = 0.;
@@ -49,23 +62,41 @@ TEST(MacroscopicQuantitiesTest, givenAllFsAreOne_when_Eis2_velocityInX1ShouldBeO
EXPECT_THAT(velocityX3, testing::DoubleEq(expected_velocity_x3));
}
-TEST(MacroscopicQuantitiesTest, givenAllFsAreOne_when_Nis2_velocityInX2ShouldBeOne)
+TEST_F(MacroscopicQuantitiesTest, givenAllFsAreOne_when_Nis2_velocityInX2ShouldBeOne)
{
f[dir::DIR_0P0] = 2.;
- const double velocity = getIncompressibleVelocityX2(f);
+ const double velocity = getIncompressibleVelocityX2(f.data());
const double expected_velocity = 1.;
ASSERT_THAT(velocity, testing::DoubleEq(expected_velocity));
}
-TEST(MacroscopicQuantitiesTest, givenAllFsAreOne_when_Tis2_velocityInX3ShouldBeOne)
+TEST_F(MacroscopicQuantitiesTest, givenAllFsAreOne_when_Tis2_velocityInX3ShouldBeOne)
{
f[dir::DIR_00P] = 2.;
- const double velocity = getIncompressibleVelocityX3(f);
+ const double velocity = getIncompressibleVelocityX3(f.data());
const double expected_velocity = 1.;
ASSERT_THAT(velocity, testing::DoubleEq(expected_velocity));
}
+
+TEST_F(MacroscopicQuantitiesTest, givenAllFsAreOne_checkCompressibleValues)
+{
+ f[dir::DIR_P00] = 2.;
+
+ real rho{0}, vx1{0}, vx2{0}, vx3{0};
+ getCompressibleMacroscopicValues(f.data(), rho, vx1, vx2, vx3);
+
+ std::cout << getIncompressibleVelocityX1(f.data()) << std::endl;
+
+ const real expected_rho = 28.;
+ const real expected_velocity = (1. / (1 + expected_rho));
+
+ EXPECT_THAT(rho, RealEq(expected_rho));
+ EXPECT_THAT(vx1, RealEq(expected_velocity));
+ EXPECT_THAT(vx2, RealEq(0.));
+ EXPECT_THAT(vx3, RealEq(0.));
+}
diff --git a/src/lbm/refinement/Coefficients.h b/src/lbm/refinement/Coefficients.h
new file mode 100644
index 0000000000000000000000000000000000000000..441c2567327c34b67c52754e33c5087a4d3d253b
--- /dev/null
+++ b/src/lbm/refinement/Coefficients.h
@@ -0,0 +1,436 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//=======================================================================================
+#ifndef LBM_SCALING_HELPER_FUNCTIONS_H
+#define LBM_SCALING_HELPER_FUNCTIONS_H
+
+#ifndef __host__
+#define __host__
+#endif
+#ifndef __device__
+#define __device__
+#endif
+
+
+#include "lbm/constants/D3Q27.h"
+#include <basics/constants/NumericConstants.h>
+
+#include "lbm/KernelParameter.h"
+#include "lbm/MacroscopicQuantities.h"
+
+
+using namespace vf::basics::constant;
+using namespace vf::lbm::dir;
+
+namespace vf::lbm
+{
+
+// The Coefficients struct needs be created like this:
+// Coefficients coeffs;
+// MomentsOnSourceNodeSet momentsSet;
+// momentsSet.calculatePPP(f, omega);
+// ... and so on
+// Coefficients coeffs;
+// momentsSet.calculateCoefficients(coeffs);
+
+// Coefficient which are used in the interpolation
+struct Coefficients
+{
+ real a000, a100, a010, a001, a200, a020, a002, a110, a101, a011;
+ real b000, b100, b010, b001, b200, b020, b002, b110, b101, b011;
+ real c000, c100, c010, c001, c200, c020, c002, c110, c101, c011;
+ real d000, d100, d010, d001, d110, d101, d011;
+ real a111, b111, c111, d111;
+ real LaplaceRho;
+};
+
+
+// Private struct - is only used within the MomentsOnSourceNodeSet
+struct MomentsOnSourceNode
+{
+ real drho;
+ real velocityX;
+ real velocityY;
+ real velocityZ;
+ real kxyFromfcNEQ;
+ real kyzFromfcNEQ;
+ real kxzFromfcNEQ;
+ real kxxMyyFromfcNEQ;
+ real kxxMzzFromfcNEQ;
+
+ __host__ __device__ void calculate(const real* const f, const real omega)
+ {
+ // const real f_000 = f[dir::DIR_000];
+ const real fP00 = f[dir::DIR_P00];
+ const real fM00 = f[dir::DIR_M00];
+ const real f0P0 = f[dir::DIR_0P0];
+ const real f0M0 = f[dir::DIR_0M0];
+ const real f00P = f[dir::DIR_00P];
+ const real f00M = f[dir::DIR_00M];
+ const real fPP0 = f[dir::DIR_PP0];
+ const real fMM0 = f[dir::DIR_MM0];
+ const real fPM0 = f[dir::DIR_PM0];
+ const real fMP0 = f[dir::DIR_MP0];
+ const real fP0P = f[dir::DIR_P0P];
+ const real fM0M = f[dir::DIR_M0M];
+ const real fP0M = f[dir::DIR_P0M];
+ const real fM0P = f[dir::DIR_M0P];
+ const real f0PP = f[dir::DIR_0PP];
+ const real f0MM = f[dir::DIR_0MM];
+ const real f0PM = f[dir::DIR_0PM];
+ const real f0MP = f[dir::DIR_0MP];
+ const real fPPP = f[dir::DIR_PPP];
+ const real fMPP = f[dir::DIR_MPP];
+ const real fPMP = f[dir::DIR_PMP];
+ const real fMMP = f[dir::DIR_MMP];
+ const real fPPM = f[dir::DIR_PPM];
+ const real fMPM = f[dir::DIR_MPM];
+ const real fPMM = f[dir::DIR_PMM];
+ const real fMMM = f[dir::DIR_MMM];
+
+ real oneOverRho;
+ getCompressibleMacroscopicValues(f, this->drho, oneOverRho, this->velocityX, this->velocityY, this->velocityZ);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Calculate second order moments for interpolation
+ //!
+ // example: kxxMzz: moment, second derivative in x direction minus the second derivative in z direction
+
+ this->kxyFromfcNEQ = -c3o1 * omega *
+ ((fMM0 + fMMM + fMMP - fMP0 - fMPM - fMPP - fPM0 - fPMM - fPMP + fPP0 + fPPM + fPPP) *
+ oneOverRho -
+ ((this->velocityX * this->velocityY)));
+ this->kyzFromfcNEQ = -c3o1 * omega *
+ ((f0MM + fPMM + fMMM - f0MP - fPMP - fMMP - f0PM - fPPM - fMPM + f0PP + fPPP + fMPP) *
+ oneOverRho -
+ ((this->velocityY * this->velocityZ)));
+ this->kxzFromfcNEQ = -c3o1 * omega *
+ ((fM0M + fMMM + fMPM - fM0P - fMMP - fMPP - fP0M - fPMM - fPPM + fP0P + fPMP + fPPP) *
+ oneOverRho -
+ ((this->velocityX * this->velocityZ)));
+ this->kxxMyyFromfcNEQ = -c3o2 * omega *
+ ((fM0M + fM00 + fM0P - f0MM - f0M0 - f0MP - f0PM - f0P0 - f0PP + fP0M + fP00 + fP0P) *
+ oneOverRho -
+ ((this->velocityX * this->velocityX - this->velocityY * this->velocityY)));
+ this->kxxMzzFromfcNEQ = -c3o2 * omega *
+ ((fMM0 + fM00 + fMP0 - f0MM - f0MP - f00M - f00P - f0PM - f0PP + fPM0 + fP00 + fPP0) *
+ oneOverRho -
+ ((this->velocityX * this->velocityX - this->velocityZ * this->velocityZ)));
+ }
+
+};
+
+class MomentsOnSourceNodeSet
+{
+private:
+ vf::lbm::MomentsOnSourceNode momentsPPP;
+ vf::lbm::MomentsOnSourceNode momentsMPP;
+ vf::lbm::MomentsOnSourceNode momentsPMP;
+ vf::lbm::MomentsOnSourceNode momentsMMP;
+ vf::lbm::MomentsOnSourceNode momentsPPM;
+ vf::lbm::MomentsOnSourceNode momentsMPM;
+ vf::lbm::MomentsOnSourceNode momentsPMM;
+ vf::lbm::MomentsOnSourceNode momentsMMM;
+
+public:
+ __host__ __device__ void calculatePPP(const real *const f, const real omega)
+ {
+ momentsPPP.calculate(f, omega);
+ }
+
+ __host__ __device__ void calculateMPP(const real *const f, const real omega)
+ {
+ momentsMPP.calculate(f, omega);
+ }
+
+ __host__ __device__ void calculatePMP(const real *const f, const real omega)
+ {
+ momentsPMP.calculate(f, omega);
+ }
+
+ __host__ __device__ void calculateMMP(const real *const f, const real omega)
+ {
+ momentsMMP.calculate(f, omega);
+ }
+
+ __host__ __device__ void calculatePPM(const real *const f, const real omega)
+ {
+ momentsPPM.calculate(f, omega);
+ }
+
+ __host__ __device__ void calculateMPM(const real *const f, const real omega)
+ {
+ momentsMPM.calculate(f, omega);
+ }
+
+ __host__ __device__ void calculatePMM(const real *const f, const real omega)
+ {
+ momentsPMM.calculate(f, omega);
+ }
+
+ __host__ __device__ void calculateMMM(const real *const f, const real omega)
+ {
+ momentsMMM.calculate(f, omega);
+ }
+
+ __host__ __device__ void calculateCoefficients(Coefficients &coefficients, real xoff, real yoff, real zoff) const
+ {
+ real& a000 = coefficients.a000;
+ real& b000 = coefficients.b000;
+ real& c000 = coefficients.c000;
+ real& d000 = coefficients.d000;
+
+ real& a100 = coefficients.a100;
+ real& b100 = coefficients.b100;
+ real& c100 = coefficients.c100;
+ real& d100 = coefficients.d100;
+
+ real& a010 = coefficients.a010;
+ real& b010 = coefficients.b010;
+ real& c010 = coefficients.c010;
+ real& d010 = coefficients.d010;
+
+ real& a001 = coefficients.a001;
+ real& b001 = coefficients.b001;
+ real& c001 = coefficients.c001;
+ real& d001 = coefficients.d001;
+
+ real& d110 = coefficients.d110, &d101 = coefficients.d101, &d011 = coefficients.d011;
+
+ real& a200 = coefficients.a200, &a020 = coefficients.a020, &a002 = coefficients.a002;
+ real& b200 = coefficients.b200, &b020 = coefficients.b020, &b002 = coefficients.b002;
+ real& c200 = coefficients.c200, &c020 = coefficients.c020, &c002 = coefficients.c002;
+
+ real& a110 = coefficients.a110, &a101 = coefficients.a101, &a011 = coefficients.a011;
+ real& b110 = coefficients.b110, &b101 = coefficients.b101, &b011 = coefficients.b011;
+ real& c110 = coefficients.c110, &c101 = coefficients.c101, &c011 = coefficients.c011;
+
+ real &a111 = coefficients.a111, &b111 = coefficients.b111, &c111 = coefficients.c111, &d111 = coefficients.d111;
+
+ real &LaplaceRho = coefficients.LaplaceRho;
+
+ const real xoffsq = xoff * xoff;
+ const real yoffsq = yoff * yoff;
+ const real zoffsq = zoff * zoff;
+
+ const real drhoPPP = momentsPPP.drho, vx1PPP = momentsPPP.velocityX, vx2PPP = momentsPPP.velocityY, vx3PPP = momentsPPP.velocityZ;
+ const real drhoMPP = momentsMPP.drho, vx1MPP = momentsMPP.velocityX, vx2MPP = momentsMPP.velocityY, vx3MPP = momentsMPP.velocityZ;
+ const real drhoPMP = momentsPMP.drho, vx1PMP = momentsPMP.velocityX, vx2PMP = momentsPMP.velocityY, vx3PMP = momentsPMP.velocityZ;
+ const real drhoMMP = momentsMMP.drho, vx1MMP = momentsMMP.velocityX, vx2MMP = momentsMMP.velocityY, vx3MMP = momentsMMP.velocityZ;
+ const real drhoPPM = momentsPPM.drho, vx1PPM = momentsPPM.velocityX, vx2PPM = momentsPPM.velocityY, vx3PPM = momentsPPM.velocityZ;
+ const real drhoMPM = momentsMPM.drho, vx1MPM = momentsMPM.velocityX, vx2MPM = momentsMPM.velocityY, vx3MPM = momentsMPM.velocityZ;
+ const real drhoPMM = momentsPMM.drho, vx1PMM = momentsPMM.velocityX, vx2PMM = momentsPMM.velocityY, vx3PMM = momentsPMM.velocityZ;
+ const real drhoMMM = momentsMMM.drho, vx1MMM = momentsMMM.velocityX, vx2MMM = momentsMMM.velocityY, vx3MMM = momentsMMM.velocityZ;
+
+ // second order moments at the source nodes
+ const real kxyFromfcNEQPPP = momentsPPP.kxyFromfcNEQ, kyzFromfcNEQPPP = momentsPPP.kyzFromfcNEQ, kxzFromfcNEQPPP = momentsPPP.kxzFromfcNEQ, kxxMyyFromfcNEQPPP = momentsPPP.kxxMyyFromfcNEQ, kxxMzzFromfcNEQPPP = momentsPPP.kxxMzzFromfcNEQ;
+ const real kxyFromfcNEQMPP = momentsMPP.kxyFromfcNEQ, kyzFromfcNEQMPP = momentsMPP.kyzFromfcNEQ, kxzFromfcNEQMPP = momentsMPP.kxzFromfcNEQ, kxxMyyFromfcNEQMPP = momentsMPP.kxxMyyFromfcNEQ, kxxMzzFromfcNEQMPP = momentsMPP.kxxMzzFromfcNEQ;
+ const real kxyFromfcNEQPMP = momentsPMP.kxyFromfcNEQ, kyzFromfcNEQPMP = momentsPMP.kyzFromfcNEQ, kxzFromfcNEQPMP = momentsPMP.kxzFromfcNEQ, kxxMyyFromfcNEQPMP = momentsPMP.kxxMyyFromfcNEQ, kxxMzzFromfcNEQPMP = momentsPMP.kxxMzzFromfcNEQ;
+ const real kxyFromfcNEQMMP = momentsMMP.kxyFromfcNEQ, kyzFromfcNEQMMP = momentsMMP.kyzFromfcNEQ, kxzFromfcNEQMMP = momentsMMP.kxzFromfcNEQ, kxxMyyFromfcNEQMMP = momentsMMP.kxxMyyFromfcNEQ, kxxMzzFromfcNEQMMP = momentsMMP.kxxMzzFromfcNEQ;
+ const real kxyFromfcNEQPPM = momentsPPM.kxyFromfcNEQ, kyzFromfcNEQPPM = momentsPPM.kyzFromfcNEQ, kxzFromfcNEQPPM = momentsPPM.kxzFromfcNEQ, kxxMyyFromfcNEQPPM = momentsPPM.kxxMyyFromfcNEQ, kxxMzzFromfcNEQPPM = momentsPPM.kxxMzzFromfcNEQ;
+ const real kxyFromfcNEQMPM = momentsMPM.kxyFromfcNEQ, kyzFromfcNEQMPM = momentsMPM.kyzFromfcNEQ, kxzFromfcNEQMPM = momentsMPM.kxzFromfcNEQ, kxxMyyFromfcNEQMPM = momentsMPM.kxxMyyFromfcNEQ, kxxMzzFromfcNEQMPM = momentsMPM.kxxMzzFromfcNEQ;
+ const real kxyFromfcNEQPMM = momentsPMM.kxyFromfcNEQ, kyzFromfcNEQPMM = momentsPMM.kyzFromfcNEQ, kxzFromfcNEQPMM = momentsPMM.kxzFromfcNEQ, kxxMyyFromfcNEQPMM = momentsPMM.kxxMyyFromfcNEQ, kxxMzzFromfcNEQPMM = momentsPMM.kxxMzzFromfcNEQ;
+ const real kxyFromfcNEQMMM = momentsMMM.kxyFromfcNEQ, kyzFromfcNEQMMM = momentsMMM.kyzFromfcNEQ, kxzFromfcNEQMMM = momentsMMM.kxzFromfcNEQ, kxxMyyFromfcNEQMMM = momentsMMM.kxxMyyFromfcNEQ, kxxMzzFromfcNEQMMM = momentsMMM.kxxMzzFromfcNEQ;
+
+ a000 = c1o64 * (
+ c2o1 * (
+ ((kxyFromfcNEQMMM - kxyFromfcNEQPPP) + (kxyFromfcNEQMMP - kxyFromfcNEQPPM)) + ((kxyFromfcNEQPMM - kxyFromfcNEQMPP) + (kxyFromfcNEQPMP - kxyFromfcNEQMPM)) +
+ ((kxzFromfcNEQMMM - kxzFromfcNEQPPP) + (kxzFromfcNEQPPM - kxzFromfcNEQMMP)) + ((kxzFromfcNEQPMM - kxzFromfcNEQMPP) + (kxzFromfcNEQMPM - kxzFromfcNEQPMP)) +
+ ((vx2PPP + vx2MMM) + (vx2PPM + vx2MMP)) - ((vx2MPP + vx2PMM) + (vx2MPM + vx2PMP)) +
+ ((vx3PPP + vx3MMM) - (vx3PPM + vx3MMP)) + ((vx3PMP + vx3MPM) - (vx3MPP + vx3PMM))) +
+ c8o1 * (((vx1PPP + vx1MMM) + (vx1PPM + vx1MMP)) + ((vx1MPP + vx1PMM) + (vx1PMP + vx1MPM))) +
+ ((kxxMyyFromfcNEQMMM - kxxMyyFromfcNEQPPP) + (kxxMyyFromfcNEQMMP - kxxMyyFromfcNEQPPM)) +
+ ((kxxMyyFromfcNEQMPP - kxxMyyFromfcNEQPMM) + (kxxMyyFromfcNEQMPM - kxxMyyFromfcNEQPMP)) +
+ ((kxxMzzFromfcNEQMMM - kxxMzzFromfcNEQPPP) + (kxxMzzFromfcNEQMMP - kxxMzzFromfcNEQPPM)) +
+ ((kxxMzzFromfcNEQMPP - kxxMzzFromfcNEQPMM) + (kxxMzzFromfcNEQMPM - kxxMzzFromfcNEQPMP)));
+ b000 = c1o64 * (
+ c2o1 * (
+ ((kxxMyyFromfcNEQPPP - kxxMyyFromfcNEQMMM) + (kxxMyyFromfcNEQPPM - kxxMyyFromfcNEQMMP)) +
+ ((kxxMyyFromfcNEQMPP - kxxMyyFromfcNEQPMM) + (kxxMyyFromfcNEQMPM - kxxMyyFromfcNEQPMP)) +
+ ((kxyFromfcNEQMMM - kxyFromfcNEQPPP) + (kxyFromfcNEQMMP - kxyFromfcNEQPPM)) +
+ ((kxyFromfcNEQMPP - kxyFromfcNEQPMM) + (kxyFromfcNEQMPM - kxyFromfcNEQPMP)) +
+ ((kyzFromfcNEQMMM - kyzFromfcNEQPPP) + (kyzFromfcNEQPPM - kyzFromfcNEQMMP)) +
+ ((kyzFromfcNEQPMM - kyzFromfcNEQMPP) + (kyzFromfcNEQMPM - kyzFromfcNEQPMP)) +
+ ((vx1PPP + vx1MMM) + (vx1PPM + vx1MMP)) - ((vx1MPM + vx1MPP) + (vx1PMM + vx1PMP)) +
+ ((vx3PPP + vx3MMM) - (vx3PPM + vx3MMP)) + ((vx3MPP + vx3PMM) - (vx3MPM + vx3PMP))) +
+ c8o1 * (((vx2PPP + vx2MMM) + (vx2PPM + vx2MMP)) + ((vx2MPP + vx2PMM) + (vx2MPM + vx2PMP))) +
+ ((kxxMzzFromfcNEQMMM - kxxMzzFromfcNEQPPP) + (kxxMzzFromfcNEQMMP - kxxMzzFromfcNEQPPM)) +
+ ((kxxMzzFromfcNEQPMM - kxxMzzFromfcNEQMPP) + (kxxMzzFromfcNEQPMP - kxxMzzFromfcNEQMPM)));
+ c000 = c1o64 * (
+ c2o1 * (
+ ((kxxMzzFromfcNEQPPP - kxxMzzFromfcNEQMMM) + (kxxMzzFromfcNEQMMP - kxxMzzFromfcNEQPPM)) +
+ ((kxxMzzFromfcNEQMPP - kxxMzzFromfcNEQPMM) + (kxxMzzFromfcNEQPMP - kxxMzzFromfcNEQMPM)) +
+ ((kxzFromfcNEQMMM - kxzFromfcNEQPPP) + (kxzFromfcNEQMMP - kxzFromfcNEQPPM)) +
+ ((kxzFromfcNEQMPP - kxzFromfcNEQPMM) + (kxzFromfcNEQMPM - kxzFromfcNEQPMP)) +
+ ((kyzFromfcNEQMMM - kyzFromfcNEQPPP) + (kyzFromfcNEQMMP - kyzFromfcNEQPPM)) +
+ ((kyzFromfcNEQPMM - kyzFromfcNEQMPP) + (kyzFromfcNEQPMP - kyzFromfcNEQMPM)) +
+ ((vx1PPP + vx1MMM) - (vx1MMP + vx1PPM)) + ((vx1MPM + vx1PMP) - (vx1MPP + vx1PMM)) +
+ ((vx2PPP + vx2MMM) - (vx2MMP + vx2PPM)) + ((vx2MPP + vx2PMM) - (vx2MPM + vx2PMP))) +
+ c8o1 * (((vx3PPP + vx3MMM) + (vx3PPM + vx3MMP)) + ((vx3PMM + vx3MPP) + (vx3PMP + vx3MPM))) +
+ ((kxxMyyFromfcNEQMMM - kxxMyyFromfcNEQPPP) + (kxxMyyFromfcNEQPPM - kxxMyyFromfcNEQMMP)) +
+ ((kxxMyyFromfcNEQPMM - kxxMyyFromfcNEQMPP) + (kxxMyyFromfcNEQMPM - kxxMyyFromfcNEQPMP)));
+
+ a100 = c1o4 * (((vx1PPP - vx1MMM) + (vx1PPM - vx1MMP)) + ((vx1PMM - vx1MPP) + (vx1PMP - vx1MPM)));
+ b100 = c1o4 * (((vx2PPP - vx2MMM) + (vx2PPM - vx2MMP)) + ((vx2PMM - vx2MPP) + (vx2PMP - vx2MPM)));
+ c100 = c1o4 * (((vx3PPP - vx3MMM) + (vx3PPM - vx3MMP)) + ((vx3PMM - vx3MPP) + (vx3PMP - vx3MPM)));
+
+ a200 = c1o16 * (
+ c2o1 * (
+ ((vx2PPP + vx2MMM) + (vx2PPM - vx2MPP)) + ((vx2MMP - vx2PMM) - (vx2MPM + vx2PMP)) +
+ ((vx3PPP + vx3MMM) - (vx3PPM + vx3MPP)) + ((vx3MPM + vx3PMP) - (vx3MMP + vx3PMM))) +
+ ((kxxMyyFromfcNEQPPP - kxxMyyFromfcNEQMMM) + (kxxMyyFromfcNEQPPM - kxxMyyFromfcNEQMMP)) +
+ ((kxxMyyFromfcNEQPMM - kxxMyyFromfcNEQMPP) + (kxxMyyFromfcNEQPMP - kxxMyyFromfcNEQMPM)) +
+ ((kxxMzzFromfcNEQPPP - kxxMzzFromfcNEQMMM) + (kxxMzzFromfcNEQPPM - kxxMzzFromfcNEQMMP)) +
+ ((kxxMzzFromfcNEQPMM - kxxMzzFromfcNEQMPP) + (kxxMzzFromfcNEQPMP - kxxMzzFromfcNEQMPM)));
+ b200 = c1o8 * (
+ c2o1 * (
+ -((vx1PPP + vx1MMM) + (vx1PPM + vx1MMP)) + ((vx1MPP + vx1PMM) + (vx1MPM + vx1PMP))) +
+ ((kxyFromfcNEQPPP - kxyFromfcNEQMMM) + (kxyFromfcNEQPPM - kxyFromfcNEQMMP)) +
+ ((kxyFromfcNEQPMM - kxyFromfcNEQMPP) + (kxyFromfcNEQPMP - kxyFromfcNEQMPM)));
+ c200 = c1o8 * (
+ c2o1 * (
+ ((vx1PPM + vx1MMP) - (vx1PPP + vx1MMM)) + ((vx1MPP + vx1PMM) - (vx1MPM + vx1PMP))) +
+ ((kxzFromfcNEQPPP - kxzFromfcNEQMMM) + (kxzFromfcNEQPPM - kxzFromfcNEQMMP)) +
+ ((kxzFromfcNEQPMM - kxzFromfcNEQMPP) + (kxzFromfcNEQPMP - kxzFromfcNEQMPM)));
+
+ a010 = c1o4 * (((vx1PPP - vx1MMM) + (vx1PPM - vx1MMP)) + ((vx1MPP - vx1PMM) + (vx1MPM - vx1PMP)));
+ b010 = c1o4 * (((vx2PPP - vx2MMM) + (vx2PPM - vx2MMP)) + ((vx2MPP - vx2PMM) + (vx2MPM - vx2PMP)));
+ c010 = c1o4 * (((vx3PPP - vx3MMM) + (vx3PPM - vx3MMP)) + ((vx3MPP - vx3PMM) + (vx3MPM - vx3PMP)));
+
+ a020 = c1o8 * (
+ c2o1 * (-((vx2PPP + vx2MMM) + (vx2MMP + vx2PPM)) + ((vx2MPP + vx2PMM) + (vx2MPM + vx2PMP))) +
+ ((kxyFromfcNEQPPP - kxyFromfcNEQMMM) + (kxyFromfcNEQPPM - kxyFromfcNEQMMP)) +
+ ((kxyFromfcNEQMPP - kxyFromfcNEQPMM) + (kxyFromfcNEQMPM - kxyFromfcNEQPMP)));
+ b020 = c1o16 * (
+ c2o1 * (
+ ((kxxMyyFromfcNEQMMM - kxxMyyFromfcNEQPPP) + (kxxMyyFromfcNEQMMP - kxxMyyFromfcNEQPPM)) +
+ ((kxxMyyFromfcNEQPMM - kxxMyyFromfcNEQMPP) + (kxxMyyFromfcNEQPMP - kxxMyyFromfcNEQMPM)) +
+ ((vx1PPP + vx1MMM) + (vx1PPM + vx1MMP)) - ((vx1MPP + vx1PMM) + (vx1PMP + vx1MPM)) +
+ ((vx3PPP + vx3MMM) - (vx3PPM + vx3MMP)) + ((vx3MPP + vx3PMM) - (vx3MPM + vx3PMP))) +
+ ((kxxMzzFromfcNEQPPP - kxxMzzFromfcNEQMMM) + (kxxMzzFromfcNEQPPM - kxxMzzFromfcNEQMMP)) +
+ ((kxxMzzFromfcNEQMPP - kxxMzzFromfcNEQPMM) + (kxxMzzFromfcNEQMPM - kxxMzzFromfcNEQPMP)));
+ c020 = c1o8 * (
+ c2o1 * (((vx2MMP + vx2PPM) - (vx2PPP + vx2MMM)) + ((vx2PMP + vx2MPM) - (vx2MPP + vx2PMM))) +
+ ((kyzFromfcNEQPPP - kyzFromfcNEQMMM) + (kyzFromfcNEQPPM - kyzFromfcNEQMMP)) +
+ ((kyzFromfcNEQMPP - kyzFromfcNEQPMM) + (kyzFromfcNEQMPM - kyzFromfcNEQPMP)));
+
+ a001 = c1o4 * (((vx1PPP - vx1MMM) + (vx1MMP - vx1PPM)) + ((vx1MPP - vx1PMM) + (vx1PMP - vx1MPM)));
+ b001 = c1o4 * (((vx2PPP - vx2MMM) + (vx2MMP - vx2PPM)) + ((vx2MPP - vx2PMM) + (vx2PMP - vx2MPM)));
+ c001 = c1o4 * (((vx3PPP - vx3MMM) + (vx3MMP - vx3PPM)) + ((vx3MPP - vx3PMM) + (vx3PMP - vx3MPM)));
+
+ a002 = c1o8 * (
+ c2o1 * (((vx3PPM + vx3MMP) - (vx3PPP + vx3MMM)) + ((vx3MPP + vx3PMM) - (vx3PMP + vx3MPM))) +
+ ((kxzFromfcNEQPPP - kxzFromfcNEQMMM) + (kxzFromfcNEQMMP - kxzFromfcNEQPPM)) +
+ ((kxzFromfcNEQPMP - kxzFromfcNEQMPM) + (kxzFromfcNEQMPP - kxzFromfcNEQPMM)));
+ b002 = c1o8 * (
+ c2o1 * (((vx3PPM + vx3MMP) - (vx3PPP + vx3MMM)) + ((vx3MPM + vx3PMP) - (vx3PMM + vx3MPP))) +
+ ((kyzFromfcNEQPPP - kyzFromfcNEQMMM) + (kyzFromfcNEQMMP - kyzFromfcNEQPPM)) +
+ ((kyzFromfcNEQPMP - kyzFromfcNEQMPM) + (kyzFromfcNEQMPP - kyzFromfcNEQPMM)));
+ c002 = c1o16 * (
+ c2o1 * (
+ ((kxxMzzFromfcNEQMMM - kxxMzzFromfcNEQPPP) + (kxxMzzFromfcNEQPPM - kxxMzzFromfcNEQMMP)) +
+ ((kxxMzzFromfcNEQMPM - kxxMzzFromfcNEQPMP) + (kxxMzzFromfcNEQPMM - kxxMzzFromfcNEQMPP)) +
+ ((vx1PPP + vx1MMM) - (vx1MMP + vx1PPM)) + ((vx1MPM + vx1PMP) - (vx1PMM + vx1MPP)) +
+ ((vx2PPP + vx2MMM) - (vx2MMP + vx2PPM)) + ((vx2PMM + vx2MPP) - (vx2MPM + vx2PMP))) +
+ ((kxxMyyFromfcNEQPPP - kxxMyyFromfcNEQMMM) + (kxxMyyFromfcNEQMMP - kxxMyyFromfcNEQPPM)) +
+ ((kxxMyyFromfcNEQPMP - kxxMyyFromfcNEQMPM) + (kxxMyyFromfcNEQMPP - kxxMyyFromfcNEQPMM)));
+
+ a110 = c1o2 * (((vx1PPP + vx1MMM) + (vx1MMP + vx1PPM)) - ((vx1MPM + vx1PMP) + (vx1PMM + vx1MPP)));
+ b110 = c1o2 * (((vx2PPP + vx2MMM) + (vx2MMP + vx2PPM)) - ((vx2MPM + vx2PMP) + (vx2PMM + vx2MPP)));
+ c110 = c1o2 * (((vx3PPP + vx3MMM) + (vx3MMP + vx3PPM)) - ((vx3MPM + vx3PMP) + (vx3PMM + vx3MPP)));
+
+ a101 = c1o2 * (((vx1PPP + vx1MMM) - (vx1MMP + vx1PPM)) + ((vx1MPM + vx1PMP) - (vx1PMM + vx1MPP)));
+ b101 = c1o2 * (((vx2PPP + vx2MMM) - (vx2MMP + vx2PPM)) + ((vx2MPM + vx2PMP) - (vx2PMM + vx2MPP)));
+ c101 = c1o2 * (((vx3PPP + vx3MMM) - (vx3MMP + vx3PPM)) + ((vx3MPM + vx3PMP) - (vx3PMM + vx3MPP)));
+
+ a011 = c1o2 * (((vx1PPP + vx1MMM) - (vx1MMP + vx1PPM)) + ((vx1PMM + vx1MPP) - (vx1MPM + vx1PMP)));
+ b011 = c1o2 * (((vx2PPP + vx2MMM) - (vx2MMP + vx2PPM)) + ((vx2PMM + vx2MPP) - (vx2MPM + vx2PMP)));
+ c011 = c1o2 * (((vx3PPP + vx3MMM) - (vx3MMP + vx3PPM)) + ((vx3PMM + vx3MPP) - (vx3MPM + vx3PMP)));
+
+ a111 = ((vx1PPP - vx1MMM) + (vx1MMP - vx1PPM)) + ((vx1MPM - vx1PMP) + (vx1PMM - vx1MPP));
+ b111 = ((vx2PPP - vx2MMM) + (vx2MMP - vx2PPM)) + ((vx2MPM - vx2PMP) + (vx2PMM - vx2MPP));
+ c111 = ((vx3PPP - vx3MMM) + (vx3MMP - vx3PPM)) + ((vx3MPM - vx3PMP) + (vx3PMM - vx3MPP));
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ //!- Calculate coefficients for the polynomial interpolation of the pressure
+ //!
+ LaplaceRho =
+ ((xoff != c0o1) || (yoff != c0o1) || (zoff != c0o1))
+ ? c0o1 : -c3o1 * (a100 * a100 + b010 * b010 + c001 * c001) - c6o1 * (b100 * a010 + c100 * a001 + c010 * b001);
+ d000 = c1o8 * (((drhoPPP + drhoMMM) + (drhoPPM + drhoMMP)) + ((drhoPMM + drhoMPP) + (drhoPMP + drhoMPM)));
+ d100 = c1o4 * (((drhoPPP - drhoMMM) + (drhoPPM - drhoMMP)) + ((drhoPMM - drhoMPP) + (drhoPMP - drhoMPM)));
+ d010 = c1o4 * (((drhoPPP - drhoMMM) + (drhoPPM - drhoMMP)) + ((drhoMPP - drhoPMM) + (drhoMPM - drhoPMP)));
+ d001 = c1o4 * (((drhoPPP - drhoMMM) + (drhoMMP - drhoPPM)) + ((drhoMPP - drhoPMM) + (drhoPMP - drhoMPM)));
+ d110 = c1o2 * (((drhoPPP + drhoMMM) + (drhoPPM + drhoMMP)) - ((drhoPMM + drhoMPP) + (drhoPMP + drhoMPM)));
+ d101 = c1o2 * (((drhoPPP + drhoMMM) - (drhoPPM + drhoMMP)) + ((drhoPMP + drhoMPM) - (drhoPMM + drhoMPP)));
+ d011 = c1o2 * (((drhoPPP + drhoMMM) - (drhoPPM + drhoMMP)) + ((drhoPMM + drhoMPP) - (drhoPMP + drhoMPM)));
+
+ d111 = (((drhoPPP - drhoMMM) + (drhoMMP - drhoPPM)) + ((drhoPMM - drhoMPP) + (drhoMPM - drhoPMP)));
+
+ //////////////////////////////////////////////////////////////////////////
+ //! - Extrapolation for refinement in to the wall (polynomial coefficients)
+ //!
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ //
+ // x------x
+ // | |
+ // | ---+--->X
+ // | | |
+ // x------x |
+ // offset-vector
+ //
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ a000 = a000 + xoff * a100 + yoff * a010 + zoff * a001 + xoffsq * a200 + yoffsq * a020 + zoffsq * a002 +
+ xoff * yoff * a110 + xoff * zoff * a101 + yoff * zoff * a011;
+ a100 = a100 + c2o1 * xoff * a200 + yoff * a110 + zoff * a101;
+ a010 = a010 + c2o1 * yoff * a020 + xoff * a110 + zoff * a011;
+ a001 = a001 + c2o1 * zoff * a002 + xoff * a101 + yoff * a011;
+ b000 = b000 + xoff * b100 + yoff * b010 + zoff * b001 + xoffsq * b200 + yoffsq * b020 + zoffsq * b002 +
+ xoff * yoff * b110 + xoff * zoff * b101 + yoff * zoff * b011;
+ b100 = b100 + c2o1 * xoff * b200 + yoff * b110 + zoff * b101;
+ b010 = b010 + c2o1 * yoff * b020 + xoff * b110 + zoff * b011;
+ b001 = b001 + c2o1 * zoff * b002 + xoff * b101 + yoff * b011;
+ c000 = c000 + xoff * c100 + yoff * c010 + zoff * c001 + xoffsq * c200 + yoffsq * c020 + zoffsq * c002 +
+ xoff * yoff * c110 + xoff * zoff * c101 + yoff * zoff * c011;
+ c100 = c100 + c2o1 * xoff * c200 + yoff * c110 + zoff * c101;
+ c010 = c010 + c2o1 * yoff * c020 + xoff * c110 + zoff * c011;
+ c001 = c001 + c2o1 * zoff * c002 + xoff * c101 + yoff * c011;
+ d000 = d000 + xoff * d100 + yoff * d010 + zoff * d001 +
+ xoff * yoff * d110 + xoff * zoff * d101 + yoff * zoff * d011;
+
+ d100 = d100 + yoff * d110 + zoff * d101;
+ d010 = d010 + xoff * d110 + zoff * d011;
+ d001 = d001 + xoff * d101 + yoff * d011;
+ }
+
+};
+
+}
+
+#endif
diff --git a/src/lbm/refinement/InterpolationCF.h b/src/lbm/refinement/InterpolationCF.h
new file mode 100644
index 0000000000000000000000000000000000000000..82b8df256ce8ebecdc37e202e0dbe763331a1a65
--- /dev/null
+++ b/src/lbm/refinement/InterpolationCF.h
@@ -0,0 +1,310 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//=======================================================================================
+#ifndef LBM_INTERPOLATION_CF_H
+#define LBM_INTERPOLATION_CF_H
+
+#ifndef __host__
+#define __host__
+#endif
+#ifndef __device__
+#define __device__
+#endif
+
+#include <basics/constants/NumericConstants.h>
+
+#include "lbm/constants/D3Q27.h"
+
+#include "lbm/KernelParameter.h"
+#include "lbm/Chimera.h"
+
+#include "lbm/refinement/Coefficients.h"
+
+using namespace vf::basics::constant;
+using namespace vf::lbm::dir;
+
+namespace vf::lbm
+{
+
+inline __host__ __device__ void interpolateCF(real* const f, const real& omegaF, const real& epsnew, const Coefficients &coefficients, const real& x, const real& y, const real& z)
+{
+ const real useNEQ = c1o1;
+
+ const real kxyAverage = c0o1;
+ const real kyzAverage = c0o1;
+ const real kxzAverage = c0o1;
+ const real kxxMyyAverage = c0o1;
+ const real kxxMzzAverage = c0o1;
+
+ const real& a000 = coefficients.a000;
+ const real& b000 = coefficients.b000;
+ const real& c000 = coefficients.c000;
+ const real& d000 = coefficients.d000;
+
+ const real& a100 = coefficients.a100;
+ const real& b100 = coefficients.b100;
+ const real& c100 = coefficients.c100;
+ const real& d100 = coefficients.d100;
+
+ const real& a010 = coefficients.a010;
+ const real& b010 = coefficients.b010;
+ const real& c010 = coefficients.c010;
+ const real& d010 = coefficients.d010;
+
+ const real& a001 = coefficients.a001;
+ const real& b001 = coefficients.b001;
+ const real& c001 = coefficients.c001;
+ const real& d001 = coefficients.d001;
+
+ const real& d110 = coefficients.d110, &d101 = coefficients.d101, &d011 = coefficients.d011;
+
+ const real& a200 = coefficients.a200, &a020 = coefficients.a020, &a002 = coefficients.a002;
+ const real& b200 = coefficients.b200, &b020 = coefficients.b020, &b002 = coefficients.b002;
+ const real& c200 = coefficients.c200, &c020 = coefficients.c020, &c002 = coefficients.c002;
+
+ const real& a110 = coefficients.a110, &a101 = coefficients.a101, &a011 = coefficients.a011;
+ const real& b110 = coefficients.b110, &b101 = coefficients.b101, &b011 = coefficients.b011;
+ const real& c110 = coefficients.c110, &c101 = coefficients.c101, &c011 = coefficients.c011;
+
+ const real &a111 = coefficients.a111, &b111 = coefficients.b111, &c111 = coefficients.c111, &d111 = coefficients.d111;
+
+ const real &LaplaceRho = coefficients.LaplaceRho;
+
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Set all moments to zero
+ //!
+ real m111 = c0o1;
+ real m211 = c0o1;
+ real m011 = c0o1;
+ real m121 = c0o1;
+ real m101 = c0o1;
+ real m112 = c0o1;
+ real m110 = c0o1;
+ real m221 = c0o1;
+ real m001 = c0o1;
+ real m201 = c0o1;
+ real m021 = c0o1;
+ real m212 = c0o1;
+ real m010 = c0o1;
+ real m210 = c0o1;
+ real m012 = c0o1;
+ real m122 = c0o1;
+ real m100 = c0o1;
+ real m120 = c0o1;
+ real m102 = c0o1;
+ real m222 = c0o1;
+ real m022 = c0o1;
+ real m202 = c0o1;
+ real m002 = c0o1;
+ real m220 = c0o1;
+ real m020 = c0o1;
+ real m200 = c0o1;
+ real m000 = c0o1;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Define aliases to use the same variable for the distributions (f's):
+ //!
+ real& f000 = m111;
+ real& fP00 = m211;
+ real& fM00 = m011;
+ real& f0P0 = m121;
+ real& f0M0 = m101;
+ real& f00P = m112;
+ real& f00M = m110;
+ real& fPP0 = m221;
+ real& fMM0 = m001;
+ real& fPM0 = m201;
+ real& fMP0 = m021;
+ real& fP0P = m212;
+ real& fM0M = m010;
+ real& fP0M = m210;
+ real& fM0P = m012;
+ real& f0PP = m122;
+ real& f0MM = m100;
+ real& f0PM = m120;
+ real& f0MP = m102;
+ real& fPPP = m222;
+ real& fMPP = m022;
+ real& fPMP = m202;
+ real& fMMP = m002;
+ real& fPPM = m220;
+ real& fMPM = m020;
+ real& fPMM = m200;
+ real& fMMM = m000;
+
+
+ ////////////////////////////////////////////////////////////////////////////////
+ //! - Set macroscopic values on destination node (zeroth and first order moments)
+ //!
+ real press = d000 + x * d100 + y * d010 + z * d001 +
+ x * y * d110 + x * z * d101 + y * z * d011 + x * y * z * d111 + c3o1 * x * x * LaplaceRho;
+ real vvx = a000 + x * a100 + y * a010 + z * a001 +
+ x * x * a200 + y * y * a020 + z * z * a002 +
+ x * y * a110 + x * z * a101 + y * z * a011 + x * y * z * a111;
+ real vvy = b000 + x * b100 + y * b010 + z * b001 +
+ x * x * b200 + y * y * b020 + z * z * b002 +
+ x * y * b110 + x * z * b101 + y * z * b011 + x * y * z * b111;
+ real vvz = c000 + x * c100 + y * c010 + z * c001 +
+ x * x * c200 + y * y * c020 + z * z * c002 +
+ x * y * c110 + x * z * c101 + y * z * c011 + x * y * z * c111;
+
+ m000 = press; // m000 is press, if drho is interpolated directly
+
+ ////////////////////////////////////////////////////////////////////////////////
+ //! - Set moments (second to sixth order) on destination node
+ //!
+ // linear combinations for second order moments
+ real mxxPyyPzz = m000;
+
+ real mxxMyy = -c2o3 * (a100 - b010 + kxxMyyAverage + c2o1 * a200 * x - b110 * x + a110 * y
+ -c2o1 * b020 * y + a101 * z - b011 * z - b111 * x * z + a111 * y * z) * epsnew/ omegaF * (c1o1 + press);
+ real mxxMzz = -c2o3 * (a100 - c001 + kxxMzzAverage + c2o1 * a200 * x - c101 * x + a110 * y
+ -c011 * y - c111 * x * y + a101 * z - c2o1 * c002 * z + a111 * y * z) * epsnew/ omegaF * (c1o1 + press);
+
+ m011 = -c1o3 * (b001 + c010 + kyzAverage + b101 * x + c110 * x + b011 * y + c2o1 * c020 * y
+ + b111 * x * y + c2o1 * b002 * z + c011 * z + c111 * x * z) * epsnew / omegaF * (c1o1 + press);
+ m101 = -c1o3 * (a001 + c100 + kxzAverage + a101 * x + c2o1 * c200 * x + a011 * y + c110 * y
+ + a111 * x * y + c2o1 * a002 * z + c101 * z + c111 * y * z) * epsnew / omegaF * (c1o1 + press);
+ m110 = -c1o3 * (a010 + b100 + kxyAverage + a110 * x + c2o1 * b200 * x + c2o1 * a020 * y
+ + b110 * y + a011 * z + b101 * z + a111 * x * z + b111 * y * z) * epsnew / omegaF * (c1o1 + press);
+
+ m200 = c1o3 * ( mxxMyy + mxxMzz + mxxPyyPzz) * useNEQ;
+ m020 = c1o3 * (-c2o1 * mxxMyy + mxxMzz + mxxPyyPzz) * useNEQ;
+ m002 = c1o3 * ( mxxMyy - c2o1 * mxxMzz + mxxPyyPzz) * useNEQ;
+
+ // linear combinations for third order moments
+ m111 = c0o1;
+
+ real mxxyPyzz = c0o1;
+ real mxxyMyzz = c0o1;
+ real mxxzPyyz = c0o1;
+ real mxxzMyyz = c0o1;
+ real mxyyPxzz = c0o1;
+ real mxyyMxzz = c0o1;
+
+ m210 = ( mxxyMyzz + mxxyPyzz) * c1o2;
+ m012 = (-mxxyMyzz + mxxyPyzz) * c1o2;
+ m201 = ( mxxzMyyz + mxxzPyyz) * c1o2;
+ m021 = (-mxxzMyyz + mxxzPyyz) * c1o2;
+ m120 = ( mxyyMxzz + mxyyPxzz) * c1o2;
+ m102 = (-mxyyMxzz + mxyyPxzz) * c1o2;
+
+ // fourth order moments
+ m022 = m000 * c1o9;
+ m202 = m022;
+ m220 = m022;
+
+ // fifth order moments
+
+ // sixth order moment
+ m222 = m000 * c1o27;
+
+ real vxsq = vvx * vvx;
+ real vysq = vvy * vvy;
+ real vzsq = vvz * vvz;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Chimera transform from central moments to well conditioned distributions as defined in Appendix J in
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015),
+ //! DOI:10.1016/j.camwa.2015.05.001 ]</b></a> see also Eq. (88)-(96) in <a
+ //! href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040
+ //! ]</b></a>
+ //!
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // X - Dir
+ backwardInverseChimeraWithK(m000, m100, m200, vvx, vxsq, c1o1, c1o1);
+ backwardChimera( m010, m110, m210, vvx, vxsq);
+ backwardInverseChimeraWithK(m020, m120, m220, vvx, vxsq, c3o1, c1o3);
+ backwardChimera( m001, m101, m201, vvx, vxsq);
+ backwardChimera( m011, m111, m211, vvx, vxsq);
+ backwardChimera( m021, m121, m221, vvx, vxsq);
+ backwardInverseChimeraWithK(m002, m102, m202, vvx, vxsq, c3o1, c1o3);
+ backwardChimera( m012, m112, m212, vvx, vxsq);
+ backwardInverseChimeraWithK(m022, m122, m222, vvx, vxsq, c9o1, c1o9);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ backwardInverseChimeraWithK(m000, m010, m020, vvy, vysq, c6o1, c1o6);
+ backwardChimera( m001, m011, m021, vvy, vysq);
+ backwardInverseChimeraWithK(m002, m012, m022, vvy, vysq, c18o1, c1o18);
+ backwardInverseChimeraWithK(m100, m110, m120, vvy, vysq, c3o2, c2o3);
+ backwardChimera( m101, m111, m121, vvy, vysq);
+ backwardInverseChimeraWithK(m102, m112, m122, vvy, vysq, c9o2, c2o9);
+ backwardInverseChimeraWithK(m200, m210, m220, vvy, vysq, c6o1, c1o6);
+ backwardChimera( m201, m211, m221, vvy, vysq);
+ backwardInverseChimeraWithK(m202, m212, m222, vvy, vysq, c18o1, c1o18);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ backwardInverseChimeraWithK(m000, m001, m002, vvz, vzsq, c36o1, c1o36);
+ backwardInverseChimeraWithK(m010, m011, m012, vvz, vzsq, c9o1, c1o9);
+ backwardInverseChimeraWithK(m020, m021, m022, vvz, vzsq, c36o1, c1o36);
+ backwardInverseChimeraWithK(m100, m101, m102, vvz, vzsq, c9o1, c1o9);
+ backwardInverseChimeraWithK(m110, m111, m112, vvz, vzsq, c9o4, c4o9);
+ backwardInverseChimeraWithK(m120, m121, m122, vvz, vzsq, c9o1, c1o9);
+ backwardInverseChimeraWithK(m200, m201, m202, vvz, vzsq, c36o1, c1o36);
+ backwardInverseChimeraWithK(m210, m211, m212, vvz, vzsq, c9o1, c1o9);
+ backwardInverseChimeraWithK(m220, m221, m222, vvz, vzsq, c36o1, c1o36);
+
+ f[DIR_000] = f000;
+ f[DIR_P00] = fP00;
+ f[DIR_M00] = fM00;
+ f[DIR_0P0] = f0P0;
+ f[DIR_0M0] = f0M0;
+ f[DIR_00P] = f00P;
+ f[DIR_00M] = f00M;
+ f[DIR_PP0] = fPP0;
+ f[DIR_MM0] = fMM0;
+ f[DIR_PM0] = fPM0;
+ f[DIR_MP0] = fMP0;
+ f[DIR_P0P] = fP0P;
+ f[DIR_M0M] = fM0M;
+ f[DIR_P0M] = fP0M;
+ f[DIR_M0P] = fM0P;
+ f[DIR_0PP] = f0PP;
+ f[DIR_0MM] = f0MM;
+ f[DIR_0PM] = f0PM;
+ f[DIR_0MP] = f0MP;
+ f[DIR_PPP] = fPPP;
+ f[DIR_MPP] = fMPP;
+ f[DIR_PMP] = fPMP;
+ f[DIR_MMP] = fMMP;
+ f[DIR_PPM] = fPPM;
+ f[DIR_MPM] = fMPM;
+ f[DIR_PMM] = fPMM;
+ f[DIR_MMM] = fMMM;
+}
+
+
+
+}
+
+#endif
diff --git a/src/lbm/refinement/InterpolationFC.h b/src/lbm/refinement/InterpolationFC.h
new file mode 100644
index 0000000000000000000000000000000000000000..f3e6384476033880c40b4b6f4c73890ba1e33ae7
--- /dev/null
+++ b/src/lbm/refinement/InterpolationFC.h
@@ -0,0 +1,265 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//=======================================================================================
+#ifndef LBM_INTERPOLATION_FC_H
+#define LBM_INTERPOLATION_FC_H
+
+#ifndef __host__
+#define __host__
+#endif
+#ifndef __device__
+#define __device__
+#endif
+
+#include <basics/constants/NumericConstants.h>
+
+#include "lbm/constants/D3Q27.h"
+#include "lbm/KernelParameter.h"
+#include "lbm/Chimera.h"
+
+#include "lbm/refinement/Coefficients.h"
+
+using namespace vf::basics::constant;
+using namespace vf::lbm::dir;
+
+namespace vf::lbm
+{
+
+inline __host__ __device__ void interpolateFC(real* const f, const real epsnew, const real omegaC, const Coefficients& coefficients)
+{
+
+ const real kxyAverage = c0o1;
+ const real kyzAverage = c0o1;
+ const real kxzAverage = c0o1;
+ const real kxxMyyAverage = c0o1;
+ const real kxxMzzAverage = c0o1;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Set all moments to zero
+ //!
+ real m111 = c0o1;
+ real m211 = c0o1;
+ real m011 = c0o1;
+ real m121 = c0o1;
+ real m101 = c0o1;
+ real m112 = c0o1;
+ real m110 = c0o1;
+ real m221 = c0o1;
+ real m001 = c0o1;
+ real m201 = c0o1;
+ real m021 = c0o1;
+ real m212 = c0o1;
+ real m010 = c0o1;
+ real m210 = c0o1;
+ real m012 = c0o1;
+ real m122 = c0o1;
+ real m100 = c0o1;
+ real m120 = c0o1;
+ real m102 = c0o1;
+ real m222 = c0o1;
+ real m022 = c0o1;
+ real m202 = c0o1;
+ real m002 = c0o1;
+ real m220 = c0o1;
+ real m020 = c0o1;
+ real m200 = c0o1;
+ real m000 = c0o1;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Define aliases to use the same variable for the distributions (f's):
+ //!
+ real& f000 = m111;
+ real& fP00 = m211;
+ real& fM00 = m011;
+ real& f0P0 = m121;
+ real& f0M0 = m101;
+ real& f00P = m112;
+ real& f00M = m110;
+ real& fPP0 = m221;
+ real& fMM0 = m001;
+ real& fPM0 = m201;
+ real& fMP0 = m021;
+ real& fP0P = m212;
+ real& fM0M = m010;
+ real& fP0M = m210;
+ real& fM0P = m012;
+ real& f0PP = m122;
+ real& f0MM = m100;
+ real& f0PM = m120;
+ real& f0MP = m102;
+ real& fPPP = m222;
+ real& fMPP = m022;
+ real& fPMP = m202;
+ real& fMMP = m002;
+ real& fPPM = m220;
+ real& fMPM = m020;
+ real& fPMM = m200;
+ real& fMMM = m000;
+
+ ////////////////////////////////////////////////////////////////////////////////
+ //! - Declare local variables for destination nodes
+ //!
+ real vvx, vvy, vvz, vxsq, vysq, vzsq;
+ real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz;
+ real useNEQ = c1o1; // zero; //one; //.... one = on ..... zero = off
+ real press;
+
+ ////////////////////////////////////////////////////////////////////////////////
+ //! - Set macroscopic values on destination node (zeroth and first order moments)
+ //!
+ press = coefficients.d000 - c2o1 * coefficients.LaplaceRho * c1o8;
+ vvx = coefficients.a000;
+ vvy = coefficients.b000;
+ vvz = coefficients.c000;
+
+ m000 = press; // m000 is press, if drho is interpolated directly
+
+ vxsq = vvx * vvx;
+ vysq = vvy * vvy;
+ vzsq = vvz * vvz;
+
+ ////////////////////////////////////////////////////////////////////////////////
+ //! - Set moments (second to sixth order) on destination node
+ //!
+ // linear combinations for second order moments
+ mxxPyyPzz = m000;
+
+ mxxMyy = -c2o3 * ((coefficients.a100 - coefficients.b010) + kxxMyyAverage) * epsnew / omegaC * (c1o1 + press);
+ mxxMzz = -c2o3 * ((coefficients.a100 - coefficients.c001) + kxxMzzAverage) * epsnew / omegaC * (c1o1 + press);
+
+ m011 = -c1o3 * ((coefficients.b001 + coefficients.c010) + kyzAverage) * epsnew / omegaC * (c1o1 + press);
+ m101 = -c1o3 * ((coefficients.a001 + coefficients.c100) + kxzAverage) * epsnew / omegaC * (c1o1 + press);
+ m110 = -c1o3 * ((coefficients.a010 + coefficients.b100) + kxyAverage) * epsnew / omegaC * (c1o1 + press);
+
+ m200 = c1o3 * ( mxxMyy + mxxMzz + mxxPyyPzz) * useNEQ;
+ m020 = c1o3 * (-c2o1 * mxxMyy + mxxMzz + mxxPyyPzz) * useNEQ;
+ m002 = c1o3 * ( mxxMyy - c2o1 * mxxMzz + mxxPyyPzz) * useNEQ;
+
+ // linear combinations for third order moments
+ m111 = c0o1;
+
+ mxxyPyzz = c0o1;
+ mxxyMyzz = c0o1;
+ mxxzPyyz = c0o1;
+ mxxzMyyz = c0o1;
+ mxyyPxzz = c0o1;
+ mxyyMxzz = c0o1;
+
+ m210 = ( mxxyMyzz + mxxyPyzz) * c1o2;
+ m012 = (-mxxyMyzz + mxxyPyzz) * c1o2;
+ m201 = ( mxxzMyyz + mxxzPyyz) * c1o2;
+ m021 = (-mxxzMyyz + mxxzPyyz) * c1o2;
+ m120 = ( mxyyMxzz + mxyyPxzz) * c1o2;
+ m102 = (-mxyyMxzz + mxyyPxzz) * c1o2;
+
+ // fourth order moments
+ m022 = m000 * c1o9;
+ m202 = m022;
+ m220 = m022;
+
+ // fifth order moments
+
+ // sixth order moments
+ m222 = m000 * c1o27;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Chimera transform from central moments to well conditioned distributions as defined in Appendix J in
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015),
+ //! DOI:10.1016/j.camwa.2015.05.001 ]</b></a> see also Eq. (88)-(96) in <a
+ //! href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040
+ //! ]</b></a>
+ //!
+ ////////////////////////////////////////////////////////////////////////////////////
+ // X - Dir
+ backwardInverseChimeraWithK(m000, m100, m200, vvx, vxsq, c1o1, c1o1);
+ backwardChimera( m010, m110, m210, vvx, vxsq);
+ backwardInverseChimeraWithK(m020, m120, m220, vvx, vxsq, c3o1, c1o3);
+ backwardChimera( m001, m101, m201, vvx, vxsq);
+ backwardChimera( m011, m111, m211, vvx, vxsq);
+ backwardChimera( m021, m121, m221, vvx, vxsq);
+ backwardInverseChimeraWithK(m002, m102, m202, vvx, vxsq, c3o1, c1o3);
+ backwardChimera( m012, m112, m212, vvx, vxsq);
+ backwardInverseChimeraWithK(m022, m122, m222, vvx, vxsq, c9o1, c1o9);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ backwardInverseChimeraWithK(m000, m010, m020, vvy, vysq, c6o1, c1o6);
+ backwardChimera( m001, m011, m021, vvy, vysq);
+ backwardInverseChimeraWithK(m002, m012, m022, vvy, vysq, c18o1, c1o18);
+ backwardInverseChimeraWithK(m100, m110, m120, vvy, vysq, c3o2, c2o3);
+ backwardChimera( m101, m111, m121, vvy, vysq);
+ backwardInverseChimeraWithK(m102, m112, m122, vvy, vysq, c9o2, c2o9);
+ backwardInverseChimeraWithK(m200, m210, m220, vvy, vysq, c6o1, c1o6);
+ backwardChimera( m201, m211, m221, vvy, vysq);
+ backwardInverseChimeraWithK(m202, m212, m222, vvy, vysq, c18o1, c1o18);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ backwardInverseChimeraWithK(m000, m001, m002, vvz, vzsq, c36o1, c1o36);
+ backwardInverseChimeraWithK(m010, m011, m012, vvz, vzsq, c9o1, c1o9);
+ backwardInverseChimeraWithK(m020, m021, m022, vvz, vzsq, c36o1, c1o36);
+ backwardInverseChimeraWithK(m100, m101, m102, vvz, vzsq, c9o1, c1o9);
+ backwardInverseChimeraWithK(m110, m111, m112, vvz, vzsq, c9o4, c4o9);
+ backwardInverseChimeraWithK(m120, m121, m122, vvz, vzsq, c9o1, c1o9);
+ backwardInverseChimeraWithK(m200, m201, m202, vvz, vzsq, c36o1, c1o36);
+ backwardInverseChimeraWithK(m210, m211, m212, vvz, vzsq, c9o1, c1o9);
+ backwardInverseChimeraWithK(m220, m221, m222, vvz, vzsq, c36o1, c1o36);
+
+ f[DIR_000] = f000;
+ f[DIR_P00] = fP00;
+ f[DIR_M00] = fM00;
+ f[DIR_0P0] = f0P0;
+ f[DIR_0M0] = f0M0;
+ f[DIR_00P] = f00P;
+ f[DIR_00M] = f00M;
+ f[DIR_PP0] = fPP0;
+ f[DIR_MM0] = fMM0;
+ f[DIR_PM0] = fPM0;
+ f[DIR_MP0] = fMP0;
+ f[DIR_P0P] = fP0P;
+ f[DIR_M0M] = fM0M;
+ f[DIR_P0M] = fP0M;
+ f[DIR_M0P] = fM0P;
+ f[DIR_0PP] = f0PP;
+ f[DIR_0MM] = f0MM;
+ f[DIR_0PM] = f0PM;
+ f[DIR_0MP] = f0MP;
+ f[DIR_PPP] = fPPP;
+ f[DIR_MPP] = fMPP;
+ f[DIR_PMP] = fPMP;
+ f[DIR_MMP] = fMMP;
+ f[DIR_PPM] = fPPM;
+ f[DIR_MPM] = fMPM;
+ f[DIR_PMM] = fPMM;
+ f[DIR_MMM] = fMMM;
+}
+
+}
+
+#endif
diff --git a/src/logger/Logger.h b/src/logger/Logger.h
index 3a25fea02eb7d5ea1ab9bffebea08bfc9f512b04..f3c41c0e3bfb8aa12c94677040273fdaaaff64a3 100644
--- a/src/logger/Logger.h
+++ b/src/logger/Logger.h
@@ -39,10 +39,10 @@
// The default log level is set to trace. Supported levels: trace < debug < info < warning < critical
//
// The logging is realized in 3 different log sinks:
-// 1. colorded console output
+// 1. colored console output
// 2. a daily log file
// 3. a log file from the last run of VirtualFluids
-// The default file path is relativ to executed command logs/
+// The default file path is relative to executed command logs/
// File path can be changed via changeLogPath()
#define VF_LOG_TRACE(...) spdlog::trace(__VA_ARGS__)
@@ -57,7 +57,7 @@ namespace vf::logging
class Logger
{
public:
- // initalizing the above named logger
+ // initializing the above named logger
static void initializeLogger();
// changing the path of the log files
diff --git a/utilities/ci-regression-tests/regression-tests-ci.yml.j2 b/utilities/ci-regression-tests/regression-tests-ci.yml.j2
index 4367ad6c7d5f820ef8975c37dbf843e5342e4dbd..f162ff0c855130ffb8f2cc1c391a62360577b82a 100644
--- a/utilities/ci-regression-tests/regression-tests-ci.yml.j2
+++ b/utilities/ci-regression-tests/regression-tests-ci.yml.j2
@@ -1,4 +1,4 @@
-image: git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu20_04:1.5
+image: git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu22_04:1.0
stages:
- test
diff --git a/utilities/install-cppcheck.sh b/utilities/install-cppcheck.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e0a89854917b7378ac85fed0e3cc43dc624db598
--- /dev/null
+++ b/utilities/install-cppcheck.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -e
+
+cd /tmp
+git clone https://github.com/danmar/cppcheck.git
+cd cppcheck
+git checkout 2.10.3
+make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function" install
+cd /tmp
+rm -rf /tmp/cppcheck
+ldconfig
+cppcheck --version
\ No newline at end of file